From ae103b40209bcd1644fbf6178095e318dbf94836 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Fri, 2 Oct 2020 22:19:22 -0400 Subject: [PATCH 01/23] Splitting functions into single files --- app/controllers/auth.js | 576 ------------------ app/controllers/auth.validate.js | 119 ---- app/controllers/auth/forgotPassword.js | 29 + app/controllers/auth/getRefreshToken.js | 30 + .../auth/helpers/blockIsExpired.js | 10 + app/controllers/auth/helpers/blockUser.js | 24 + .../checkLoginAttemptsAndBlockExpires.js | 28 + .../auth/helpers/checkPermissions.js | 21 + .../auth/helpers/findForgotPassword.js | 23 + app/controllers/auth/helpers/findUser.js | 23 + app/controllers/auth/helpers/findUserById.js | 17 + .../auth/helpers/findUserToResetPassword.js | 22 + .../auth/helpers/forgotPasswordResponse.js | 19 + app/controllers/auth/helpers/generateToken.js | 27 + .../auth/helpers/getUserIdFromToken.js | 21 + app/controllers/auth/helpers/index.js | 53 ++ .../auth/helpers/markResetPasswordAsUsed.js | 21 + .../auth/helpers/passwordsDoNotMatch.js | 23 + app/controllers/auth/helpers/registerUser.js | 26 + .../auth/helpers/returnRegisterToken.js | 19 + .../auth/helpers/saveForgotPassword.js | 27 + .../auth/helpers/saveLoginAttemptsToDB.js | 20 + .../helpers/saveUserAccessAndReturnToken.js | 33 + app/controllers/auth/helpers/setUserInfo.js | 23 + .../auth/helpers/updatePassword.js | 18 + app/controllers/auth/helpers/userIsBlocked.js | 16 + .../auth/helpers/verificationExists.js | 23 + app/controllers/auth/helpers/verifyUser.js | 22 + app/controllers/auth/index.js | 17 + app/controllers/auth/login.js | 40 ++ app/controllers/auth/register.js | 31 + app/controllers/auth/resetPassword.js | 26 + app/controllers/auth/roleAuthorization.js | 21 + app/controllers/auth/validators/index.js | 13 + .../auth/validators/validateForgotPassword.js | 21 + .../auth/validators/validateLogin.js | 34 ++ .../auth/validators/validateRegister.js | 37 ++ .../auth/validators/validateResetPassword.js | 29 + .../auth/validators/validateVerify.js | 19 + app/controllers/auth/verify.js | 21 + app/controllers/cities.js | 167 ----- app/controllers/cities.validate.js | 69 --- app/controllers/cities/createItem.js | 24 + app/controllers/cities/deleteItem.js | 21 + app/controllers/cities/getAllItems.js | 17 + app/controllers/cities/getItem.js | 21 + app/controllers/cities/getItems.js | 19 + app/controllers/cities/helpers/cityExists.js | 22 + .../helpers/cityExistsExcludingItself.js | 26 + .../cities/helpers/getAllItemsFromDB.js | 27 + app/controllers/cities/helpers/index.js | 9 + app/controllers/cities/index.js | 15 + app/controllers/cities/updateItem.js | 25 + app/controllers/cities/validators/index.js | 11 + .../cities/validators/validateCreateItem.js | 20 + .../cities/validators/validateDeleteItem.js | 19 + .../cities/validators/validateGetItem.js | 19 + .../cities/validators/validateUpdateItem.js | 25 + app/controllers/profile.js | 146 ----- app/controllers/profile/changePassword.js | 32 + app/controllers/profile/getProfile.js | 18 + .../profile/helpers/changePasswordInDB.js | 28 + app/controllers/profile/helpers/findUser.js | 17 + .../profile/helpers/getProfileFromDB.js | 17 + app/controllers/profile/helpers/index.js | 13 + .../profile/helpers/passwordsDoNotMatch.js | 13 + .../profile/helpers/updateProfileInDB.js | 27 + app/controllers/profile/index.js | 9 + app/controllers/profile/updateProfile.js | 18 + app/controllers/profile/validators/index.js | 7 + .../validators/validateChangePassword.js | 31 + .../validators/validateUpdateProfile.js | 49 ++ app/controllers/users.js | 135 ---- app/controllers/users.validate.js | 165 ----- app/controllers/users/createItem.js | 27 + app/controllers/users/deleteItem.js | 21 + app/controllers/users/getItem.js | 21 + app/controllers/users/getItems.js | 19 + .../users/helpers/createItemInDb.js | 40 ++ app/controllers/users/helpers/index.js | 5 + app/controllers/users/index.js | 13 + app/controllers/users/updateItem.js | 28 + app/controllers/users/validators/index.js | 11 + .../validators/validateCreateItem.js} | 59 +- .../users/validators/validateDeleteItem.js | 19 + .../users/validators/validateGetItem.js | 19 + .../users/validators/validateUpdateItem.js | 67 ++ app/routes/auth.js | 50 +- app/routes/cities.js | 51 +- app/routes/profile.js | 32 +- app/routes/users.js | 48 +- 91 files changed, 1956 insertions(+), 1477 deletions(-) delete mode 100755 app/controllers/auth.js delete mode 100755 app/controllers/auth.validate.js create mode 100644 app/controllers/auth/forgotPassword.js create mode 100644 app/controllers/auth/getRefreshToken.js create mode 100644 app/controllers/auth/helpers/blockIsExpired.js create mode 100644 app/controllers/auth/helpers/blockUser.js create mode 100644 app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js create mode 100644 app/controllers/auth/helpers/checkPermissions.js create mode 100644 app/controllers/auth/helpers/findForgotPassword.js create mode 100644 app/controllers/auth/helpers/findUser.js create mode 100644 app/controllers/auth/helpers/findUserById.js create mode 100644 app/controllers/auth/helpers/findUserToResetPassword.js create mode 100644 app/controllers/auth/helpers/forgotPasswordResponse.js create mode 100644 app/controllers/auth/helpers/generateToken.js create mode 100644 app/controllers/auth/helpers/getUserIdFromToken.js create mode 100644 app/controllers/auth/helpers/index.js create mode 100644 app/controllers/auth/helpers/markResetPasswordAsUsed.js create mode 100644 app/controllers/auth/helpers/passwordsDoNotMatch.js create mode 100644 app/controllers/auth/helpers/registerUser.js create mode 100644 app/controllers/auth/helpers/returnRegisterToken.js create mode 100644 app/controllers/auth/helpers/saveForgotPassword.js create mode 100644 app/controllers/auth/helpers/saveLoginAttemptsToDB.js create mode 100644 app/controllers/auth/helpers/saveUserAccessAndReturnToken.js create mode 100644 app/controllers/auth/helpers/setUserInfo.js create mode 100644 app/controllers/auth/helpers/updatePassword.js create mode 100644 app/controllers/auth/helpers/userIsBlocked.js create mode 100644 app/controllers/auth/helpers/verificationExists.js create mode 100644 app/controllers/auth/helpers/verifyUser.js create mode 100644 app/controllers/auth/index.js create mode 100644 app/controllers/auth/login.js create mode 100644 app/controllers/auth/register.js create mode 100644 app/controllers/auth/resetPassword.js create mode 100644 app/controllers/auth/roleAuthorization.js create mode 100644 app/controllers/auth/validators/index.js create mode 100644 app/controllers/auth/validators/validateForgotPassword.js create mode 100644 app/controllers/auth/validators/validateLogin.js create mode 100644 app/controllers/auth/validators/validateRegister.js create mode 100644 app/controllers/auth/validators/validateResetPassword.js create mode 100644 app/controllers/auth/validators/validateVerify.js create mode 100644 app/controllers/auth/verify.js delete mode 100755 app/controllers/cities.js delete mode 100755 app/controllers/cities.validate.js create mode 100644 app/controllers/cities/createItem.js create mode 100755 app/controllers/cities/deleteItem.js create mode 100644 app/controllers/cities/getAllItems.js create mode 100644 app/controllers/cities/getItem.js create mode 100644 app/controllers/cities/getItems.js create mode 100644 app/controllers/cities/helpers/cityExists.js create mode 100644 app/controllers/cities/helpers/cityExistsExcludingItself.js create mode 100644 app/controllers/cities/helpers/getAllItemsFromDB.js create mode 100644 app/controllers/cities/helpers/index.js create mode 100644 app/controllers/cities/index.js create mode 100644 app/controllers/cities/updateItem.js create mode 100644 app/controllers/cities/validators/index.js create mode 100644 app/controllers/cities/validators/validateCreateItem.js create mode 100644 app/controllers/cities/validators/validateDeleteItem.js create mode 100644 app/controllers/cities/validators/validateGetItem.js create mode 100644 app/controllers/cities/validators/validateUpdateItem.js delete mode 100755 app/controllers/profile.js create mode 100755 app/controllers/profile/changePassword.js create mode 100644 app/controllers/profile/getProfile.js create mode 100644 app/controllers/profile/helpers/changePasswordInDB.js create mode 100644 app/controllers/profile/helpers/findUser.js create mode 100644 app/controllers/profile/helpers/getProfileFromDB.js create mode 100644 app/controllers/profile/helpers/index.js create mode 100644 app/controllers/profile/helpers/passwordsDoNotMatch.js create mode 100644 app/controllers/profile/helpers/updateProfileInDB.js create mode 100644 app/controllers/profile/index.js create mode 100644 app/controllers/profile/updateProfile.js create mode 100644 app/controllers/profile/validators/index.js create mode 100755 app/controllers/profile/validators/validateChangePassword.js create mode 100644 app/controllers/profile/validators/validateUpdateProfile.js delete mode 100755 app/controllers/users.js delete mode 100755 app/controllers/users.validate.js create mode 100644 app/controllers/users/createItem.js create mode 100755 app/controllers/users/deleteItem.js create mode 100644 app/controllers/users/getItem.js create mode 100644 app/controllers/users/getItems.js create mode 100644 app/controllers/users/helpers/createItemInDb.js create mode 100644 app/controllers/users/helpers/index.js create mode 100644 app/controllers/users/index.js create mode 100644 app/controllers/users/updateItem.js create mode 100644 app/controllers/users/validators/index.js rename app/controllers/{profile.validate.js => users/validators/validateCreateItem.js} (67%) mode change 100755 => 100644 create mode 100644 app/controllers/users/validators/validateDeleteItem.js create mode 100644 app/controllers/users/validators/validateGetItem.js create mode 100644 app/controllers/users/validators/validateUpdateItem.js diff --git a/app/controllers/auth.js b/app/controllers/auth.js deleted file mode 100755 index 7728e1e..0000000 --- a/app/controllers/auth.js +++ /dev/null @@ -1,576 +0,0 @@ -const jwt = require('jsonwebtoken') -const User = require('../models/user') -const UserAccess = require('../models/userAccess') -const ForgotPassword = require('../models/forgotPassword') -const utils = require('../middleware/utils') -const uuid = require('uuid') -const { addHours } = require('date-fns') -const { matchedData } = require('express-validator') -const auth = require('../middleware/auth') -const emailer = require('../middleware/emailer') -const HOURS_TO_BLOCK = 2 -const LOGIN_ATTEMPTS = 5 - -/********************* - * Private functions * - *********************/ - -/** - * Generates a token - * @param {Object} user - user object - */ -const generateToken = (user) => { - // Gets expiration time - const expiration = - Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES - - // returns signed and encrypted token - return auth.encrypt( - jwt.sign( - { - data: { - _id: user - }, - exp: expiration - }, - process.env.JWT_SECRET - ) - ) -} - -/** - * Creates an object with user info - * @param {Object} req - request object - */ -const setUserInfo = (req) => { - let user = { - _id: req._id, - name: req.name, - email: req.email, - role: req.role, - verified: req.verified - } - // Adds verification for testing purposes - if (process.env.NODE_ENV !== 'production') { - user = { - ...user, - verification: req.verification - } - } - return user -} - -/** - * Saves a new user access and then returns token - * @param {Object} req - request object - * @param {Object} user - user object - */ -const saveUserAccessAndReturnToken = async (req, user) => { - return new Promise((resolve, reject) => { - const userAccess = new UserAccess({ - email: user.email, - ip: utils.getIP(req), - browser: utils.getBrowserInfo(req), - country: utils.getCountry(req) - }) - userAccess.save((err) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - const userInfo = setUserInfo(user) - // Returns data with access token - resolve({ - token: generateToken(user._id), - user: userInfo - }) - }) - }) -} - -/** - * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK - * @param {Object} user - user object - */ -const blockUser = async (user) => { - return new Promise((resolve, reject) => { - user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK) - user.save((err, result) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - if (result) { - resolve(utils.buildErrObject(409, 'BLOCKED_USER')) - } - }) - }) -} - -/** - * Saves login attempts to dabatabse - * @param {Object} user - user object - */ -const saveLoginAttemptsToDB = async (user) => { - return new Promise((resolve, reject) => { - user.save((err, result) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - if (result) { - resolve(true) - } - }) - }) -} - -/** - * Checks that login attempts are greater than specified in constant and also that blockexpires is less than now - * @param {Object} user - user object - */ -const blockIsExpired = (user) => - user.loginAttempts > LOGIN_ATTEMPTS && user.blockExpires <= new Date() - -/** - * - * @param {Object} user - user object. - */ -const checkLoginAttemptsAndBlockExpires = async (user) => { - return new Promise((resolve, reject) => { - // Let user try to login again after blockexpires, resets user loginAttempts - if (blockIsExpired(user)) { - user.loginAttempts = 0 - user.save((err, result) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - if (result) { - resolve(true) - } - }) - } else { - // User is not blocked, check password (normal behaviour) - resolve(true) - } - }) -} - -/** - * Checks if blockExpires from user is greater than now - * @param {Object} user - user object - */ -const userIsBlocked = async (user) => { - return new Promise((resolve, reject) => { - if (user.blockExpires > new Date()) { - reject(utils.buildErrObject(409, 'BLOCKED_USER')) - } - resolve(true) - }) -} - -/** - * Finds user by email - * @param {string} email - user´s email - */ -const findUser = async (email) => { - return new Promise((resolve, reject) => { - User.findOne( - { - email - }, - 'password loginAttempts blockExpires name email role verified verification', - (err, item) => { - utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') - resolve(item) - } - ) - }) -} - -/** - * Finds user by ID - * @param {string} id - user´s id - */ -const findUserById = async (userId) => { - return new Promise((resolve, reject) => { - User.findById(userId, (err, item) => { - utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') - resolve(item) - }) - }) -} - -/** - * Adds one attempt to loginAttempts, then compares loginAttempts with the constant LOGIN_ATTEMPTS, if is less returns wrong password, else returns blockUser function - * @param {Object} user - user object - */ -const passwordsDoNotMatch = async (user) => { - user.loginAttempts += 1 - await saveLoginAttemptsToDB(user) - return new Promise((resolve, reject) => { - if (user.loginAttempts <= LOGIN_ATTEMPTS) { - resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) - } else { - resolve(blockUser(user)) - } - reject(utils.buildErrObject(422, 'ERROR')) - }) -} - -/** - * Registers a new user in database - * @param {Object} req - request object - */ -const registerUser = async (req) => { - return new Promise((resolve, reject) => { - const user = new User({ - name: req.name, - email: req.email, - password: req.password, - verification: uuid.v4() - }) - user.save((err, item) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - resolve(item) - }) - }) -} - -/** - * Builds the registration token - * @param {Object} item - user object that contains created id - * @param {Object} userInfo - user object - */ -const returnRegisterToken = (item, userInfo) => { - if (process.env.NODE_ENV !== 'production') { - userInfo.verification = item.verification - } - const data = { - token: generateToken(item._id), - user: userInfo - } - return data -} - -/** - * Checks if verification id exists for user - * @param {string} id - verification id - */ -const verificationExists = async (id) => { - return new Promise((resolve, reject) => { - User.findOne( - { - verification: id, - verified: false - }, - (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND_OR_ALREADY_VERIFIED') - resolve(user) - } - ) - }) -} - -/** - * Verifies an user - * @param {Object} user - user object - */ -const verifyUser = async (user) => { - return new Promise((resolve, reject) => { - user.verified = true - user.save((err, item) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - resolve({ - email: item.email, - verified: item.verified - }) - }) - }) -} - -/** - * Marks a request to reset password as used - * @param {Object} req - request object - * @param {Object} forgot - forgot object - */ -const markResetPasswordAsUsed = async (req, forgot) => { - return new Promise((resolve, reject) => { - forgot.used = true - forgot.ipChanged = utils.getIP(req) - forgot.browserChanged = utils.getBrowserInfo(req) - forgot.countryChanged = utils.getCountry(req) - forgot.save((err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(utils.buildSuccObject('PASSWORD_CHANGED')) - }) - }) -} - -/** - * Updates a user password in database - * @param {string} password - new password - * @param {Object} user - user object - */ -const updatePassword = async (password, user) => { - return new Promise((resolve, reject) => { - user.password = password - user.save((err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(item) - }) - }) -} - -/** - * Finds user by email to reset password - * @param {string} email - user email - */ -const findUserToResetPassword = async (email) => { - return new Promise((resolve, reject) => { - User.findOne( - { - email - }, - (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') - resolve(user) - } - ) - }) -} - -/** - * Checks if a forgot password verification exists - * @param {string} id - verification id - */ -const findForgotPassword = async (id) => { - return new Promise((resolve, reject) => { - ForgotPassword.findOne( - { - verification: id, - used: false - }, - (err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND_OR_ALREADY_USED') - resolve(item) - } - ) - }) -} - -/** - * Creates a new password forgot - * @param {Object} req - request object - */ -const saveForgotPassword = async (req) => { - return new Promise((resolve, reject) => { - const forgot = new ForgotPassword({ - email: req.body.email, - verification: uuid.v4(), - ipRequest: utils.getIP(req), - browserRequest: utils.getBrowserInfo(req), - countryRequest: utils.getCountry(req) - }) - forgot.save((err, item) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - resolve(item) - }) - }) -} - -/** - * Builds an object with created forgot password object, if env is development or testing exposes the verification - * @param {Object} item - created forgot password object - */ -const forgotPasswordResponse = (item) => { - let data = { - msg: 'RESET_EMAIL_SENT', - email: item.email - } - if (process.env.NODE_ENV !== 'production') { - data = { - ...data, - verification: item.verification - } - } - return data -} - -/** - * Checks against user if has quested role - * @param {Object} data - data object - * @param {*} next - next callback - */ -const checkPermissions = async (data, next) => { - return new Promise((resolve, reject) => { - User.findById(data.id, (err, result) => { - utils.itemNotFound(err, result, reject, 'NOT_FOUND') - if (data.roles.indexOf(result.role) > -1) { - return resolve(next()) - } - return reject(utils.buildErrObject(401, 'UNAUTHORIZED')) - }) - }) -} - -/** - * Gets user id from token - * @param {string} token - Encrypted and encoded token - */ -const getUserIdFromToken = async (token) => { - return new Promise((resolve, reject) => { - // Decrypts, verifies and decode token - jwt.verify(auth.decrypt(token), process.env.JWT_SECRET, (err, decoded) => { - if (err) { - reject(utils.buildErrObject(409, 'BAD_TOKEN')) - } - resolve(decoded.data._id) - }) - }) -} - -/******************** - * Public functions * - ********************/ - -/** - * Login function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.login = async (req, res) => { - try { - const data = matchedData(req) - const user = await findUser(data.email) - await userIsBlocked(user) - await checkLoginAttemptsAndBlockExpires(user) - const isPasswordMatch = await auth.checkPassword(data.password, user) - if (!isPasswordMatch) { - utils.handleError(res, await passwordsDoNotMatch(user)) - } else { - // all ok, register access and return token - user.loginAttempts = 0 - await saveLoginAttemptsToDB(user) - res.status(200).json(await saveUserAccessAndReturnToken(req, user)) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Register function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.register = async (req, res) => { - try { - // Gets locale from header 'Accept-Language' - const locale = req.getLocale() - req = matchedData(req) - const doesEmailExists = await emailer.emailExists(req.email) - if (!doesEmailExists) { - const item = await registerUser(req) - const userInfo = setUserInfo(item) - const response = returnRegisterToken(item, userInfo) - emailer.sendRegistrationEmailMessage(locale, item) - res.status(201).json(response) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Verify function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.verify = async (req, res) => { - try { - req = matchedData(req) - const user = await verificationExists(req.id) - res.status(200).json(await verifyUser(user)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Forgot password function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.forgotPassword = async (req, res) => { - try { - // Gets locale from header 'Accept-Language' - const locale = req.getLocale() - const data = matchedData(req) - await findUser(data.email) - const item = await saveForgotPassword(req) - emailer.sendResetPasswordEmailMessage(locale, item) - res.status(200).json(forgotPasswordResponse(item)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Reset password function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.resetPassword = async (req, res) => { - try { - const data = matchedData(req) - const forgotPassword = await findForgotPassword(data.id) - const user = await findUserToResetPassword(forgotPassword.email) - await updatePassword(data.password, user) - const result = await markResetPasswordAsUsed(req, forgotPassword) - res.status(200).json(result) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Refresh token function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getRefreshToken = async (req, res) => { - try { - const tokenEncrypted = req.headers.authorization - .replace('Bearer ', '') - .trim() - let userId = await getUserIdFromToken(tokenEncrypted) - userId = await utils.isIDGood(userId) - const user = await findUserById(userId) - const token = await saveUserAccessAndReturnToken(req, user) - // Removes user info from response - delete token.user - res.status(200).json(token) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Roles authorization function called by route - * @param {Array} roles - roles specified on the route - */ -exports.roleAuthorization = (roles) => async (req, res, next) => { - try { - const data = { - id: req.user._id, - roles - } - await checkPermissions(data, next) - } catch (error) { - utils.handleError(res, error) - } -} diff --git a/app/controllers/auth.validate.js b/app/controllers/auth.validate.js deleted file mode 100755 index 9e79ed0..0000000 --- a/app/controllers/auth.validate.js +++ /dev/null @@ -1,119 +0,0 @@ -const { validationResult } = require('../middleware/utils') -const { check } = require('express-validator') - -/** - * Validates register request - */ -exports.register = [ - check('name') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('email') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isEmail() - .withMessage('EMAIL_IS_NOT_VALID'), - check('password') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates login request - */ -exports.login = [ - check('email') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isEmail() - .withMessage('EMAIL_IS_NOT_VALID'), - check('password') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates verify request - */ -exports.verify = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates forgot password request - */ -exports.forgotPassword = [ - check('email') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isEmail() - .withMessage('EMAIL_IS_NOT_VALID'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates reset password request - */ -exports.resetPassword = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('password') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - (req, res, next) => { - validationResult(req, res, next) - } -] diff --git a/app/controllers/auth/forgotPassword.js b/app/controllers/auth/forgotPassword.js new file mode 100644 index 0000000..910a72a --- /dev/null +++ b/app/controllers/auth/forgotPassword.js @@ -0,0 +1,29 @@ +const { matchedData } = require('express-validator') +const { + findUser, + forgotPasswordResponse, + saveForgotPassword +} = require('./helpers') +const utils = require('../../middleware/utils') +const emailer = require('../../middleware/emailer') + +/** + * Forgot password function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const forgotPassword = async (req, res) => { + try { + // Gets locale from header 'Accept-Language' + const locale = req.getLocale() + const data = matchedData(req) + await findUser(data.email) + const item = await saveForgotPassword(req) + emailer.sendResetPasswordEmailMessage(locale, item) + res.status(200).json(forgotPasswordResponse(item)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { forgotPassword } diff --git a/app/controllers/auth/getRefreshToken.js b/app/controllers/auth/getRefreshToken.js new file mode 100644 index 0000000..2eb418d --- /dev/null +++ b/app/controllers/auth/getRefreshToken.js @@ -0,0 +1,30 @@ +const { + getUserIdFromToken, + findUserById, + saveUserAccessAndReturnToken +} = require('./helpers') +const utils = require('../../middleware/utils') + +/** + * Refresh token function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getRefreshToken = async (req, res) => { + try { + const tokenEncrypted = req.headers.authorization + .replace('Bearer ', '') + .trim() + let userId = await getUserIdFromToken(tokenEncrypted) + userId = await utils.isIDGood(userId) + const user = await findUserById(userId) + const token = await saveUserAccessAndReturnToken(req, user) + // Removes user info from response + delete token.user + res.status(200).json(token) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getRefreshToken } diff --git a/app/controllers/auth/helpers/blockIsExpired.js b/app/controllers/auth/helpers/blockIsExpired.js new file mode 100644 index 0000000..5dd88cc --- /dev/null +++ b/app/controllers/auth/helpers/blockIsExpired.js @@ -0,0 +1,10 @@ +const LOGIN_ATTEMPTS = 5 + +/** + * Checks that login attempts are greater than specified in constant and also that blockexpires is less than now + * @param {Object} user - user object + */ +const blockIsExpired = (user) => + user.loginAttempts > LOGIN_ATTEMPTS && user.blockExpires <= new Date() + +module.exports = { blockIsExpired } diff --git a/app/controllers/auth/helpers/blockUser.js b/app/controllers/auth/helpers/blockUser.js new file mode 100644 index 0000000..4a0f953 --- /dev/null +++ b/app/controllers/auth/helpers/blockUser.js @@ -0,0 +1,24 @@ +const { addHours } = require('date-fns') +const HOURS_TO_BLOCK = 2 + +const utils = require('../../../middleware/utils') + +/** + * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK + * @param {Object} user - user object + */ +const blockUser = (user) => { + return new Promise((resolve, reject) => { + user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK) + user.save((err, result) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + if (result) { + resolve(utils.buildErrObject(409, 'BLOCKED_USER')) + } + }) + }) +} + +module.exports = { blockUser } diff --git a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js new file mode 100644 index 0000000..521e059 --- /dev/null +++ b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js @@ -0,0 +1,28 @@ +const { blockIsExpired } = require('./blockIsExpired') +const utils = require('../../../middleware/utils') + +/** + * + * @param {Object} user - user object. + */ +const checkLoginAttemptsAndBlockExpires = (user) => { + return new Promise((resolve, reject) => { + // Let user try to login again after blockexpires, resets user loginAttempts + if (blockIsExpired(user)) { + user.loginAttempts = 0 + user.save((err, result) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + if (result) { + resolve(true) + } + }) + } else { + // User is not blocked, check password (normal behaviour) + resolve(true) + } + }) +} + +module.exports = { checkLoginAttemptsAndBlockExpires } diff --git a/app/controllers/auth/helpers/checkPermissions.js b/app/controllers/auth/helpers/checkPermissions.js new file mode 100644 index 0000000..486a8fb --- /dev/null +++ b/app/controllers/auth/helpers/checkPermissions.js @@ -0,0 +1,21 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Checks against user if has quested role + * @param {Object} data - data object + * @param {*} next - next callback + */ +const checkPermissions = (data, next) => { + return new Promise((resolve, reject) => { + User.findById(data.id, (err, result) => { + utils.itemNotFound(err, result, reject, 'NOT_FOUND') + if (data.roles.indexOf(result.role) > -1) { + return resolve(next()) + } + return reject(utils.buildErrObject(401, 'UNAUTHORIZED')) + }) + }) +} + +module.exports = { checkPermissions } diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js new file mode 100644 index 0000000..54663c9 --- /dev/null +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -0,0 +1,23 @@ +const ForgotPassword = require('../../../models/forgotPassword') +const utils = require('../../../middleware/utils') + +/** + * Checks if a forgot password verification exists + * @param {string} id - verification id + */ +const findForgotPassword = (id) => { + return new Promise((resolve, reject) => { + ForgotPassword.findOne( + { + verification: id, + used: false + }, + (err, item) => { + utils.itemNotFound(err, item, reject, 'NOT_FOUND_OR_ALREADY_USED') + resolve(item) + } + ) + }) +} + +module.exports = { findForgotPassword } diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js new file mode 100644 index 0000000..8fe5e01 --- /dev/null +++ b/app/controllers/auth/helpers/findUser.js @@ -0,0 +1,23 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Finds user by email + * @param {string} email - user´s email + */ +const findUser = (email) => { + return new Promise((resolve, reject) => { + User.findOne( + { + email + }, + 'password loginAttempts blockExpires name email role verified verification', + (err, item) => { + utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') + resolve(item) + } + ) + }) +} + +module.exports = { findUser } diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js new file mode 100644 index 0000000..6a85e50 --- /dev/null +++ b/app/controllers/auth/helpers/findUserById.js @@ -0,0 +1,17 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Finds user by ID + * @param {string} id - user´s id + */ +const findUserById = (userId) => { + return new Promise((resolve, reject) => { + User.findById(userId, (err, item) => { + utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') + resolve(item) + }) + }) +} + +module.exports = { findUserById } diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js new file mode 100644 index 0000000..7075c3f --- /dev/null +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -0,0 +1,22 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Finds user by email to reset password + * @param {string} email - user email + */ +const findUserToResetPassword = (email) => { + return new Promise((resolve, reject) => { + User.findOne( + { + email + }, + (err, user) => { + utils.itemNotFound(err, user, reject, 'NOT_FOUND') + resolve(user) + } + ) + }) +} + +module.exports = { findUserToResetPassword } diff --git a/app/controllers/auth/helpers/forgotPasswordResponse.js b/app/controllers/auth/helpers/forgotPasswordResponse.js new file mode 100644 index 0000000..52736b0 --- /dev/null +++ b/app/controllers/auth/helpers/forgotPasswordResponse.js @@ -0,0 +1,19 @@ +/** + * Builds an object with created forgot password object, if env is development or testing exposes the verification + * @param {Object} item - created forgot password object + */ +const forgotPasswordResponse = (item) => { + let data = { + msg: 'RESET_EMAIL_SENT', + email: item.email + } + if (process.env.NODE_ENV !== 'production') { + data = { + ...data, + verification: item.verification + } + } + return data +} + +module.exports = { forgotPasswordResponse } diff --git a/app/controllers/auth/helpers/generateToken.js b/app/controllers/auth/helpers/generateToken.js new file mode 100644 index 0000000..4a63b89 --- /dev/null +++ b/app/controllers/auth/helpers/generateToken.js @@ -0,0 +1,27 @@ +const jwt = require('jsonwebtoken') +const auth = require('../../../middleware/auth') + +/** + * Generates a token + * @param {Object} user - user object + */ +const generateToken = (user) => { + // Gets expiration time + const expiration = + Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES + + // returns signed and encrypted token + return auth.encrypt( + jwt.sign( + { + data: { + _id: user + }, + exp: expiration + }, + process.env.JWT_SECRET + ) + ) +} + +module.exports = { generateToken } diff --git a/app/controllers/auth/helpers/getUserIdFromToken.js b/app/controllers/auth/helpers/getUserIdFromToken.js new file mode 100644 index 0000000..dfca050 --- /dev/null +++ b/app/controllers/auth/helpers/getUserIdFromToken.js @@ -0,0 +1,21 @@ +const jwt = require('jsonwebtoken') +const utils = require('../../../middleware/utils') +const auth = require('../../../middleware/auth') + +/** + * Gets user id from token + * @param {string} token - Encrypted and encoded token + */ +const getUserIdFromToken = (token) => { + return new Promise((resolve, reject) => { + // Decrypts, verifies and decode token + jwt.verify(auth.decrypt(token), process.env.JWT_SECRET, (err, decoded) => { + if (err) { + reject(utils.buildErrObject(409, 'BAD_TOKEN')) + } + resolve(decoded.data._id) + }) + }) +} + +module.exports = { getUserIdFromToken } diff --git a/app/controllers/auth/helpers/index.js b/app/controllers/auth/helpers/index.js new file mode 100644 index 0000000..e0139ad --- /dev/null +++ b/app/controllers/auth/helpers/index.js @@ -0,0 +1,53 @@ +const { blockIsExpired } = require('./blockIsExpired') +const { blockUser } = require('./blockUser') +const { + checkLoginAttemptsAndBlockExpires +} = require('./checkLoginAttemptsAndBlockExpires') +const { checkPermissions } = require('./checkPermissions') +const { findForgotPassword } = require('./findForgotPassword') +const { findUser } = require('./findUser') +const { findUserById } = require('./findUserById') +const { findUserToResetPassword } = require('./findUserToResetPassword') +const { forgotPasswordResponse } = require('./forgotPasswordResponse') +const { generateToken } = require('./generateToken') +const { getUserIdFromToken } = require('./getUserIdFromToken') +const { markResetPasswordAsUsed } = require('./markResetPasswordAsUsed') +const { passwordsDoNotMatch } = require('./passwordsDoNotMatch') +const { registerUser } = require('./registerUser') +const { returnRegisterToken } = require('./returnRegisterToken') +const { saveForgotPassword } = require('./saveForgotPassword') +const { saveLoginAttemptsToDB } = require('./saveLoginAttemptsToDB') +const { + saveUserAccessAndReturnToken +} = require('./saveUserAccessAndReturnToken') +const { setUserInfo } = require('./setUserInfo') +const { updatePassword } = require('./updatePassword') +const { userIsBlocked } = require('./userIsBlocked') +const { verificationExists } = require('./verificationExists') +const { verifyUser } = require('./verifyUser') + +module.exports = { + blockIsExpired, + blockUser, + checkLoginAttemptsAndBlockExpires, + checkPermissions, + findForgotPassword, + findUser, + findUserById, + findUserToResetPassword, + forgotPasswordResponse, + generateToken, + getUserIdFromToken, + markResetPasswordAsUsed, + passwordsDoNotMatch, + registerUser, + returnRegisterToken, + saveForgotPassword, + saveLoginAttemptsToDB, + saveUserAccessAndReturnToken, + setUserInfo, + updatePassword, + userIsBlocked, + verificationExists, + verifyUser +} diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js new file mode 100644 index 0000000..ff9a057 --- /dev/null +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -0,0 +1,21 @@ +const utils = require('../../../middleware/utils') + +/** + * Marks a request to reset password as used + * @param {Object} req - request object + * @param {Object} forgot - forgot object + */ +const markResetPasswordAsUsed = (req, forgot) => { + return new Promise((resolve, reject) => { + forgot.used = true + forgot.ipChanged = utils.getIP(req) + forgot.browserChanged = utils.getBrowserInfo(req) + forgot.countryChanged = utils.getCountry(req) + forgot.save((err, item) => { + utils.itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(utils.buildSuccObject('PASSWORD_CHANGED')) + }) + }) +} + +module.exports = { markResetPasswordAsUsed } diff --git a/app/controllers/auth/helpers/passwordsDoNotMatch.js b/app/controllers/auth/helpers/passwordsDoNotMatch.js new file mode 100644 index 0000000..e2cd67a --- /dev/null +++ b/app/controllers/auth/helpers/passwordsDoNotMatch.js @@ -0,0 +1,23 @@ +const { saveLoginAttemptsToDB } = require('./saveLoginAttemptsToDB') +const { blockUser } = require('./blockUser') +const utils = require('../../../middleware/utils') +const LOGIN_ATTEMPTS = 5 + +/** + * Adds one attempt to loginAttempts, then compares loginAttempts with the constant LOGIN_ATTEMPTS, if is less returns wrong password, else returns blockUser function + * @param {Object} user - user object + */ +const passwordsDoNotMatch = async (user) => { + user.loginAttempts += 1 + await saveLoginAttemptsToDB(user) + return new Promise((resolve, reject) => { + if (user.loginAttempts <= LOGIN_ATTEMPTS) { + resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) + } else { + resolve(blockUser(user)) + } + reject(utils.buildErrObject(422, 'ERROR')) + }) +} + +module.exports = { passwordsDoNotMatch } diff --git a/app/controllers/auth/helpers/registerUser.js b/app/controllers/auth/helpers/registerUser.js new file mode 100644 index 0000000..572dd2a --- /dev/null +++ b/app/controllers/auth/helpers/registerUser.js @@ -0,0 +1,26 @@ +const uuid = require('uuid') +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Registers a new user in database + * @param {Object} req - request object + */ +const registerUser = (req) => { + return new Promise((resolve, reject) => { + const user = new User({ + name: req.name, + email: req.email, + password: req.password, + verification: uuid.v4() + }) + user.save((err, item) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + resolve(item) + }) + }) +} + +module.exports = { registerUser } diff --git a/app/controllers/auth/helpers/returnRegisterToken.js b/app/controllers/auth/helpers/returnRegisterToken.js new file mode 100644 index 0000000..01e7829 --- /dev/null +++ b/app/controllers/auth/helpers/returnRegisterToken.js @@ -0,0 +1,19 @@ +const { generateToken } = require('./generateToken') + +/** + * Builds the registration token + * @param {Object} item - user object that contains created id + * @param {Object} userInfo - user object + */ +const returnRegisterToken = (item, userInfo) => { + if (process.env.NODE_ENV !== 'production') { + userInfo.verification = item.verification + } + const data = { + token: generateToken(item._id), + user: userInfo + } + return data +} + +module.exports = { returnRegisterToken } diff --git a/app/controllers/auth/helpers/saveForgotPassword.js b/app/controllers/auth/helpers/saveForgotPassword.js new file mode 100644 index 0000000..466567d --- /dev/null +++ b/app/controllers/auth/helpers/saveForgotPassword.js @@ -0,0 +1,27 @@ +const uuid = require('uuid') +const ForgotPassword = require('../../../models/forgotPassword') +const utils = require('../../../middleware/utils') + +/** + * Creates a new password forgot + * @param {Object} req - request object + */ +const saveForgotPassword = (req) => { + return new Promise((resolve, reject) => { + const forgot = new ForgotPassword({ + email: req.body.email, + verification: uuid.v4(), + ipRequest: utils.getIP(req), + browserRequest: utils.getBrowserInfo(req), + countryRequest: utils.getCountry(req) + }) + forgot.save((err, item) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + resolve(item) + }) + }) +} + +module.exports = { saveForgotPassword } diff --git a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js new file mode 100644 index 0000000..5efbebb --- /dev/null +++ b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js @@ -0,0 +1,20 @@ +const utils = require('../../../middleware/utils') + +/** + * Saves login attempts to dabatabse + * @param {Object} user - user object + */ +const saveLoginAttemptsToDB = (user) => { + return new Promise((resolve, reject) => { + user.save((err, result) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + if (result) { + resolve(true) + } + }) + }) +} + +module.exports = { saveLoginAttemptsToDB } diff --git a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js new file mode 100644 index 0000000..6101e3e --- /dev/null +++ b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js @@ -0,0 +1,33 @@ +const UserAccess = require('../../../models/userAccess') +const { setUserInfo } = require('./setUserInfo') +const { generateToken } = require('./generateToken') +const utils = require('../../../middleware/utils') + +/** + * Saves a new user access and then returns token + * @param {Object} req - request object + * @param {Object} user - user object + */ +const saveUserAccessAndReturnToken = (req, user) => { + return new Promise((resolve, reject) => { + const userAccess = new UserAccess({ + email: user.email, + ip: utils.getIP(req), + browser: utils.getBrowserInfo(req), + country: utils.getCountry(req) + }) + userAccess.save((err) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + const userInfo = setUserInfo(user) + // Returns data with access token + resolve({ + token: generateToken(user._id), + user: userInfo + }) + }) + }) +} + +module.exports = { saveUserAccessAndReturnToken } diff --git a/app/controllers/auth/helpers/setUserInfo.js b/app/controllers/auth/helpers/setUserInfo.js new file mode 100644 index 0000000..2fd5d90 --- /dev/null +++ b/app/controllers/auth/helpers/setUserInfo.js @@ -0,0 +1,23 @@ +/** + * Creates an object with user info + * @param {Object} req - request object + */ +const setUserInfo = (req) => { + let user = { + _id: req._id, + name: req.name, + email: req.email, + role: req.role, + verified: req.verified + } + // Adds verification for testing purposes + if (process.env.NODE_ENV !== 'production') { + user = { + ...user, + verification: req.verification + } + } + return user +} + +module.exports = { setUserInfo } diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js new file mode 100644 index 0000000..3f4a834 --- /dev/null +++ b/app/controllers/auth/helpers/updatePassword.js @@ -0,0 +1,18 @@ +const utils = require('../../../middleware/utils') + +/** + * Updates a user password in database + * @param {string} password - new password + * @param {Object} user - user object + */ +const updatePassword = (password, user) => { + return new Promise((resolve, reject) => { + user.password = password + user.save((err, item) => { + utils.itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(item) + }) + }) +} + +module.exports = { updatePassword } diff --git a/app/controllers/auth/helpers/userIsBlocked.js b/app/controllers/auth/helpers/userIsBlocked.js new file mode 100644 index 0000000..80dcf1e --- /dev/null +++ b/app/controllers/auth/helpers/userIsBlocked.js @@ -0,0 +1,16 @@ +const utils = require('../../../middleware/utils') + +/** + * Checks if blockExpires from user is greater than now + * @param {Object} user - user object + */ +const userIsBlocked = (user) => { + return new Promise((resolve, reject) => { + if (user.blockExpires > new Date()) { + reject(utils.buildErrObject(409, 'BLOCKED_USER')) + } + resolve(true) + }) +} + +module.exports = { userIsBlocked } diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js new file mode 100644 index 0000000..290d34f --- /dev/null +++ b/app/controllers/auth/helpers/verificationExists.js @@ -0,0 +1,23 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Checks if verification id exists for user + * @param {string} id - verification id + */ +const verificationExists = (id) => { + return new Promise((resolve, reject) => { + User.findOne( + { + verification: id, + verified: false + }, + (err, user) => { + utils.itemNotFound(err, user, reject, 'NOT_FOUND_OR_ALREADY_VERIFIED') + resolve(user) + } + ) + }) +} + +module.exports = { verificationExists } diff --git a/app/controllers/auth/helpers/verifyUser.js b/app/controllers/auth/helpers/verifyUser.js new file mode 100644 index 0000000..d095b31 --- /dev/null +++ b/app/controllers/auth/helpers/verifyUser.js @@ -0,0 +1,22 @@ +const utils = require('../../../middleware/utils') + +/** + * Verifies an user + * @param {Object} user - user object + */ +const verifyUser = (user) => { + return new Promise((resolve, reject) => { + user.verified = true + user.save((err, item) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + resolve({ + email: item.email, + verified: item.verified + }) + }) + }) +} + +module.exports = { verifyUser } diff --git a/app/controllers/auth/index.js b/app/controllers/auth/index.js new file mode 100644 index 0000000..b6d8ead --- /dev/null +++ b/app/controllers/auth/index.js @@ -0,0 +1,17 @@ +const { forgotPassword } = require('./forgotPassword') +const { getRefreshToken } = require('./getRefreshToken') +const { login } = require('./login') +const { register } = require('./register') +const { resetPassword } = require('./resetPassword') +const { roleAuthorization } = require('./roleAuthorization') +const { verify } = require('./verify') + +module.exports = { + forgotPassword, + getRefreshToken, + login, + register, + resetPassword, + roleAuthorization, + verify +} diff --git a/app/controllers/auth/login.js b/app/controllers/auth/login.js new file mode 100644 index 0000000..14eeb5b --- /dev/null +++ b/app/controllers/auth/login.js @@ -0,0 +1,40 @@ +const { matchedData } = require('express-validator') + +const { + findUser, + userIsBlocked, + checkLoginAttemptsAndBlockExpires, + passwordsDoNotMatch, + saveLoginAttemptsToDB, + saveUserAccessAndReturnToken +} = require('./helpers') + +const utils = require('../../middleware/utils') +const auth = require('../../middleware/auth') + +/** + * Login function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const login = async (req, res) => { + try { + const data = matchedData(req) + const user = await findUser(data.email) + await userIsBlocked(user) + await checkLoginAttemptsAndBlockExpires(user) + const isPasswordMatch = await auth.checkPassword(data.password, user) + if (!isPasswordMatch) { + utils.handleError(res, await passwordsDoNotMatch(user)) + } else { + // all ok, register access and return token + user.loginAttempts = 0 + await saveLoginAttemptsToDB(user) + res.status(200).json(await saveUserAccessAndReturnToken(req, user)) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { login } diff --git a/app/controllers/auth/register.js b/app/controllers/auth/register.js new file mode 100644 index 0000000..3c6dc7e --- /dev/null +++ b/app/controllers/auth/register.js @@ -0,0 +1,31 @@ +const { matchedData } = require('express-validator') + +const { registerUser, setUserInfo, returnRegisterToken } = require('./helpers') + +const utils = require('../../middleware/utils') +const emailer = require('../../middleware/emailer') + +/** + * Register function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const register = async (req, res) => { + try { + // Gets locale from header 'Accept-Language' + const locale = req.getLocale() + req = matchedData(req) + const doesEmailExists = await emailer.emailExists(req.email) + if (!doesEmailExists) { + const item = await registerUser(req) + const userInfo = setUserInfo(item) + const response = returnRegisterToken(item, userInfo) + emailer.sendRegistrationEmailMessage(locale, item) + res.status(201).json(response) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { register } diff --git a/app/controllers/auth/resetPassword.js b/app/controllers/auth/resetPassword.js new file mode 100644 index 0000000..1513c2a --- /dev/null +++ b/app/controllers/auth/resetPassword.js @@ -0,0 +1,26 @@ +const { matchedData } = require('express-validator') +const { + findForgotPassword, + findUserToResetPassword, + updatePassword, + markResetPasswordAsUsed +} = require('./helpers') +const utils = require('../../middleware/utils') + +/** + * Reset password function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +exports.resetPassword = async (req, res) => { + try { + const data = matchedData(req) + const forgotPassword = await findForgotPassword(data.id) + const user = await findUserToResetPassword(forgotPassword.email) + await updatePassword(data.password, user) + const result = await markResetPasswordAsUsed(req, forgotPassword) + res.status(200).json(result) + } catch (error) { + utils.handleError(res, error) + } +} diff --git a/app/controllers/auth/roleAuthorization.js b/app/controllers/auth/roleAuthorization.js new file mode 100644 index 0000000..bb3b1ac --- /dev/null +++ b/app/controllers/auth/roleAuthorization.js @@ -0,0 +1,21 @@ +const { checkPermissions } = require('./helpers') + +const utils = require('../../middleware/utils') + +/** + * Roles authorization function called by route + * @param {Array} roles - roles specified on the route + */ +const roleAuthorization = (roles) => async (req, res, next) => { + try { + const data = { + id: req.user._id, + roles + } + await checkPermissions(data, next) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { roleAuthorization } diff --git a/app/controllers/auth/validators/index.js b/app/controllers/auth/validators/index.js new file mode 100644 index 0000000..c16c0d5 --- /dev/null +++ b/app/controllers/auth/validators/index.js @@ -0,0 +1,13 @@ +const { validateForgotPassword } = require('./validateForgotPassword') +const { validateLogin } = require('./validateLogin') +const { validateRegister } = require('./validateRegister') +const { validateResetPassword } = require('./validateResetPassword') +const { validateVerify } = require('./validateVerify') + +module.exports = { + validateForgotPassword, + validateLogin, + validateRegister, + validateResetPassword, + validateVerify +} diff --git a/app/controllers/auth/validators/validateForgotPassword.js b/app/controllers/auth/validators/validateForgotPassword.js new file mode 100644 index 0000000..0f0f8de --- /dev/null +++ b/app/controllers/auth/validators/validateForgotPassword.js @@ -0,0 +1,21 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates forgot password request + */ +const validateForgotPassword = [ + check('email') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isEmail() + .withMessage('EMAIL_IS_NOT_VALID'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateForgotPassword } diff --git a/app/controllers/auth/validators/validateLogin.js b/app/controllers/auth/validators/validateLogin.js new file mode 100644 index 0000000..a39c54a --- /dev/null +++ b/app/controllers/auth/validators/validateLogin.js @@ -0,0 +1,34 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates register request + */ +/** + * Validates login request + */ +const validateLogin = [ + check('email') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isEmail() + .withMessage('EMAIL_IS_NOT_VALID'), + check('password') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateLogin } diff --git a/app/controllers/auth/validators/validateRegister.js b/app/controllers/auth/validators/validateRegister.js new file mode 100644 index 0000000..f948360 --- /dev/null +++ b/app/controllers/auth/validators/validateRegister.js @@ -0,0 +1,37 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates register request + */ +const validateRegister = [ + check('name') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('email') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isEmail() + .withMessage('EMAIL_IS_NOT_VALID'), + check('password') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateRegister } diff --git a/app/controllers/auth/validators/validateResetPassword.js b/app/controllers/auth/validators/validateResetPassword.js new file mode 100644 index 0000000..af38af1 --- /dev/null +++ b/app/controllers/auth/validators/validateResetPassword.js @@ -0,0 +1,29 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates reset password request + */ +const validateResetPassword = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('password') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateResetPassword } diff --git a/app/controllers/auth/validators/validateVerify.js b/app/controllers/auth/validators/validateVerify.js new file mode 100644 index 0000000..c7fbb50 --- /dev/null +++ b/app/controllers/auth/validators/validateVerify.js @@ -0,0 +1,19 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates verify request + */ +const validateVerify = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateVerify } diff --git a/app/controllers/auth/verify.js b/app/controllers/auth/verify.js new file mode 100644 index 0000000..3e0702a --- /dev/null +++ b/app/controllers/auth/verify.js @@ -0,0 +1,21 @@ +const { matchedData } = require('express-validator') +const { verificationExists, verifyUser } = require('./helpers') + +const utils = require('../../middleware/utils') + +/** + * Verify function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const verify = async (req, res) => { + try { + req = matchedData(req) + const user = await verificationExists(req.id) + res.status(200).json(await verifyUser(user)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { verify } diff --git a/app/controllers/cities.js b/app/controllers/cities.js deleted file mode 100755 index 117ccf8..0000000 --- a/app/controllers/cities.js +++ /dev/null @@ -1,167 +0,0 @@ -const model = require('../models/city') -const { matchedData } = require('express-validator') -const utils = require('../middleware/utils') -const db = require('../middleware/db') - -/********************* - * Private functions * - *********************/ - -/** - * Checks if a city already exists excluding itself - * @param {string} id - id of item - * @param {string} name - name of item - */ -const cityExistsExcludingItself = async (id, name) => { - return new Promise((resolve, reject) => { - model.findOne( - { - name, - _id: { - $ne: id - } - }, - (err, item) => { - utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') - resolve(false) - } - ) - }) -} - -/** - * Checks if a city already exists in database - * @param {string} name - name of item - */ -const cityExists = async (name) => { - return new Promise((resolve, reject) => { - model.findOne( - { - name - }, - (err, item) => { - utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') - resolve(false) - } - ) - }) -} - -/** - * Gets all items from database - */ -const getAllItemsFromDB = async () => { - return new Promise((resolve, reject) => { - model.find( - {}, - '-updatedAt -createdAt', - { - sort: { - name: 1 - } - }, - (err, items) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - resolve(items) - } - ) - }) -} - -/******************** - * Public functions * - ********************/ - -/** - * Get all items function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getAllItems = async (req, res) => { - try { - res.status(200).json(await getAllItemsFromDB()) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Get items function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getItems = async (req, res) => { - try { - const query = await db.checkQueryString(req.query) - res.status(200).json(await db.getItems(req, model, query)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Get item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - res.status(200).json(await db.getItem(id, model)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Update item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.updateItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - const doesCityExists = await cityExistsExcludingItself(id, req.name) - if (!doesCityExists) { - res.status(200).json(await db.updateItem(id, model, req)) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Create item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.createItem = async (req, res) => { - try { - req = matchedData(req) - const doesCityExists = await cityExists(req.name) - if (!doesCityExists) { - res.status(201).json(await db.createItem(req, model)) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Delete item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.deleteItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - res.status(200).json(await db.deleteItem(id, model)) - } catch (error) { - utils.handleError(res, error) - } -} diff --git a/app/controllers/cities.validate.js b/app/controllers/cities.validate.js deleted file mode 100755 index 8ce4f20..0000000 --- a/app/controllers/cities.validate.js +++ /dev/null @@ -1,69 +0,0 @@ -const { validationResult } = require('../middleware/utils') -const { check } = require('express-validator') - -/** - * Validates create new item request - */ -exports.createItem = [ - check('name') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates update item request - */ -exports.updateItem = [ - check('name') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates get item request - */ -exports.getItem = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates delete item request - */ -exports.deleteItem = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] diff --git a/app/controllers/cities/createItem.js b/app/controllers/cities/createItem.js new file mode 100644 index 0000000..deb24cb --- /dev/null +++ b/app/controllers/cities/createItem.js @@ -0,0 +1,24 @@ +const City = require('../../models/city') +const db = require('../../middleware/db') +const utils = require('../../middleware/utils') +const { matchedData } = require('express-validator') +const { cityExists } = require('./helpers') + +/** + * Create item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const createItem = async (req, res) => { + try { + req = matchedData(req) + const doesCityExists = await cityExists(req.name) + if (!doesCityExists) { + res.status(201).json(await db.createItem(req, City)) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { createItem } diff --git a/app/controllers/cities/deleteItem.js b/app/controllers/cities/deleteItem.js new file mode 100755 index 0000000..014bfc9 --- /dev/null +++ b/app/controllers/cities/deleteItem.js @@ -0,0 +1,21 @@ +const City = require('../../models/city') +const { matchedData } = require('express-validator') +const utils = require('../../middleware/utils') +const db = require('../../middleware/db') + +/** + * Delete item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const deleteItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + res.status(200).json(await db.deleteItem(id, City)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { deleteItem } diff --git a/app/controllers/cities/getAllItems.js b/app/controllers/cities/getAllItems.js new file mode 100644 index 0000000..f3e3374 --- /dev/null +++ b/app/controllers/cities/getAllItems.js @@ -0,0 +1,17 @@ +const utils = require('../../middleware/utils') +const { getAllItemsFromDB } = require('./helpers') + +/** + * Get all items function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getAllItems = async (req, res) => { + try { + res.status(200).json(await getAllItemsFromDB()) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getAllItems } diff --git a/app/controllers/cities/getItem.js b/app/controllers/cities/getItem.js new file mode 100644 index 0000000..bcb111c --- /dev/null +++ b/app/controllers/cities/getItem.js @@ -0,0 +1,21 @@ +const { matchedData } = require('express-validator') +const City = require('../../models/city') +const db = require('../../middleware/db') +const utils = require('../../middleware/utils') + +/** + * Get item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + res.status(200).json(await db.getItem(id, City)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getItem } diff --git a/app/controllers/cities/getItems.js b/app/controllers/cities/getItems.js new file mode 100644 index 0000000..69cbed3 --- /dev/null +++ b/app/controllers/cities/getItems.js @@ -0,0 +1,19 @@ +const City = require('../../models/city') +const db = require('../../middleware/db') +const utils = require('../../middleware/utils') + +/** + * Get items function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getItems = async (req, res) => { + try { + const query = await db.checkQueryString(req.query) + res.status(200).json(await db.getItems(req, City, query)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getItems } diff --git a/app/controllers/cities/helpers/cityExists.js b/app/controllers/cities/helpers/cityExists.js new file mode 100644 index 0000000..7be4763 --- /dev/null +++ b/app/controllers/cities/helpers/cityExists.js @@ -0,0 +1,22 @@ +const City = require('../../../models/city') +const utils = require('../../../middleware/utils') + +/** + * Checks if a city already exists in database + * @param {string} name - name of item + */ +const cityExists = (name) => { + return new Promise((resolve, reject) => { + City.findOne( + { + name + }, + (err, item) => { + utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') + resolve(false) + } + ) + }) +} + +module.exports = { cityExists } diff --git a/app/controllers/cities/helpers/cityExistsExcludingItself.js b/app/controllers/cities/helpers/cityExistsExcludingItself.js new file mode 100644 index 0000000..271eb42 --- /dev/null +++ b/app/controllers/cities/helpers/cityExistsExcludingItself.js @@ -0,0 +1,26 @@ +const City = require('../../../models/city') +const utils = require('../../../middleware/utils') + +/** + * Checks if a city already exists excluding itself + * @param {string} id - id of item + * @param {string} name - name of item + */ +const cityExistsExcludingItself = (id, name) => { + return new Promise((resolve, reject) => { + City.findOne( + { + name, + _id: { + $ne: id + } + }, + (err, item) => { + utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') + resolve(false) + } + ) + }) +} + +module.exports = { cityExistsExcludingItself } diff --git a/app/controllers/cities/helpers/getAllItemsFromDB.js b/app/controllers/cities/helpers/getAllItemsFromDB.js new file mode 100644 index 0000000..ad0ecc1 --- /dev/null +++ b/app/controllers/cities/helpers/getAllItemsFromDB.js @@ -0,0 +1,27 @@ +const City = require('../../../models/city') +const utils = require('../../../middleware/utils') + +/** + * Gets all items from database + */ +const getAllItemsFromDB = () => { + return new Promise((resolve, reject) => { + City.find( + {}, + '-updatedAt -createdAt', + { + sort: { + name: 1 + } + }, + (err, items) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + resolve(items) + } + ) + }) +} + +module.exports = { getAllItemsFromDB } diff --git a/app/controllers/cities/helpers/index.js b/app/controllers/cities/helpers/index.js new file mode 100644 index 0000000..0e895cf --- /dev/null +++ b/app/controllers/cities/helpers/index.js @@ -0,0 +1,9 @@ +const { cityExists } = require('./cityExists') +const { cityExistsExcludingItself } = require('./cityExistsExcludingItself') +const { getAllItemsFromDB } = require('./getAllItemsFromDB') + +module.exports = { + cityExists, + cityExistsExcludingItself, + getAllItemsFromDB +} diff --git a/app/controllers/cities/index.js b/app/controllers/cities/index.js new file mode 100644 index 0000000..80f3f96 --- /dev/null +++ b/app/controllers/cities/index.js @@ -0,0 +1,15 @@ +const { createItem } = require('./createItem') +const { deleteItem } = require('./deleteItem') +const { getAllItems } = require('./getAllItems') +const { getItem } = require('./getItem') +const { getItems } = require('./getItems') +const { updateItem } = require('./updateItem') + +module.exports = { + createItem, + deleteItem, + getAllItems, + getItem, + getItems, + updateItem +} diff --git a/app/controllers/cities/updateItem.js b/app/controllers/cities/updateItem.js new file mode 100644 index 0000000..1cdfafb --- /dev/null +++ b/app/controllers/cities/updateItem.js @@ -0,0 +1,25 @@ +const City = require('../../models/city') +const db = require('../../middleware/db') +const utils = require('../../middleware/utils') +const { matchedData } = require('express-validator') +const { cityExistsExcludingItself } = require('./helpers') + +/** + * Update item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const updateItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + const doesCityExists = await cityExistsExcludingItself(id, req.name) + if (!doesCityExists) { + res.status(200).json(await db.updateItem(id, City, req)) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { updateItem } diff --git a/app/controllers/cities/validators/index.js b/app/controllers/cities/validators/index.js new file mode 100644 index 0000000..1578618 --- /dev/null +++ b/app/controllers/cities/validators/index.js @@ -0,0 +1,11 @@ +const { validateCreateItem } = require('./validateCreateItem') +const { validateDeleteItem } = require('./validateDeleteItem') +const { validateGetItem } = require('./validateGetItem') +const { validateUpdateItem } = require('./validateUpdateItem') + +module.exports = { + validateCreateItem, + validateDeleteItem, + validateGetItem, + validateUpdateItem +} diff --git a/app/controllers/cities/validators/validateCreateItem.js b/app/controllers/cities/validators/validateCreateItem.js new file mode 100644 index 0000000..42ca1b3 --- /dev/null +++ b/app/controllers/cities/validators/validateCreateItem.js @@ -0,0 +1,20 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates create new item request + */ +const validateCreateItem = [ + check('name') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateCreateItem } diff --git a/app/controllers/cities/validators/validateDeleteItem.js b/app/controllers/cities/validators/validateDeleteItem.js new file mode 100644 index 0000000..f1fd7f2 --- /dev/null +++ b/app/controllers/cities/validators/validateDeleteItem.js @@ -0,0 +1,19 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates delete item request + */ +const validateDeleteItem = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateDeleteItem } diff --git a/app/controllers/cities/validators/validateGetItem.js b/app/controllers/cities/validators/validateGetItem.js new file mode 100644 index 0000000..c0e7510 --- /dev/null +++ b/app/controllers/cities/validators/validateGetItem.js @@ -0,0 +1,19 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates get item request + */ +const validateGetItem = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateGetItem } diff --git a/app/controllers/cities/validators/validateUpdateItem.js b/app/controllers/cities/validators/validateUpdateItem.js new file mode 100644 index 0000000..ed0f4bb --- /dev/null +++ b/app/controllers/cities/validators/validateUpdateItem.js @@ -0,0 +1,25 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates update item request + */ +const validateUpdateItem = [ + check('name') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateUpdateItem } diff --git a/app/controllers/profile.js b/app/controllers/profile.js deleted file mode 100755 index 4dcbc6f..0000000 --- a/app/controllers/profile.js +++ /dev/null @@ -1,146 +0,0 @@ -const model = require('../models/user') -const utils = require('../middleware/utils') -const { matchedData } = require('express-validator') -const auth = require('../middleware/auth') - -/********************* - * Private functions * - *********************/ - -/** - * Gets profile from database by id - * @param {string} id - user id - */ -const getProfileFromDB = async (id) => { - return new Promise((resolve, reject) => { - model.findById(id, '-_id -updatedAt -createdAt', (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') - resolve(user) - }) - }) -} - -/** - * Updates profile in database - * @param {Object} req - request object - * @param {string} id - user id - */ -const updateProfileInDB = async (req, id) => { - return new Promise((resolve, reject) => { - model.findByIdAndUpdate( - id, - req, - { - new: true, - runValidators: true, - select: '-role -_id -updatedAt -createdAt' - }, - (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') - resolve(user) - } - ) - }) -} - -/** - * Finds user by id - * @param {string} email - user id - */ -const findUser = async (id) => { - return new Promise((resolve, reject) => { - model.findById(id, 'password email', (err, user) => { - utils.itemNotFound(err, user, reject, 'USER_DOES_NOT_EXIST') - resolve(user) - }) - }) -} - -/** - * Build passwords do not match object - * @param {Object} user - user object - */ -const passwordsDoNotMatch = async () => { - return new Promise((resolve) => { - resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) - }) -} - -/** - * Changes password in database - * @param {string} id - user id - * @param {Object} req - request object - */ -const changePasswordInDB = async (id, req) => { - return new Promise((resolve, reject) => { - model.findById(id, '+password', (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') - - // Assigns new password to user - user.password = req.newPassword - - // Saves in DB - user.save((error) => { - if (err) { - reject(utils.buildErrObject(422, error.message)) - } - resolve(utils.buildSuccObject('PASSWORD_CHANGED')) - }) - }) - }) -} - -/******************** - * Public functions * - ********************/ - -/** - * Get profile function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getProfile = async (req, res) => { - try { - const id = await utils.isIDGood(req.user._id) - res.status(200).json(await getProfileFromDB(id)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Update profile function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.updateProfile = async (req, res) => { - try { - const id = await utils.isIDGood(req.user._id) - req = matchedData(req) - res.status(200).json(await updateProfileInDB(req, id)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Change password function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.changePassword = async (req, res) => { - try { - const id = await utils.isIDGood(req.user._id) - const user = await findUser(id) - req = matchedData(req) - const isPasswordMatch = await auth.checkPassword(req.oldPassword, user) - if (!isPasswordMatch) { - utils.handleError(res, await passwordsDoNotMatch()) - } else { - // all ok, proceed to change password - res.status(200).json(await changePasswordInDB(id, req)) - } - } catch (error) { - utils.handleError(res, error) - } -} diff --git a/app/controllers/profile/changePassword.js b/app/controllers/profile/changePassword.js new file mode 100755 index 0000000..5319f29 --- /dev/null +++ b/app/controllers/profile/changePassword.js @@ -0,0 +1,32 @@ +const utils = require('../../middleware/utils') +const { matchedData } = require('express-validator') +const auth = require('../../middleware/auth') +const { + findUser, + passwordsDoNotMatch, + changePasswordInDB +} = require('./helpers') + +/** + * Change password function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const changePassword = async (req, res) => { + try { + const id = await utils.isIDGood(req.user._id) + const user = await findUser(id) + req = matchedData(req) + const isPasswordMatch = await auth.checkPassword(req.oldPassword, user) + if (!isPasswordMatch) { + utils.handleError(res, await passwordsDoNotMatch()) + } else { + // all ok, proceed to change password + res.status(200).json(await changePasswordInDB(id, req)) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { changePassword } diff --git a/app/controllers/profile/getProfile.js b/app/controllers/profile/getProfile.js new file mode 100644 index 0000000..d768682 --- /dev/null +++ b/app/controllers/profile/getProfile.js @@ -0,0 +1,18 @@ +const { getProfileFromDB } = require('./helpers') +const utils = require('../../middleware/utils') + +/** + * Get profile function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getProfile = async (req, res) => { + try { + const id = await utils.isIDGood(req.user._id) + res.status(200).json(await getProfileFromDB(id)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getProfile } diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js new file mode 100644 index 0000000..96d441d --- /dev/null +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -0,0 +1,28 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Changes password in database + * @param {string} id - user id + * @param {Object} req - request object + */ +const changePasswordInDB = (id, req) => { + return new Promise((resolve, reject) => { + User.findById(id, '+password', (err, user) => { + utils.itemNotFound(err, user, reject, 'NOT_FOUND') + + // Assigns new password to user + user.password = req.newPassword + + // Saves in DB + user.save((error) => { + if (err) { + reject(utils.buildErrObject(422, error.message)) + } + resolve(utils.buildSuccObject('PASSWORD_CHANGED')) + }) + }) + }) +} + +module.exports = { changePasswordInDB } diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js new file mode 100644 index 0000000..7a0877b --- /dev/null +++ b/app/controllers/profile/helpers/findUser.js @@ -0,0 +1,17 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Finds user by id + * @param {string} email - user id + */ +const findUser = (id) => { + return new Promise((resolve, reject) => { + User.findById(id, 'password email', (err, user) => { + utils.itemNotFound(err, user, reject, 'USER_DOES_NOT_EXIST') + resolve(user) + }) + }) +} + +module.exports = { findUser } diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js new file mode 100644 index 0000000..a2534c5 --- /dev/null +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -0,0 +1,17 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Gets profile from database by id + * @param {string} id - user id + */ +const getProfileFromDB = (id) => { + return new Promise((resolve, reject) => { + User.findById(id, '-_id -updatedAt -createdAt', (err, user) => { + utils.itemNotFound(err, user, reject, 'NOT_FOUND') + resolve(user) + }) + }) +} + +module.exports = { getProfileFromDB } diff --git a/app/controllers/profile/helpers/index.js b/app/controllers/profile/helpers/index.js new file mode 100644 index 0000000..988db62 --- /dev/null +++ b/app/controllers/profile/helpers/index.js @@ -0,0 +1,13 @@ +const { changePasswordInDB } = require('./changePasswordInDB') +const { findUser } = require('./findUser') +const { getProfileFromDB } = require('./getProfileFromDB') +const { passwordsDoNotMatch } = require('./passwordsDoNotMatch') +const { updateProfileInDB } = require('./updateProfileInDB') + +module.exports = { + changePasswordInDB, + findUser, + getProfileFromDB, + passwordsDoNotMatch, + updateProfileInDB +} diff --git a/app/controllers/profile/helpers/passwordsDoNotMatch.js b/app/controllers/profile/helpers/passwordsDoNotMatch.js new file mode 100644 index 0000000..7874d34 --- /dev/null +++ b/app/controllers/profile/helpers/passwordsDoNotMatch.js @@ -0,0 +1,13 @@ +const utils = require('../../../middleware/utils') + +/** + * Build passwords do not match object + * @param {Object} user - user object + */ +const passwordsDoNotMatch = () => { + return new Promise((resolve) => { + resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) + }) +} + +module.exports = { passwordsDoNotMatch } diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js new file mode 100644 index 0000000..93eacc3 --- /dev/null +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -0,0 +1,27 @@ +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Updates profile in database + * @param {Object} req - request object + * @param {string} id - user id + */ +const updateProfileInDB = (req, id) => { + return new Promise((resolve, reject) => { + User.findByIdAndUpdate( + id, + req, + { + new: true, + runValidators: true, + select: '-role -_id -updatedAt -createdAt' + }, + (err, user) => { + utils.itemNotFound(err, user, reject, 'NOT_FOUND') + resolve(user) + } + ) + }) +} + +module.exports = { updateProfileInDB } diff --git a/app/controllers/profile/index.js b/app/controllers/profile/index.js new file mode 100644 index 0000000..b53c911 --- /dev/null +++ b/app/controllers/profile/index.js @@ -0,0 +1,9 @@ +const { changePassword } = require('./changePassword') +const { getProfile } = require('./getProfile') +const { updateProfile } = require('./updateProfile') + +module.exports = { + changePassword, + getProfile, + updateProfile +} diff --git a/app/controllers/profile/updateProfile.js b/app/controllers/profile/updateProfile.js new file mode 100644 index 0000000..44c36de --- /dev/null +++ b/app/controllers/profile/updateProfile.js @@ -0,0 +1,18 @@ +const utils = require('../../middleware/utils') +const { matchedData } = require('express-validator') +const { updateProfileInDB } = require('./helpers') + +/** + * Update profile function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +exports.updateProfile = async (req, res) => { + try { + const id = await utils.isIDGood(req.user._id) + req = matchedData(req) + res.status(200).json(await updateProfileInDB(req, id)) + } catch (error) { + utils.handleError(res, error) + } +} diff --git a/app/controllers/profile/validators/index.js b/app/controllers/profile/validators/index.js new file mode 100644 index 0000000..a5a97e8 --- /dev/null +++ b/app/controllers/profile/validators/index.js @@ -0,0 +1,7 @@ +const { validateChangePassword } = require('./validateChangePassword') +const { validateUpdateProfile } = require('./validateUpdateProfile') + +module.exports = { + validateChangePassword, + validateUpdateProfile +} diff --git a/app/controllers/profile/validators/validateChangePassword.js b/app/controllers/profile/validators/validateChangePassword.js new file mode 100755 index 0000000..6fb624e --- /dev/null +++ b/app/controllers/profile/validators/validateChangePassword.js @@ -0,0 +1,31 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates change password request + */ +const validateChangePassword = [ + check('oldPassword') + .optional() + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + check('newPassword') + .optional() + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateChangePassword } diff --git a/app/controllers/profile/validators/validateUpdateProfile.js b/app/controllers/profile/validators/validateUpdateProfile.js new file mode 100644 index 0000000..1774fa6 --- /dev/null +++ b/app/controllers/profile/validators/validateUpdateProfile.js @@ -0,0 +1,49 @@ +const { validationResult } = require('../../../middleware/utils') +const validator = require('validator') +const { check } = require('express-validator') + +/** + * Validates update profile request + */ +const validateUpdateProfile = [ + check('name') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('phone') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('city') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('country') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('urlTwitter') + .optional() + .custom((v) => (v === '' ? true : validator.isURL(v))) + .withMessage('NOT_A_VALID_URL'), + check('urlGitHub') + .optional() + .custom((v) => (v === '' ? true : validator.isURL(v))) + .withMessage('NOT_A_VALID_URL'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateUpdateProfile } diff --git a/app/controllers/users.js b/app/controllers/users.js deleted file mode 100755 index 333f7e7..0000000 --- a/app/controllers/users.js +++ /dev/null @@ -1,135 +0,0 @@ -const model = require('../models/user') -const uuid = require('uuid') -const { matchedData } = require('express-validator') -const utils = require('../middleware/utils') -const db = require('../middleware/db') -const emailer = require('../middleware/emailer') - -/********************* - * Private functions * - *********************/ - -/** - * Creates a new item in database - * @param {Object} req - request object - */ -const createItem = async (req) => { - return new Promise((resolve, reject) => { - const user = new model({ - name: req.name, - email: req.email, - password: req.password, - role: req.role, - phone: req.phone, - city: req.city, - country: req.country, - verification: uuid.v4() - }) - user.save((err, item) => { - if (err) { - reject(utils.buildErrObject(422, err.message)) - } - // Removes properties with rest operator - const removeProperties = ({ - // eslint-disable-next-line no-unused-vars - password, - // eslint-disable-next-line no-unused-vars - blockExpires, - // eslint-disable-next-line no-unused-vars - loginAttempts, - ...rest - }) => rest - resolve(removeProperties(item.toObject())) - }) - }) -} - -/******************** - * Public functions * - ********************/ - -/** - * Get items function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getItems = async (req, res) => { - try { - const query = await db.checkQueryString(req.query) - res.status(200).json(await db.getItems(req, model, query)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Get item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.getItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - res.status(200).json(await db.getItem(id, model)) - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Update item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.updateItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - const doesEmailExists = await emailer.emailExistsExcludingMyself( - id, - req.email - ) - if (!doesEmailExists) { - res.status(200).json(await db.updateItem(id, model, req)) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Create item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.createItem = async (req, res) => { - try { - // Gets locale from header 'Accept-Language' - const locale = req.getLocale() - req = matchedData(req) - const doesEmailExists = await emailer.emailExists(req.email) - if (!doesEmailExists) { - const item = await createItem(req) - emailer.sendRegistrationEmailMessage(locale, item) - res.status(201).json(item) - } - } catch (error) { - utils.handleError(res, error) - } -} - -/** - * Delete item function called by route - * @param {Object} req - request object - * @param {Object} res - response object - */ -exports.deleteItem = async (req, res) => { - try { - req = matchedData(req) - const id = await utils.isIDGood(req.id) - res.status(200).json(await db.deleteItem(id, model)) - } catch (error) { - utils.handleError(res, error) - } -} diff --git a/app/controllers/users.validate.js b/app/controllers/users.validate.js deleted file mode 100755 index 2394e95..0000000 --- a/app/controllers/users.validate.js +++ /dev/null @@ -1,165 +0,0 @@ -const { validationResult } = require('../middleware/utils') -const validator = require('validator') -const { check } = require('express-validator') - -/** - * Validates create new item request - */ -exports.createItem = [ - check('name') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('email') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isEmail() - .withMessage('EMAIL_IS_NOT_VALID'), - check('password') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - check('role') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isIn(['user', 'admin']) - .withMessage('USER_NOT_IN_KNOWN_ROLE'), - check('phone') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('city') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('country') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('urlTwitter') - .optional() - .custom((v) => (v === '' ? true : validator.isURL(v))) - .withMessage('NOT_A_VALID_URL'), - check('urlGitHub') - .optional() - .custom((v) => (v === '' ? true : validator.isURL(v))) - .withMessage('NOT_A_VALID_URL'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates update item request - */ -exports.updateItem = [ - check('name') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('email') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('role') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - check('phone') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('city') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('country') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .trim(), - check('urlTwitter') - .optional() - .custom((v) => (v === '' ? true : validator.isURL(v))) - .withMessage('NOT_A_VALID_URL'), - check('urlGitHub') - .optional() - .custom((v) => (v === '' ? true : validator.isURL(v))) - .withMessage('NOT_A_VALID_URL'), - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates get item request - */ -exports.getItem = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] - -/** - * Validates delete item request - */ -exports.deleteItem = [ - check('id') - .exists() - .withMessage('MISSING') - .not() - .isEmpty() - .withMessage('IS_EMPTY'), - (req, res, next) => { - validationResult(req, res, next) - } -] diff --git a/app/controllers/users/createItem.js b/app/controllers/users/createItem.js new file mode 100644 index 0000000..3b4a538 --- /dev/null +++ b/app/controllers/users/createItem.js @@ -0,0 +1,27 @@ +const { matchedData } = require('express-validator') +const utils = require('../../middleware/utils') +const emailer = require('../../middleware/emailer') +const { createItemInDb } = require('./helpers') + +/** + * Create item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const createItem = async (req, res) => { + try { + // Gets locale from header 'Accept-Language' + const locale = req.getLocale() + req = matchedData(req) + const doesEmailExists = await emailer.emailExists(req.email) + if (!doesEmailExists) { + const item = await createItemInDb(req) + emailer.sendRegistrationEmailMessage(locale, item) + res.status(201).json(item) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { createItem } diff --git a/app/controllers/users/deleteItem.js b/app/controllers/users/deleteItem.js new file mode 100755 index 0000000..5625db2 --- /dev/null +++ b/app/controllers/users/deleteItem.js @@ -0,0 +1,21 @@ +const model = require('../../models/user') +const { matchedData } = require('express-validator') +const utils = require('../../middleware/utils') +const db = require('../../middleware/db') + +/** + * Delete item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const deleteItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + res.status(200).json(await db.deleteItem(id, model)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { deleteItem } diff --git a/app/controllers/users/getItem.js b/app/controllers/users/getItem.js new file mode 100644 index 0000000..babd5a5 --- /dev/null +++ b/app/controllers/users/getItem.js @@ -0,0 +1,21 @@ +const User = require('../../models/user') +const { matchedData } = require('express-validator') +const utils = require('../../middleware/utils') +const db = require('../../middleware/db') + +/** + * Get item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + res.status(200).json(await db.getItem(id, User)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getItem } diff --git a/app/controllers/users/getItems.js b/app/controllers/users/getItems.js new file mode 100644 index 0000000..2a16763 --- /dev/null +++ b/app/controllers/users/getItems.js @@ -0,0 +1,19 @@ +const User = require('../../models/user') +const utils = require('../../middleware/utils') +const db = require('../../middleware/db') + +/** + * Get items function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const getItems = async (req, res) => { + try { + const query = await db.checkQueryString(req.query) + res.status(200).json(await db.getItems(req, User, query)) + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { getItems } diff --git a/app/controllers/users/helpers/createItemInDb.js b/app/controllers/users/helpers/createItemInDb.js new file mode 100644 index 0000000..009322e --- /dev/null +++ b/app/controllers/users/helpers/createItemInDb.js @@ -0,0 +1,40 @@ +const uuid = require('uuid') +const User = require('../../../models/user') +const utils = require('../../../middleware/utils') + +/** + * Creates a new item in database + * @param {Object} req - request object + */ +const createItemInDb = (req) => { + return new Promise((resolve, reject) => { + const user = new User({ + name: req.name, + email: req.email, + password: req.password, + role: req.role, + phone: req.phone, + city: req.city, + country: req.country, + verification: uuid.v4() + }) + user.save((err, item) => { + if (err) { + reject(utils.buildErrObject(422, err.message)) + } + // Removes properties with rest operator + const removeProperties = ({ + // eslint-disable-next-line no-unused-vars + password, + // eslint-disable-next-line no-unused-vars + blockExpires, + // eslint-disable-next-line no-unused-vars + loginAttempts, + ...rest + }) => rest + resolve(removeProperties(item.toObject())) + }) + }) +} + +module.exports = { createItemInDb } diff --git a/app/controllers/users/helpers/index.js b/app/controllers/users/helpers/index.js new file mode 100644 index 0000000..462b799 --- /dev/null +++ b/app/controllers/users/helpers/index.js @@ -0,0 +1,5 @@ +const { createItemInDb } = require('./createItemInDb') + +module.exports = { + createItemInDb +} diff --git a/app/controllers/users/index.js b/app/controllers/users/index.js new file mode 100644 index 0000000..6b963eb --- /dev/null +++ b/app/controllers/users/index.js @@ -0,0 +1,13 @@ +const { createItem } = require('./createItem') +const { deleteItem } = require('./deleteItem') +const { getItem } = require('./getItem') +const { getItems } = require('./getItems') +const { updateItem } = require('./updateItem') + +module.exports = { + createItem, + deleteItem, + getItem, + getItems, + updateItem +} diff --git a/app/controllers/users/updateItem.js b/app/controllers/users/updateItem.js new file mode 100644 index 0000000..ca33ed9 --- /dev/null +++ b/app/controllers/users/updateItem.js @@ -0,0 +1,28 @@ +const model = require('../../models/user') +const { matchedData } = require('express-validator') +const utils = require('../../middleware/utils') +const db = require('../../middleware/db') +const emailer = require('../../middleware/emailer') + +/** + * Update item function called by route + * @param {Object} req - request object + * @param {Object} res - response object + */ +const updateItem = async (req, res) => { + try { + req = matchedData(req) + const id = await utils.isIDGood(req.id) + const doesEmailExists = await emailer.emailExistsExcludingMyself( + id, + req.email + ) + if (!doesEmailExists) { + res.status(200).json(await db.updateItem(id, model, req)) + } + } catch (error) { + utils.handleError(res, error) + } +} + +module.exports = { updateItem } diff --git a/app/controllers/users/validators/index.js b/app/controllers/users/validators/index.js new file mode 100644 index 0000000..1578618 --- /dev/null +++ b/app/controllers/users/validators/index.js @@ -0,0 +1,11 @@ +const { validateCreateItem } = require('./validateCreateItem') +const { validateDeleteItem } = require('./validateDeleteItem') +const { validateGetItem } = require('./validateGetItem') +const { validateUpdateItem } = require('./validateUpdateItem') + +module.exports = { + validateCreateItem, + validateDeleteItem, + validateGetItem, + validateUpdateItem +} diff --git a/app/controllers/profile.validate.js b/app/controllers/users/validators/validateCreateItem.js old mode 100755 new mode 100644 similarity index 67% rename from app/controllers/profile.validate.js rename to app/controllers/users/validators/validateCreateItem.js index 44cfa92..a634fa8 --- a/app/controllers/profile.validate.js +++ b/app/controllers/users/validators/validateCreateItem.js @@ -1,17 +1,43 @@ -const { validationResult } = require('../middleware/utils') +const { validationResult } = require('../../../middleware/utils') const validator = require('validator') const { check } = require('express-validator') /** - * Validates update profile request + * Validates create new item request */ -exports.updateProfile = [ +const validateCreateItem = [ check('name') .exists() .withMessage('MISSING') .not() .isEmpty() .withMessage('IS_EMPTY'), + check('email') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isEmail() + .withMessage('EMAIL_IS_NOT_VALID'), + check('password') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isLength({ + min: 5 + }) + .withMessage('PASSWORD_TOO_SHORT_MIN_5'), + check('role') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .isIn(['user', 'admin']) + .withMessage('USER_NOT_IN_KNOWN_ROLE'), check('phone') .exists() .withMessage('MISSING') @@ -46,29 +72,4 @@ exports.updateProfile = [ } ] -/** - * Validates change password request - */ -exports.changePassword = [ - check('oldPassword') - .optional() - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - check('newPassword') - .optional() - .not() - .isEmpty() - .withMessage('IS_EMPTY') - .isLength({ - min: 5 - }) - .withMessage('PASSWORD_TOO_SHORT_MIN_5'), - (req, res, next) => { - validationResult(req, res, next) - } -] +module.exports = { validateCreateItem } diff --git a/app/controllers/users/validators/validateDeleteItem.js b/app/controllers/users/validators/validateDeleteItem.js new file mode 100644 index 0000000..f1fd7f2 --- /dev/null +++ b/app/controllers/users/validators/validateDeleteItem.js @@ -0,0 +1,19 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates delete item request + */ +const validateDeleteItem = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateDeleteItem } diff --git a/app/controllers/users/validators/validateGetItem.js b/app/controllers/users/validators/validateGetItem.js new file mode 100644 index 0000000..c0e7510 --- /dev/null +++ b/app/controllers/users/validators/validateGetItem.js @@ -0,0 +1,19 @@ +const { validationResult } = require('../../../middleware/utils') +const { check } = require('express-validator') + +/** + * Validates get item request + */ +const validateGetItem = [ + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateGetItem } diff --git a/app/controllers/users/validators/validateUpdateItem.js b/app/controllers/users/validators/validateUpdateItem.js new file mode 100644 index 0000000..c188a40 --- /dev/null +++ b/app/controllers/users/validators/validateUpdateItem.js @@ -0,0 +1,67 @@ +const { validationResult } = require('../../../middleware/utils') +const validator = require('validator') +const { check } = require('express-validator') + +/** + * Validates update item request + */ +const validateUpdateItem = [ + check('name') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('email') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('role') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + check('phone') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('city') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('country') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY') + .trim(), + check('urlTwitter') + .optional() + .custom((v) => (v === '' ? true : validator.isURL(v))) + .withMessage('NOT_A_VALID_URL'), + check('urlGitHub') + .optional() + .custom((v) => (v === '' ? true : validator.isURL(v))) + .withMessage('NOT_A_VALID_URL'), + check('id') + .exists() + .withMessage('MISSING') + .not() + .isEmpty() + .withMessage('IS_EMPTY'), + (req, res, next) => { + validationResult(req, res, next) + } +] + +module.exports = { validateUpdateItem } diff --git a/app/routes/auth.js b/app/routes/auth.js index b393c99..eb681c1 100755 --- a/app/routes/auth.js +++ b/app/routes/auth.js @@ -1,6 +1,3 @@ -const controller = require('../controllers/auth') -const validate = require('../controllers/auth.validate') -const AuthController = require('../controllers/auth') const express = require('express') const router = express.Router() require('../../config/passport') @@ -10,6 +7,24 @@ const requireAuth = passport.authenticate('jwt', { }) const trimRequest = require('trim-request') +const { + register, + verify, + forgotPassword, + resetPassword, + getRefreshToken, + login, + roleAuthorization +} = require('../controllers/auth') + +const { + validateRegister, + validateVerify, + validateForgotPassword, + validateResetPassword, + validateLogin +} = require('../controllers/auth/validators') + /* * Auth routes */ @@ -17,37 +32,22 @@ const trimRequest = require('trim-request') /* * Register route */ -router.post( - '/register', - trimRequest.all, - validate.register, - controller.register -) +router.post('/register', trimRequest.all, validateRegister, register) /* * Verify route */ -router.post('/verify', trimRequest.all, validate.verify, controller.verify) +router.post('/verify', trimRequest.all, validateVerify, verify) /* * Forgot password route */ -router.post( - '/forgot', - trimRequest.all, - validate.forgotPassword, - controller.forgotPassword -) +router.post('/forgot', trimRequest.all, validateForgotPassword, forgotPassword) /* * Reset password route */ -router.post( - '/reset', - trimRequest.all, - validate.resetPassword, - controller.resetPassword -) +router.post('/reset', trimRequest.all, validateResetPassword, resetPassword) /* * Get new refresh token @@ -55,14 +55,14 @@ router.post( router.get( '/token', requireAuth, - AuthController.roleAuthorization(['user', 'admin']), + roleAuthorization(['user', 'admin']), trimRequest.all, - controller.getRefreshToken + getRefreshToken ) /* * Login route */ -router.post('/login', trimRequest.all, validate.login, controller.login) +router.post('/login', trimRequest.all, validateLogin, login) module.exports = router diff --git a/app/routes/cities.js b/app/routes/cities.js index 03029ad..8436be2 100755 --- a/app/routes/cities.js +++ b/app/routes/cities.js @@ -1,6 +1,3 @@ -const controller = require('../controllers/cities') -const validate = require('../controllers/cities.validate') -const AuthController = require('../controllers/auth') const express = require('express') const router = express.Router() require('../../config/passport') @@ -10,6 +7,24 @@ const requireAuth = passport.authenticate('jwt', { }) const trimRequest = require('trim-request') +const { roleAuthorization } = require('../controllers/auth') + +const { + getAllItems, + getItems, + createItem, + getItem, + updateItem, + deleteItem +} = require('../controllers/cities') + +const { + validateCreateItem, + validateGetItem, + validateUpdateItem, + validateDeleteItem +} = require('../controllers/cities/validators') + /* * Cities routes */ @@ -17,7 +32,7 @@ const trimRequest = require('trim-request') /* * Get all items route */ -router.get('/all', controller.getAllItems) +router.get('/all', getAllItems) /* * Get items route @@ -25,9 +40,9 @@ router.get('/all', controller.getAllItems) router.get( '/', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - controller.getItems + getItems ) /* @@ -36,10 +51,10 @@ router.get( router.post( '/', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.createItem, - controller.createItem + validateCreateItem, + createItem ) /* @@ -48,10 +63,10 @@ router.post( router.get( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.getItem, - controller.getItem + validateGetItem, + getItem ) /* @@ -60,10 +75,10 @@ router.get( router.patch( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.updateItem, - controller.updateItem + validateUpdateItem, + updateItem ) /* @@ -72,10 +87,10 @@ router.patch( router.delete( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.deleteItem, - controller.deleteItem + validateDeleteItem, + deleteItem ) module.exports = router diff --git a/app/routes/profile.js b/app/routes/profile.js index a8b962c..83becf6 100755 --- a/app/routes/profile.js +++ b/app/routes/profile.js @@ -1,6 +1,3 @@ -const controller = require('../controllers/profile') -const validate = require('../controllers/profile.validate') -const AuthController = require('../controllers/auth') const express = require('express') const router = express.Router() require('../../config/passport') @@ -10,6 +7,19 @@ const requireAuth = passport.authenticate('jwt', { }) const trimRequest = require('trim-request') +const { roleAuthorization } = require('../controllers/auth') + +const { + getProfile, + updateProfile, + changePassword +} = require('../controllers/profile') + +const { + validateUpdateProfile, + validateChangePassword +} = require('../controllers/profile/validators') + /* * Profile routes */ @@ -20,9 +30,9 @@ const trimRequest = require('trim-request') router.get( '/', requireAuth, - AuthController.roleAuthorization(['user', 'admin']), + roleAuthorization(['user', 'admin']), trimRequest.all, - controller.getProfile + getProfile ) /* @@ -31,10 +41,10 @@ router.get( router.patch( '/', requireAuth, - AuthController.roleAuthorization(['user', 'admin']), + roleAuthorization(['user', 'admin']), trimRequest.all, - validate.updateProfile, - controller.updateProfile + validateUpdateProfile, + updateProfile ) /* @@ -43,10 +53,10 @@ router.patch( router.post( '/changePassword', requireAuth, - AuthController.roleAuthorization(['user', 'admin']), + roleAuthorization(['user', 'admin']), trimRequest.all, - validate.changePassword, - controller.changePassword + validateChangePassword, + changePassword ) module.exports = router diff --git a/app/routes/users.js b/app/routes/users.js index 23c06a2..1e12fca 100755 --- a/app/routes/users.js +++ b/app/routes/users.js @@ -1,6 +1,3 @@ -const controller = require('../controllers/users') -const validate = require('../controllers/users.validate') -const AuthController = require('../controllers/auth') const express = require('express') const router = express.Router() require('../../config/passport') @@ -10,6 +7,23 @@ const requireAuth = passport.authenticate('jwt', { }) const trimRequest = require('trim-request') +const { roleAuthorization } = require('../controllers/auth') + +const { + getItems, + createItem, + getItem, + updateItem, + deleteItem +} = require('../controllers/users') + +const { + validateCreateItem, + validateGetItem, + validateUpdateItem, + validateDeleteItem +} = require('../controllers/users/validators') + /* * Users routes */ @@ -20,9 +34,9 @@ const trimRequest = require('trim-request') router.get( '/', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - controller.getItems + getItems ) /* @@ -31,10 +45,10 @@ router.get( router.post( '/', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.createItem, - controller.createItem + validateCreateItem, + createItem ) /* @@ -43,10 +57,10 @@ router.post( router.get( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.getItem, - controller.getItem + validateGetItem, + getItem ) /* @@ -55,10 +69,10 @@ router.get( router.patch( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.updateItem, - controller.updateItem + validateUpdateItem, + updateItem ) /* @@ -67,10 +81,10 @@ router.patch( router.delete( '/:id', requireAuth, - AuthController.roleAuthorization(['admin']), + roleAuthorization(['admin']), trimRequest.all, - validate.deleteItem, - controller.deleteItem + validateDeleteItem, + deleteItem ) module.exports = router From 912820751b34a412faef45d7b3047e6f527715e0 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Fri, 2 Oct 2020 22:28:06 -0400 Subject: [PATCH 02/23] NPM updated --- package-lock.json | 777 ++++++++++++++++++++++++++++++---------------- package.json | 26 +- 2 files changed, 516 insertions(+), 287 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61bc0d5..4e3c0be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -317,6 +317,53 @@ "to-fast-properties": "^2.0.0" } }, + "@eslint/eslintrc": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", + "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==", + "dev": true, + "requires": { + "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" + }, + "dependencies": { + "ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + } + } + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -577,9 +624,9 @@ } }, "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, "ansi-escapes": { @@ -694,9 +741,19 @@ "dev": true }, "ast-types": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.2.tgz", - "integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==" + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", + "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", + "requires": { + "tslib": "^2.0.1" + }, + "dependencies": { + "tslib": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + } + } }, "astral-regex": { "version": "1.0.0", @@ -756,9 +813,9 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" }, "bl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz", - "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", "requires": { "readable-stream": "^2.3.5", "safe-buffer": "^5.1.1" @@ -1287,6 +1344,17 @@ "requires": { "ansi-regex": "^4.1.0" } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } } } }, @@ -1336,9 +1404,9 @@ } }, "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz", + "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", "dev": true }, "common-tags": { @@ -1520,16 +1588,16 @@ } }, "cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", "dev": true, "requires": { "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", + "import-fresh": "^3.2.1", "parse-json": "^5.0.0", "path-type": "^4.0.0", - "yaml": "^1.7.2" + "yaml": "^1.10.0" } }, "cross-env": { @@ -1569,9 +1637,9 @@ "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==" }, "date-fns": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.15.0.tgz", - "integrity": "sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==" + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz", + "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==" }, "debug": { "version": "3.2.6", @@ -1640,7 +1708,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "requires": { "object-keys": "^1.0.12" } @@ -1653,6 +1720,13 @@ "ast-types": "0.x.x", "escodegen": "1.x.x", "esprima": "3.x.x" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + } } }, "delayed-stream": { @@ -1758,9 +1832,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "ejs": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz", - "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz", + "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==", "requires": { "jake": "^10.6.1" } @@ -1785,12 +1859,12 @@ } }, "enquirer": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz", - "integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "requires": { - "ansi-colors": "^3.2.1" + "ansi-colors": "^4.1.1" } }, "error-ex": { @@ -1802,22 +1876,51 @@ } }, "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", - "dev": true, + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "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" + } + }, + "object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "requires": { + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "es-array-method-boxes-properly": { @@ -1853,7 +1956,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -1896,41 +1998,35 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", - "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "requires": { "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", "optionator": "^0.8.1", "source-map": "~0.6.1" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - } } }, "eslint": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz", - "integrity": "sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", + "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", + "@eslint/eslintrc": "^0.1.3", "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.0", + "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^1.3.0", - "espree": "^7.2.0", + "espree": "^7.3.0", "esquery": "^1.2.0", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", @@ -2011,12 +2107,39 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" + } + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "has-flag": { @@ -2035,12 +2158,6 @@ "type-check": "~0.4.0" } }, - "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", - "dev": true - }, "optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -2089,9 +2206,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -2115,9 +2232,9 @@ "dev": true }, "eslint-config-prettier": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz", - "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz", + "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", "dev": true, "requires": { "get-stdin": "^6.0.0" @@ -2158,20 +2275,28 @@ "dev": true }, "espree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz", - "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", "dev": true, "requires": { - "acorn": "^7.3.1", + "acorn": "^7.4.0", "acorn-jsx": "^5.2.0", "eslint-visitor-keys": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true + } } }, "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.3.1", @@ -2215,9 +2340,9 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "execa": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz", - "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", "dev": true, "requires": { "cross-spawn": "^7.0.0", @@ -2232,19 +2357,13 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" } - }, - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true } } }, @@ -2440,11 +2559,11 @@ } }, "express-validator": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.6.0.tgz", - "integrity": "sha512-xcephfzFbUssJph/nOSKIdx+I+8GRz5by/8rOIKL6gJikKKKJjnwYH5TG1nIDB6kEalUtZMbOFuSNOp/HHY84Q==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.6.1.tgz", + "integrity": "sha512-+MrZKJ3eGYXkNF9p9Zf7MS7NkPJFg9MDYATU5c80Cf4F62JdLBIjWxy6481tRC0y1NnC9cgOw8FuN364bWaGhA==", "requires": { - "lodash": "^4.17.15", + "lodash": "^4.17.19", "validator": "^13.1.1" } }, @@ -2751,8 +2870,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -2922,7 +3040,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -2944,8 +3061,7 @@ "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, "has-unicode": { "version": "2.0.1", @@ -3119,15 +3235,15 @@ "dev": true }, "husky": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-4.2.5.tgz", - "integrity": "sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz", + "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==", "dev": true, "requires": { "chalk": "^4.0.0", "ci-info": "^2.0.0", "compare-versions": "^3.6.0", - "cosmiconfig": "^6.0.0", + "cosmiconfig": "^7.0.0", "find-versions": "^3.2.0", "opencollective-postinstall": "^2.0.2", "pkg-dir": "^4.2.0", @@ -3178,9 +3294,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -3460,10 +3576,9 @@ "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" }, "is-callable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz", - "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==", - "dev": true + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" }, "is-ci": { "version": "2.0.0", @@ -3477,8 +3592,7 @@ "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" }, "is-decimal": { "version": "1.0.4", @@ -3571,10 +3685,9 @@ "dev": true }, "is-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz", - "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==", - "dev": true, + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "requires": { "has-symbols": "^1.0.1" } @@ -3592,9 +3705,10 @@ "dev": true }, "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true }, "is-string": { "version": "1.0.5", @@ -3606,7 +3720,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -3990,20 +4103,20 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "lint-staged": { - "version": "10.2.11", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.2.11.tgz", - "integrity": "sha512-LRRrSogzbixYaZItE2APaS4l2eJMjjf5MbclRZpLJtcQJShcvUzKXsNeZgsLIZ0H0+fg2tL4B59fU9wHIHtFIA==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.4.0.tgz", + "integrity": "sha512-uaiX4U5yERUSiIEQc329vhCTDDwUcSvKdRLsNomkYLRzijk3v8V9GWm2Nz0RMVB87VcuzLvtgy6OsjoH++QHIg==", "dev": true, "requires": { - "chalk": "^4.0.0", - "cli-truncate": "2.1.0", - "commander": "^5.1.0", - "cosmiconfig": "^6.0.0", + "chalk": "^4.1.0", + "cli-truncate": "^2.1.0", + "commander": "^6.0.0", + "cosmiconfig": "^7.0.0", "debug": "^4.1.1", "dedent": "^0.7.0", - "enquirer": "^2.3.5", - "execa": "^4.0.1", - "listr2": "^2.1.0", + "enquirer": "^2.3.6", + "execa": "^4.0.3", + "listr2": "^2.6.0", "log-symbols": "^4.0.0", "micromatch": "^4.0.2", "normalize-path": "^3.0.0", @@ -4048,12 +4161,12 @@ "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "has-flag": { @@ -4062,19 +4175,10 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", - "dev": true, - "requires": { - "chalk": "^4.0.0" - } - }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -4083,18 +4187,18 @@ } }, "listr2": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.1.8.tgz", - "integrity": "sha512-Op+hheiChfAphkJ5qUxZtHgyjlX9iNnAeFS/S134xw7mVSg0YVrQo1IY4/K+ElY6XgOPg2Ij4z07urUXR+YEew==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.6.2.tgz", + "integrity": "sha512-6x6pKEMs8DSIpA/tixiYY2m/GcbgMplMVmhQAaLFxEtNSKLeWTGjtmU57xvv6QCm2XcqzyNXL/cTSVf4IChCRA==", "dev": true, "requires": { - "chalk": "^4.0.0", + "chalk": "^4.1.0", "cli-truncate": "^2.1.0", "figures": "^3.2.0", "indent-string": "^4.0.0", "log-update": "^4.0.0", "p-map": "^4.0.0", - "rxjs": "^6.5.5", + "rxjs": "^6.6.2", "through": "^2.3.8" }, "dependencies": { @@ -4157,10 +4261,19 @@ "aggregate-error": "^3.0.0" } }, + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -4246,12 +4359,64 @@ "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", "dev": true, "requires": { - "chalk": "^2.4.2" + "chalk": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "log-update": { @@ -4266,12 +4431,6 @@ "wrap-ansi": "^6.2.0" }, "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -4319,37 +4478,6 @@ "astral-regex": "^2.0.0", "is-fullwidth-code-point": "^3.0.0" } - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } } } }, @@ -4446,12 +4574,17 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" } } }, @@ -4644,23 +4777,23 @@ } }, "mocha": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.0.tgz", - "integrity": "sha512-sI0gaI1I/jPVu3KFpnveWGadfe3JNBAENqgTUPgLZAUppu725zS2mrVztzAgIR8DUscuS4doEBTx9LATC+HSeA==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz", + "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==", "dev": true, "requires": { "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.3.1", - "debug": "3.2.6", + "chokidar": "3.4.2", + "debug": "4.1.1", "diff": "4.0.2", - "escape-string-regexp": "1.0.5", - "find-up": "4.1.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", "glob": "7.1.6", "growl": "1.10.5", "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "3.0.0", + "js-yaml": "3.14.0", + "log-symbols": "4.0.0", "minimatch": "3.0.4", "ms": "2.1.2", "object.assign": "4.1.0", @@ -4676,18 +4809,99 @@ "yargs-unparser": "1.6.1" }, "dependencies": { - "ansi-colors": { + "chokidar": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + } + }, + "debug": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", + "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -4748,13 +4962,13 @@ } }, "mongoose": { - "version": "5.9.26", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.26.tgz", - "integrity": "sha512-mVddZM1mB8xg9oJQZAXaN762B01puV+jL5mPqg1HBXpEs7TG6ZZ/hEk98YRJMJff/YhIzuK3a3oos6XWtTaVUQ==", + "version": "5.10.7", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.7.tgz", + "integrity": "sha512-oiofFrD4I5p3PhJXn49QyrU1nX5CY01qhPkfMMrXYPhkfGLEJVwFVO+0PsCxD91A2kQP+d/iFyk5U8e86KI8eQ==", "requires": { "bson": "^1.1.4", "kareem": "2.3.1", - "mongodb": "3.5.9", + "mongodb": "3.6.2", "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.7.0", "mquery": "3.2.2", @@ -4766,16 +4980,16 @@ }, "dependencies": { "bson": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz", - "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz", + "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg==" }, "mongodb": { - "version": "3.5.9", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.9.tgz", - "integrity": "sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.2.tgz", + "integrity": "sha512-sSZOb04w3HcnrrXC82NEh/YGCmBuRgR+C1hZgmmv4L6dBz4BkRse6Y8/q/neXer9i95fKUBbFi4KgeceXmbsOA==", "requires": { - "bl": "^2.2.0", + "bl": "^2.2.1", "bson": "^1.1.4", "denque": "^1.4.1", "require_optional": "^1.0.1", @@ -4949,14 +5163,14 @@ } }, "nodemailer": { - "version": "6.4.11", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz", - "integrity": "sha512-BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ==" + "version": "6.4.13", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.13.tgz", + "integrity": "sha512-XmtiiKza2Cqtr+ZRMchMZn9s2nmwQDeakbf+yL0ODsIXOv58UZgk/MKPOkDKqY+mvxHs87PrJK7Nf/tcpKHqYQ==" }, "nodemailer-mailgun-transport": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nodemailer-mailgun-transport/-/nodemailer-mailgun-transport-2.0.0.tgz", - "integrity": "sha512-TPGi2anyS0w/4jv7TJNS3wX5DbNQ2+j+ssnwY4IYxL4QaYXAXewcw6YUtBgnOsEvQVJvmxQLDuW4f4JaMPgfaA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nodemailer-mailgun-transport/-/nodemailer-mailgun-transport-2.0.1.tgz", + "integrity": "sha512-CejwLAwtllUqizkfWbgLCteTrc6ebSDp3Khup5WXUSTKbTWLPVv4ZrwwFCiaWtxNVMsDbESIYX39oTBSfwfJyg==", "requires": { "consolidate": "^0.15.1", "mailgun-js": "^0.22.0" @@ -5216,14 +5430,12 @@ "object-inspect": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==" }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object.assign": { "version": "4.1.0", @@ -5358,11 +5570,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } } } @@ -5567,9 +5779,9 @@ "dev": true }, "prettier": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", - "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, "prettier-eslint": { @@ -5845,19 +6057,19 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } } } }, "proxy-from-env": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", - "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "pstree.remy": { "version": "1.1.8", @@ -6485,7 +6697,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -6495,7 +6706,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -7182,9 +7392,9 @@ "dev": true }, "validator": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.1.1.tgz", - "integrity": "sha512-8GfPiwzzRoWTg7OV1zva1KvrSemuMkv07MA9TTl91hfhe+wKrsrgVN4H2QSFd/U/FhiU3iWPYVgvbsOGwhyFWw==" + "version": "13.1.17", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.1.17.tgz", + "integrity": "sha512-zL5QBoemJ3jYFb2/j38y7ljhwYGXVLUp8H6W1nVxadnAOvUOytec+L7BHh1oBQ82/TzWXHd+GSaxUWp4lROkLg==" }, "vary": { "version": "1.1.2", @@ -7413,52 +7623,71 @@ "dev": true }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } diff --git a/package.json b/package.json index 180e655..4114d3d 100644 --- a/package.json +++ b/package.json @@ -36,45 +36,45 @@ "body-parser": "^1.19.0", "compression": "^1.7.4", "cors": "^2.8.5", - "date-fns": "^2.15.0", + "date-fns": "^2.16.1", "dotenv-safe": "^8.2.0", - "ejs": "^3.1.3", + "ejs": "^3.1.5", "expeditious-engine-redis": "^0.1.2", "express": "^4.17.1", "express-expeditious": "^5.1.1", - "express-validator": "^6.6.0", + "express-validator": "^6.6.1", "helmet": "^3.23.3", "i18n": "^0.10.0", "jsonwebtoken": "^8.5.1", - "mongoose": "^5.9.26", + "mongoose": "^5.10.7", "mongoose-paginate-v2": "^1.3.9", "morgan": "^1.10.0", - "nodemailer": "^6.4.11", - "nodemailer-mailgun-transport": "^2.0.0", + "nodemailer": "^6.4.13", + "nodemailer-mailgun-transport": "^2.0.1", "passport": "^0.4.1", "passport-jwt": "^4.0.0", "remark-cli": "^8.0.1", "request-ip": "^2.1.3", "trim-request": "^1.0.6", "uuid": "^8.3.0", - "validator": "^13.1.1" + "validator": "^13.1.17" }, "devDependencies": { "chai": "^4.2.0", "chai-http": "^4.3.0", "cross-env": "^7.0.2", - "eslint": "^7.5.0", + "eslint": "^7.10.0", "eslint-config-formidable": "^4.0.0", - "eslint-config-prettier": "^6.11.0", + "eslint-config-prettier": "^6.12.0", "eslint-plugin-prettier": "^3.1.4", "faker": "^4.1.0", - "husky": "^4.2.5", - "lint-staged": "^10.2.11", - "mocha": "^8.1.0", + "husky": "^4.3.0", + "lint-staged": "^10.4.0", + "mocha": "^8.1.3", "mongo-seeding": "^3.4.1", "nodemon": "^2.0.4", "nyc": "^15.1.0", - "prettier": "^2.0.5", + "prettier": "^2.1.2", "prettier-eslint": "^11.0.0" }, "keywords": [ From effc2b1e3f8c9b1cbe918c930f4c2c83ccb62365 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Fri, 2 Oct 2020 22:50:20 -0400 Subject: [PATCH 03/23] Exporting --- app/controllers/auth/resetPassword.js | 4 +++- app/controllers/profile/updateProfile.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/auth/resetPassword.js b/app/controllers/auth/resetPassword.js index 1513c2a..d0d28e9 100644 --- a/app/controllers/auth/resetPassword.js +++ b/app/controllers/auth/resetPassword.js @@ -12,7 +12,7 @@ const utils = require('../../middleware/utils') * @param {Object} req - request object * @param {Object} res - response object */ -exports.resetPassword = async (req, res) => { +const resetPassword = async (req, res) => { try { const data = matchedData(req) const forgotPassword = await findForgotPassword(data.id) @@ -24,3 +24,5 @@ exports.resetPassword = async (req, res) => { utils.handleError(res, error) } } + +module.exports = { resetPassword } diff --git a/app/controllers/profile/updateProfile.js b/app/controllers/profile/updateProfile.js index 44c36de..079b381 100644 --- a/app/controllers/profile/updateProfile.js +++ b/app/controllers/profile/updateProfile.js @@ -7,7 +7,7 @@ const { updateProfileInDB } = require('./helpers') * @param {Object} req - request object * @param {Object} res - response object */ -exports.updateProfile = async (req, res) => { +const updateProfile = async (req, res) => { try { const id = await utils.isIDGood(req.user._id) req = matchedData(req) @@ -16,3 +16,5 @@ exports.updateProfile = async (req, res) => { utils.handleError(res, error) } } + +module.exports = { updateProfile } From 567e102bbc8d9575647b625c77aa9641113ea3d0 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Fri, 2 Oct 2020 23:02:18 -0400 Subject: [PATCH 04/23] Ignoring MacOS .DS_Store file for routes --- app/routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/index.js b/app/routes/index.js index 320b059..2a7f007 100755 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -16,7 +16,7 @@ fs.readdirSync(routesPath).filter((file) => { // Take filename and remove last part (extension) const routeFile = removeExtensionFromFile(file) // Prevents loading of this file and auth file - return routeFile !== 'index' && routeFile !== 'auth' + return routeFile !== 'index' && routeFile !== 'auth' && file !== '.DS_Store' ? router.use(`/${routeFile}`, require(`./${routeFile}`)) : '' }) From f3f90d327d3294ee007dba3d50fd4827ae391383 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Fri, 2 Oct 2020 23:22:35 -0400 Subject: [PATCH 05/23] Renaming --- app/controllers/auth/validators/validateForgotPassword.js | 4 ++-- app/controllers/auth/validators/validateLogin.js | 4 ++-- app/controllers/auth/validators/validateRegister.js | 4 ++-- app/controllers/auth/validators/validateResetPassword.js | 4 ++-- app/controllers/auth/validators/validateVerify.js | 4 ++-- app/controllers/cities/validators/validateCreateItem.js | 4 ++-- app/controllers/cities/validators/validateDeleteItem.js | 4 ++-- app/controllers/cities/validators/validateGetItem.js | 4 ++-- app/controllers/cities/validators/validateUpdateItem.js | 4 ++-- app/controllers/profile/validators/validateChangePassword.js | 4 ++-- app/controllers/profile/validators/validateUpdateProfile.js | 4 ++-- app/controllers/users/validators/validateCreateItem.js | 4 ++-- app/controllers/users/validators/validateDeleteItem.js | 4 ++-- app/controllers/users/validators/validateGetItem.js | 4 ++-- app/controllers/users/validators/validateUpdateItem.js | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/controllers/auth/validators/validateForgotPassword.js b/app/controllers/auth/validators/validateForgotPassword.js index 0f0f8de..921ea26 100644 --- a/app/controllers/auth/validators/validateForgotPassword.js +++ b/app/controllers/auth/validators/validateForgotPassword.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -14,7 +14,7 @@ const validateForgotPassword = [ .isEmail() .withMessage('EMAIL_IS_NOT_VALID'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/auth/validators/validateLogin.js b/app/controllers/auth/validators/validateLogin.js index a39c54a..2df11bf 100644 --- a/app/controllers/auth/validators/validateLogin.js +++ b/app/controllers/auth/validators/validateLogin.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -27,7 +27,7 @@ const validateLogin = [ }) .withMessage('PASSWORD_TOO_SHORT_MIN_5'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/auth/validators/validateRegister.js b/app/controllers/auth/validators/validateRegister.js index f948360..14c226f 100644 --- a/app/controllers/auth/validators/validateRegister.js +++ b/app/controllers/auth/validators/validateRegister.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -30,7 +30,7 @@ const validateRegister = [ }) .withMessage('PASSWORD_TOO_SHORT_MIN_5'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/auth/validators/validateResetPassword.js b/app/controllers/auth/validators/validateResetPassword.js index af38af1..91d0577 100644 --- a/app/controllers/auth/validators/validateResetPassword.js +++ b/app/controllers/auth/validators/validateResetPassword.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -22,7 +22,7 @@ const validateResetPassword = [ }) .withMessage('PASSWORD_TOO_SHORT_MIN_5'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/auth/validators/validateVerify.js b/app/controllers/auth/validators/validateVerify.js index c7fbb50..0a631a2 100644 --- a/app/controllers/auth/validators/validateVerify.js +++ b/app/controllers/auth/validators/validateVerify.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -12,7 +12,7 @@ const validateVerify = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/cities/validators/validateCreateItem.js b/app/controllers/cities/validators/validateCreateItem.js index 42ca1b3..896114a 100644 --- a/app/controllers/cities/validators/validateCreateItem.js +++ b/app/controllers/cities/validators/validateCreateItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -13,7 +13,7 @@ const validateCreateItem = [ .withMessage('IS_EMPTY') .trim(), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/cities/validators/validateDeleteItem.js b/app/controllers/cities/validators/validateDeleteItem.js index f1fd7f2..4d996f8 100644 --- a/app/controllers/cities/validators/validateDeleteItem.js +++ b/app/controllers/cities/validators/validateDeleteItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -12,7 +12,7 @@ const validateDeleteItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/cities/validators/validateGetItem.js b/app/controllers/cities/validators/validateGetItem.js index c0e7510..1028ffd 100644 --- a/app/controllers/cities/validators/validateGetItem.js +++ b/app/controllers/cities/validators/validateGetItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -12,7 +12,7 @@ const validateGetItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/cities/validators/validateUpdateItem.js b/app/controllers/cities/validators/validateUpdateItem.js index ed0f4bb..04a40bf 100644 --- a/app/controllers/cities/validators/validateUpdateItem.js +++ b/app/controllers/cities/validators/validateUpdateItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -18,7 +18,7 @@ const validateUpdateItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/profile/validators/validateChangePassword.js b/app/controllers/profile/validators/validateChangePassword.js index 6fb624e..b3b4ca2 100755 --- a/app/controllers/profile/validators/validateChangePassword.js +++ b/app/controllers/profile/validators/validateChangePassword.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -24,7 +24,7 @@ const validateChangePassword = [ }) .withMessage('PASSWORD_TOO_SHORT_MIN_5'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/profile/validators/validateUpdateProfile.js b/app/controllers/profile/validators/validateUpdateProfile.js index 1774fa6..db2e1ea 100644 --- a/app/controllers/profile/validators/validateUpdateProfile.js +++ b/app/controllers/profile/validators/validateUpdateProfile.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const validator = require('validator') const { check } = require('express-validator') @@ -42,7 +42,7 @@ const validateUpdateProfile = [ .custom((v) => (v === '' ? true : validator.isURL(v))) .withMessage('NOT_A_VALID_URL'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/users/validators/validateCreateItem.js b/app/controllers/users/validators/validateCreateItem.js index a634fa8..671665f 100644 --- a/app/controllers/users/validators/validateCreateItem.js +++ b/app/controllers/users/validators/validateCreateItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const validator = require('validator') const { check } = require('express-validator') @@ -68,7 +68,7 @@ const validateCreateItem = [ .custom((v) => (v === '' ? true : validator.isURL(v))) .withMessage('NOT_A_VALID_URL'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/users/validators/validateDeleteItem.js b/app/controllers/users/validators/validateDeleteItem.js index f1fd7f2..4d996f8 100644 --- a/app/controllers/users/validators/validateDeleteItem.js +++ b/app/controllers/users/validators/validateDeleteItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -12,7 +12,7 @@ const validateDeleteItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/users/validators/validateGetItem.js b/app/controllers/users/validators/validateGetItem.js index c0e7510..1028ffd 100644 --- a/app/controllers/users/validators/validateGetItem.js +++ b/app/controllers/users/validators/validateGetItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const { check } = require('express-validator') /** @@ -12,7 +12,7 @@ const validateGetItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] diff --git a/app/controllers/users/validators/validateUpdateItem.js b/app/controllers/users/validators/validateUpdateItem.js index c188a40..812094c 100644 --- a/app/controllers/users/validators/validateUpdateItem.js +++ b/app/controllers/users/validators/validateUpdateItem.js @@ -1,4 +1,4 @@ -const { validationResult } = require('../../../middleware/utils') +const { validateResult } = require('../../../middleware/utils') const validator = require('validator') const { check } = require('express-validator') @@ -60,7 +60,7 @@ const validateUpdateItem = [ .isEmpty() .withMessage('IS_EMPTY'), (req, res, next) => { - validationResult(req, res, next) + validateResult(req, res, next) } ] From f3fdd07813cef54cdaad05b42f9855700bc39d7c Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 00:09:47 -0400 Subject: [PATCH 06/23] Finished splitting middleware --- .eslintrc.json | 63 ++++--- .../auth/helpers/checkPermissions.js | 2 +- .../auth/helpers/findForgotPassword.js | 4 +- app/controllers/auth/helpers/findUser.js | 4 +- app/controllers/auth/helpers/findUserById.js | 4 +- .../auth/helpers/findUserToResetPassword.js | 4 +- .../auth/helpers/markResetPasswordAsUsed.js | 4 +- .../auth/helpers/updatePassword.js | 4 +- .../auth/helpers/verificationExists.js | 4 +- app/controllers/cities/helpers/cityExists.js | 4 +- .../helpers/cityExistsExcludingItself.js | 4 +- .../profile/helpers/changePasswordInDB.js | 2 +- app/controllers/profile/helpers/findUser.js | 4 +- .../profile/helpers/getProfileFromDB.js | 4 +- .../profile/helpers/updateProfileInDB.js | 4 +- app/middleware/auth.js | 61 ------- app/middleware/auth/checkPassword.js | 23 +++ app/middleware/auth/decrypt.js | 26 +++ app/middleware/auth/encrypt.js | 23 +++ app/middleware/auth/index.js | 9 + app/middleware/db.js | 168 ------------------ app/middleware/db/buildSort.js | 12 ++ app/middleware/db/checkQueryString.js | 43 +++++ app/middleware/db/cleanPaginationID.js | 10 ++ app/middleware/db/createItem.js | 18 ++ app/middleware/db/deleteItem.js | 16 ++ app/middleware/db/getItem.js | 16 ++ app/middleware/db/getItems.js | 24 +++ app/middleware/db/index.js | 21 +++ app/middleware/db/listInitOptions.js | 24 +++ app/middleware/db/updateItem.js | 25 +++ app/middleware/emailer.js | 137 -------------- app/middleware/emailer/emailExists.js | 22 +++ .../emailer/emailExistsExcludingMyself.js | 26 +++ app/middleware/emailer/index.js | 19 ++ app/middleware/emailer/prepareToSendEmail.js | 31 ++++ app/middleware/emailer/sendEmail.js | 32 ++++ .../emailer/sendRegistrationEmailMessage.js | 21 +++ .../emailer/sendResetPasswordEmailMessage.js | 21 +++ app/middleware/utils.js | 133 -------------- app/middleware/utils/buildErrObject.js | 13 ++ app/middleware/utils/buildSuccObject.js | 11 ++ app/middleware/utils/getBrowserInfo.js | 7 + app/middleware/utils/getCountry.js | 8 + app/middleware/utils/getIP.js | 9 + app/middleware/utils/handleError.js | 19 ++ app/middleware/utils/index.js | 25 +++ app/middleware/utils/isIDGood.js | 15 ++ app/middleware/utils/itemAlreadyExists.js | 22 +++ app/middleware/utils/itemNotFound.js | 22 +++ .../utils/removeExtensionFromFile.js | 9 + app/middleware/utils/validateResult.js | 22 +++ package-lock.json | 78 +++++--- package.json | 1 + 54 files changed, 757 insertions(+), 580 deletions(-) delete mode 100644 app/middleware/auth.js create mode 100644 app/middleware/auth/checkPassword.js create mode 100644 app/middleware/auth/decrypt.js create mode 100644 app/middleware/auth/encrypt.js create mode 100644 app/middleware/auth/index.js delete mode 100644 app/middleware/db.js create mode 100644 app/middleware/db/buildSort.js create mode 100644 app/middleware/db/checkQueryString.js create mode 100644 app/middleware/db/cleanPaginationID.js create mode 100644 app/middleware/db/createItem.js create mode 100644 app/middleware/db/deleteItem.js create mode 100644 app/middleware/db/getItem.js create mode 100644 app/middleware/db/getItems.js create mode 100644 app/middleware/db/index.js create mode 100644 app/middleware/db/listInitOptions.js create mode 100644 app/middleware/db/updateItem.js delete mode 100644 app/middleware/emailer.js create mode 100644 app/middleware/emailer/emailExists.js create mode 100644 app/middleware/emailer/emailExistsExcludingMyself.js create mode 100644 app/middleware/emailer/index.js create mode 100644 app/middleware/emailer/prepareToSendEmail.js create mode 100644 app/middleware/emailer/sendEmail.js create mode 100644 app/middleware/emailer/sendRegistrationEmailMessage.js create mode 100644 app/middleware/emailer/sendResetPasswordEmailMessage.js delete mode 100644 app/middleware/utils.js create mode 100644 app/middleware/utils/buildErrObject.js create mode 100644 app/middleware/utils/buildSuccObject.js create mode 100644 app/middleware/utils/getBrowserInfo.js create mode 100644 app/middleware/utils/getCountry.js create mode 100644 app/middleware/utils/getIP.js create mode 100644 app/middleware/utils/handleError.js create mode 100644 app/middleware/utils/index.js create mode 100644 app/middleware/utils/isIDGood.js create mode 100644 app/middleware/utils/itemAlreadyExists.js create mode 100644 app/middleware/utils/itemNotFound.js create mode 100644 app/middleware/utils/removeExtensionFromFile.js create mode 100644 app/middleware/utils/validateResult.js diff --git a/.eslintrc.json b/.eslintrc.json index 34fb58e..437c0e2 100755 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,26 +1,31 @@ { + "parser": "babel-eslint", + "env": { "node": true, - "mocha": true - }, - - "parserOptions": { - "ecmaVersion": 9 + "mocha": true, + "es6": true }, "globals": { "Promise": true, "_": true, - "async": true + "async": true, + "expect": true, + "jest": true }, "rules": { "callback-return": [ - "error", ["done", "proceed", "next", "onwards", "callback", "cb"] + "error", + ["done", "proceed", "next", "onwards", "callback", "cb"] + ], + "camelcase": [ + "warn", + { + "properties": "always" + } ], - "camelcase": ["warn", { - "properties": "always" - }], "comma-style": ["warn", "last"], "curly": ["error"], "eqeqeq": ["error", "always"], @@ -48,20 +53,26 @@ "new-cap": ["off"], "consistent-this": ["error", "that"], "no-unused-vars": [ - "warn", + "error", { "caughtErrors": "all", "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)" } ], - "no-use-before-define": ["error", { - "functions": false - }], + "no-use-before-define": [ + "error", + { + "functions": false + } + ], "no-var": 2, "one-var": ["warn", "never"], - "prefer-arrow-callback": ["warn", { - "allowNamedFunctions": true - }], + "prefer-arrow-callback": [ + "warn", + { + "allowNamedFunctions": true + } + ], "quotes": [ "warn", "single", @@ -70,17 +81,19 @@ "allowTemplateLiterals": true } ], - "semi": ["error", "never"], - "semi-spacing": ["warn", { - "before": false, - "after": true - }], + "semi-spacing": [ + "warn", + { + "before": false, + "after": true + } + ], "semi-style": ["warn", "last"], "space-before-function-paren": ["off", 2], "prettier/prettier": "error" }, "extends": [ - "formidable/rules/eslint/best-practices/on", + "formidable/rules/eslint/best-practices/off", "formidable/rules/eslint/es6/on", "formidable/rules/eslint/errors/off", "formidable/rules/eslint/strict/on", @@ -89,7 +102,5 @@ "formidable/rules/eslint/variables/on", "prettier" ], - "plugins": [ - "prettier" - ] + "plugins": ["prettier"] } diff --git a/app/controllers/auth/helpers/checkPermissions.js b/app/controllers/auth/helpers/checkPermissions.js index 486a8fb..2f710f0 100644 --- a/app/controllers/auth/helpers/checkPermissions.js +++ b/app/controllers/auth/helpers/checkPermissions.js @@ -9,7 +9,7 @@ const utils = require('../../../middleware/utils') const checkPermissions = (data, next) => { return new Promise((resolve, reject) => { User.findById(data.id, (err, result) => { - utils.itemNotFound(err, result, reject, 'NOT_FOUND') + utils.itemNotFound(err, result, 'NOT_FOUND') if (data.roles.indexOf(result.role) > -1) { return resolve(next()) } diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js index 54663c9..0e1ae6a 100644 --- a/app/controllers/auth/helpers/findForgotPassword.js +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils') * @param {string} id - verification id */ const findForgotPassword = (id) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { ForgotPassword.findOne( { verification: id, used: false }, (err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND_OR_ALREADY_USED') + utils.itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED') resolve(item) } ) diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js index 8fe5e01..a6576fb 100644 --- a/app/controllers/auth/helpers/findUser.js +++ b/app/controllers/auth/helpers/findUser.js @@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils') * @param {string} email - user´s email */ const findUser = (email) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findOne( { email }, 'password loginAttempts blockExpires name email role verified verification', (err, item) => { - utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') + utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST') resolve(item) } ) diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js index 6a85e50..f75892b 100644 --- a/app/controllers/auth/helpers/findUserById.js +++ b/app/controllers/auth/helpers/findUserById.js @@ -6,9 +6,9 @@ const utils = require('../../../middleware/utils') * @param {string} id - user´s id */ const findUserById = (userId) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findById(userId, (err, item) => { - utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST') + utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST') resolve(item) }) }) diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js index 7075c3f..a932463 100644 --- a/app/controllers/auth/helpers/findUserToResetPassword.js +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils') * @param {string} email - user email */ const findUserToResetPassword = (email) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findOne( { email }, (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') + utils.itemNotFound(err, user, 'NOT_FOUND') resolve(user) } ) diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js index ff9a057..9649d59 100644 --- a/app/controllers/auth/helpers/markResetPasswordAsUsed.js +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils') * @param {Object} forgot - forgot object */ const markResetPasswordAsUsed = (req, forgot) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { forgot.used = true forgot.ipChanged = utils.getIP(req) forgot.browserChanged = utils.getBrowserInfo(req) forgot.countryChanged = utils.getCountry(req) forgot.save((err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND') + utils.itemNotFound(err, item, 'NOT_FOUND') resolve(utils.buildSuccObject('PASSWORD_CHANGED')) }) }) diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js index 3f4a834..4e56921 100644 --- a/app/controllers/auth/helpers/updatePassword.js +++ b/app/controllers/auth/helpers/updatePassword.js @@ -6,10 +6,10 @@ const utils = require('../../../middleware/utils') * @param {Object} user - user object */ const updatePassword = (password, user) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { user.password = password user.save((err, item) => { - utils.itemNotFound(err, item, reject, 'NOT_FOUND') + utils.itemNotFound(err, item, 'NOT_FOUND') resolve(item) }) }) diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js index 290d34f..bf23804 100644 --- a/app/controllers/auth/helpers/verificationExists.js +++ b/app/controllers/auth/helpers/verificationExists.js @@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils') * @param {string} id - verification id */ const verificationExists = (id) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findOne( { verification: id, verified: false }, (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND_OR_ALREADY_VERIFIED') + utils.itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED') resolve(user) } ) diff --git a/app/controllers/cities/helpers/cityExists.js b/app/controllers/cities/helpers/cityExists.js index 7be4763..c72e8e8 100644 --- a/app/controllers/cities/helpers/cityExists.js +++ b/app/controllers/cities/helpers/cityExists.js @@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils') * @param {string} name - name of item */ const cityExists = (name) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { City.findOne( { name }, (err, item) => { - utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') + utils.itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') resolve(false) } ) diff --git a/app/controllers/cities/helpers/cityExistsExcludingItself.js b/app/controllers/cities/helpers/cityExistsExcludingItself.js index 271eb42..72d17de 100644 --- a/app/controllers/cities/helpers/cityExistsExcludingItself.js +++ b/app/controllers/cities/helpers/cityExistsExcludingItself.js @@ -7,7 +7,7 @@ const utils = require('../../../middleware/utils') * @param {string} name - name of item */ const cityExistsExcludingItself = (id, name) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { City.findOne( { name, @@ -16,7 +16,7 @@ const cityExistsExcludingItself = (id, name) => { } }, (err, item) => { - utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS') + utils.itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') resolve(false) } ) diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js index 96d441d..fca8d32 100644 --- a/app/controllers/profile/helpers/changePasswordInDB.js +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -9,7 +9,7 @@ const utils = require('../../../middleware/utils') const changePasswordInDB = (id, req) => { return new Promise((resolve, reject) => { User.findById(id, '+password', (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') + utils.itemNotFound(err, user, 'NOT_FOUND') // Assigns new password to user user.password = req.newPassword diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js index 7a0877b..d026ada 100644 --- a/app/controllers/profile/helpers/findUser.js +++ b/app/controllers/profile/helpers/findUser.js @@ -6,9 +6,9 @@ const utils = require('../../../middleware/utils') * @param {string} email - user id */ const findUser = (id) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findById(id, 'password email', (err, user) => { - utils.itemNotFound(err, user, reject, 'USER_DOES_NOT_EXIST') + utils.itemNotFound(err, user, 'USER_DOES_NOT_EXIST') resolve(user) }) }) diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js index a2534c5..d6a9b8c 100644 --- a/app/controllers/profile/helpers/getProfileFromDB.js +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -6,9 +6,9 @@ const utils = require('../../../middleware/utils') * @param {string} id - user id */ const getProfileFromDB = (id) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findById(id, '-_id -updatedAt -createdAt', (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') + utils.itemNotFound(err, user, 'NOT_FOUND') resolve(user) }) }) diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js index 93eacc3..94f4eb1 100644 --- a/app/controllers/profile/helpers/updateProfileInDB.js +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -7,7 +7,7 @@ const utils = require('../../../middleware/utils') * @param {string} id - user id */ const updateProfileInDB = (req, id) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { User.findByIdAndUpdate( id, req, @@ -17,7 +17,7 @@ const updateProfileInDB = (req, id) => { select: '-role -_id -updatedAt -createdAt' }, (err, user) => { - utils.itemNotFound(err, user, reject, 'NOT_FOUND') + utils.itemNotFound(err, user, 'NOT_FOUND') resolve(user) } ) diff --git a/app/middleware/auth.js b/app/middleware/auth.js deleted file mode 100644 index 5a269d2..0000000 --- a/app/middleware/auth.js +++ /dev/null @@ -1,61 +0,0 @@ -const crypto = require('crypto') - -const secret = process.env.JWT_SECRET -const algorithm = 'aes-192-cbc' -// Key length is dependent on the algorithm. In this case for aes192, it is -// 24 bytes (192 bits). -const key = crypto.scryptSync(secret, 'salt', 24) -const iv = Buffer.alloc(16, 0) // Initialization crypto vector - -module.exports = { - /** - * Checks is password matches - * @param {string} password - password - * @param {Object} user - user object - * @returns {boolean} - */ - async checkPassword(password, user) { - return new Promise((resolve, reject) => { - user.comparePassword(password, (err, isMatch) => { - if (err) { - reject(this.buildErrObject(422, err.message)) - } - if (!isMatch) { - resolve(false) - } - resolve(true) - }) - }) - }, - - /** - * Encrypts text - * @param {string} text - text to encrypt - */ - - encrypt(text) { - const cipher = crypto.createCipheriv(algorithm, key, iv) - - let encrypted = cipher.update(text, 'utf8', 'hex') - encrypted += cipher.final('hex') - - return encrypted - }, - - /** - * Decrypts text - * @param {string} text - text to decrypt - */ - - decrypt(text) { - const decipher = crypto.createDecipheriv(algorithm, key, iv) - - try { - let decrypted = decipher.update(text, 'hex', 'utf8') - decrypted += decipher.final('utf8') - return decrypted - } catch (err) { - return err - } - } -} diff --git a/app/middleware/auth/checkPassword.js b/app/middleware/auth/checkPassword.js new file mode 100644 index 0000000..ff56832 --- /dev/null +++ b/app/middleware/auth/checkPassword.js @@ -0,0 +1,23 @@ +const { buildErrObject } = require('../../middleware/utils') + +/** + * Checks is password matches + * @param {string} password - password + * @param {Object} user - user object + * @returns {boolean} + */ +const checkPassword = (password, user) => { + return new Promise((resolve, reject) => { + user.comparePassword(password, (err, isMatch) => { + if (err) { + reject(buildErrObject(422, err.message)) + } + if (!isMatch) { + resolve(false) + } + resolve(true) + }) + }) +} + +module.exports = { checkPassword } diff --git a/app/middleware/auth/decrypt.js b/app/middleware/auth/decrypt.js new file mode 100644 index 0000000..bd9b3af --- /dev/null +++ b/app/middleware/auth/decrypt.js @@ -0,0 +1,26 @@ +const crypto = require('crypto') + +const secret = process.env.JWT_SECRET +const algorithm = 'aes-256-cbc' +// Key length is dependent on the algorithm. In this case for aes256, it is +// 32 bytes (256 bits). +const key = crypto.scryptSync(secret, 'salt', 32) +const iv = Buffer.alloc(16, 0) // Initialization crypto vector + +/** + * Decrypts text + * @param {string} text - text to decrypt + */ +const decrypt = (text) => { + const decipher = crypto.createDecipheriv(algorithm, key, iv) + + try { + let decrypted = decipher.update(text, 'hex', 'utf8') + decrypted += decipher.final('utf8') + return decrypted + } catch (err) { + return err + } +} + +module.exports = { decrypt } diff --git a/app/middleware/auth/encrypt.js b/app/middleware/auth/encrypt.js new file mode 100644 index 0000000..0057f38 --- /dev/null +++ b/app/middleware/auth/encrypt.js @@ -0,0 +1,23 @@ +const crypto = require('crypto') + +const secret = process.env.JWT_SECRET +const algorithm = 'aes-256-cbc' +// Key length is dependent on the algorithm. In this case for aes256, it is +// 32 bytes (256 bits). +const key = crypto.scryptSync(secret, 'salt', 32) +const iv = Buffer.alloc(16, 0) // Initialization crypto vector + +/** + * Encrypts text + * @param {string} text - text to encrypt + */ +const encrypt = (text) => { + const cipher = crypto.createCipheriv(algorithm, key, iv) + + let encrypted = cipher.update(text, 'utf8', 'hex') + encrypted += cipher.final('hex') + + return encrypted +} + +module.exports = { encrypt } diff --git a/app/middleware/auth/index.js b/app/middleware/auth/index.js new file mode 100644 index 0000000..820f56f --- /dev/null +++ b/app/middleware/auth/index.js @@ -0,0 +1,9 @@ +const { checkPassword } = require('./checkPassword') +const { decrypt } = require('./decrypt') +const { encrypt } = require('./encrypt') + +module.exports = { + checkPassword, + decrypt, + encrypt +} diff --git a/app/middleware/db.js b/app/middleware/db.js deleted file mode 100644 index 01f8c4c..0000000 --- a/app/middleware/db.js +++ /dev/null @@ -1,168 +0,0 @@ -const { - buildSuccObject, - buildErrObject, - itemNotFound -} = require('../middleware/utils') - -/** - * Builds sorting - * @param {string} sort - field to sort from - * @param {number} order - order for query (1,-1) - */ -const buildSort = (sort, order) => { - const sortBy = {} - sortBy[sort] = order - return sortBy -} - -/** - * Hack for mongoose-paginate, removes 'id' from results - * @param {Object} result - result object - */ -const cleanPaginationID = (result) => { - result.docs.map((element) => delete element.id) - return result -} - -/** - * Builds initial options for query - * @param {Object} query - query object - */ -const listInitOptions = async (req) => { - return new Promise((resolve) => { - const order = req.query.order || -1 - const sort = req.query.sort || 'createdAt' - const sortBy = buildSort(sort, order) - const page = parseInt(req.query.page, 10) || 1 - const limit = parseInt(req.query.limit, 10) || 5 - const options = { - sort: sortBy, - lean: true, - page, - limit - } - resolve(options) - }) -} - -module.exports = { - /** - * Checks the query string for filtering records - * query.filter should be the text to search (string) - * query.fields should be the fields to search into (array) - * @param {Object} query - query object - */ - async checkQueryString(query) { - return new Promise((resolve, reject) => { - try { - if ( - typeof query.filter !== 'undefined' && - typeof query.fields !== 'undefined' - ) { - const data = { - $or: [] - } - const array = [] - // Takes fields param and builds an array by splitting with ',' - const arrayFields = query.fields.split(',') - // Adds SQL Like %word% with regex - arrayFields.map((item) => { - array.push({ - [item]: { - $regex: new RegExp(query.filter, 'i') - } - }) - }) - // Puts array result in data - data.$or = array - resolve(data) - } else { - resolve({}) - } - } catch (err) { - console.log(err.message) - reject(buildErrObject(422, 'ERROR_WITH_FILTER')) - } - }) - }, - - /** - * Gets items from database - * @param {Object} req - request object - * @param {Object} query - query object - */ - async getItems(req, model, query) { - const options = await listInitOptions(req) - return new Promise((resolve, reject) => { - model.paginate(query, options, (err, items) => { - if (err) { - reject(buildErrObject(422, err.message)) - } - resolve(cleanPaginationID(items)) - }) - }) - }, - - /** - * Gets item from database by id - * @param {string} id - item id - */ - async getItem(id, model) { - return new Promise((resolve, reject) => { - model.findById(id, (err, item) => { - itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(item) - }) - }) - }, - - /** - * Creates a new item in database - * @param {Object} req - request object - */ - async createItem(req, model) { - return new Promise((resolve, reject) => { - model.create(req, (err, item) => { - if (err) { - reject(buildErrObject(422, err.message)) - } - resolve(item) - }) - }) - }, - - /** - * Updates an item in database by id - * @param {string} id - item id - * @param {Object} req - request object - */ - async updateItem(id, model, req) { - return new Promise((resolve, reject) => { - model.findByIdAndUpdate( - id, - req, - { - new: true, - runValidators: true - }, - (err, item) => { - itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(item) - } - ) - }) - }, - - /** - * Deletes an item from database by id - * @param {string} id - id of item - */ - async deleteItem(id, model) { - return new Promise((resolve, reject) => { - model.findByIdAndRemove(id, (err, item) => { - itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(buildSuccObject('DELETED')) - }) - }) - } -} diff --git a/app/middleware/db/buildSort.js b/app/middleware/db/buildSort.js new file mode 100644 index 0000000..af55ca1 --- /dev/null +++ b/app/middleware/db/buildSort.js @@ -0,0 +1,12 @@ +/** + * Builds sorting + * @param {string} sort - field to sort from + * @param {number} order - order for query (1,-1) + */ +const buildSort = (sort, order) => { + const sortBy = {} + sortBy[sort] = order + return sortBy +} + +module.exports = { buildSort } diff --git a/app/middleware/db/checkQueryString.js b/app/middleware/db/checkQueryString.js new file mode 100644 index 0000000..74d2424 --- /dev/null +++ b/app/middleware/db/checkQueryString.js @@ -0,0 +1,43 @@ +const { buildErrObject } = require('../../middleware/utils') + +/** + * Checks the query string for filtering records + * query.filter should be the text to search (string) + * query.fields should be the fields to search into (array) + * @param {Object} query - query object + */ +const checkQueryString = (query) => { + return new Promise((resolve, reject) => { + try { + if ( + typeof query.filter !== 'undefined' && + typeof query.fields !== 'undefined' + ) { + const data = { + $or: [] + } + const array = [] + // Takes fields param and builds an array by splitting with ',' + const arrayFields = query.fields.split(',') + // Adds SQL Like %word% with regex + arrayFields.map((item) => { + array.push({ + [item]: { + $regex: new RegExp(query.filter, 'i') + } + }) + }) + // Puts array result in data + data.$or = array + resolve(data) + } else { + resolve({}) + } + } catch (err) { + console.log(err.message) + reject(buildErrObject(422, 'ERROR_WITH_FILTER')) + } + }) +} + +module.exports = { checkQueryString } diff --git a/app/middleware/db/cleanPaginationID.js b/app/middleware/db/cleanPaginationID.js new file mode 100644 index 0000000..d824f3c --- /dev/null +++ b/app/middleware/db/cleanPaginationID.js @@ -0,0 +1,10 @@ +/** + * Hack for mongoose-paginate, removes 'id' from results + * @param {Object} result - result object + */ +const cleanPaginationID = (result) => { + result.docs.map((element) => delete element.id) + return result +} + +module.exports = { cleanPaginationID } diff --git a/app/middleware/db/createItem.js b/app/middleware/db/createItem.js new file mode 100644 index 0000000..6079ad6 --- /dev/null +++ b/app/middleware/db/createItem.js @@ -0,0 +1,18 @@ +const { buildErrObject } = require('../../middleware/utils') + +/** + * Creates a new item in database + * @param {Object} req - request object + */ +const createItem = (req, model) => { + return new Promise((resolve, reject) => { + model.create(req, (err, item) => { + if (err) { + reject(buildErrObject(422, err.message)) + } + resolve(item) + }) + }) +} + +module.exports = { createItem } diff --git a/app/middleware/db/deleteItem.js b/app/middleware/db/deleteItem.js new file mode 100644 index 0000000..36eb507 --- /dev/null +++ b/app/middleware/db/deleteItem.js @@ -0,0 +1,16 @@ +const { buildSuccObject, itemNotFound } = require('../../middleware/utils') + +/** + * Deletes an item from database by id + * @param {string} id - id of item + */ +const deleteItem = (id, model) => { + return new Promise((resolve) => { + model.findByIdAndRemove(id, (err, item) => { + itemNotFound(err, item, 'NOT_FOUND') + resolve(buildSuccObject('DELETED')) + }) + }) +} + +module.exports = { deleteItem } diff --git a/app/middleware/db/getItem.js b/app/middleware/db/getItem.js new file mode 100644 index 0000000..e67477d --- /dev/null +++ b/app/middleware/db/getItem.js @@ -0,0 +1,16 @@ +const { itemNotFound } = require('../../middleware/utils') + +/** + * Gets item from database by id + * @param {string} id - item id + */ +const getItem = (id, model) => { + return new Promise((resolve, reject) => { + model.findById(id, (err, item) => { + itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(item) + }) + }) +} + +module.exports = { getItem } diff --git a/app/middleware/db/getItems.js b/app/middleware/db/getItems.js new file mode 100644 index 0000000..c14edcc --- /dev/null +++ b/app/middleware/db/getItems.js @@ -0,0 +1,24 @@ +const { + listInitOptions, + buildErrObject, + cleanPaginationID +} = require('../../middleware/utils') + +/** + * Gets items from database + * @param {Object} req - request object + * @param {Object} query - query object + */ +const getItems = async (req, model, query) => { + const options = await listInitOptions(req) + return new Promise((resolve, reject) => { + model.paginate(query, options, (err, items) => { + if (err) { + reject(buildErrObject(422, err.message)) + } + resolve(cleanPaginationID(items)) + }) + }) +} + +module.exports = { getItems } diff --git a/app/middleware/db/index.js b/app/middleware/db/index.js new file mode 100644 index 0000000..53889e8 --- /dev/null +++ b/app/middleware/db/index.js @@ -0,0 +1,21 @@ +const { buildSort } = require('./buildSort') +const { checkQueryString } = require('./checkQueryString') +const { cleanPaginationID } = require('./cleanPaginationID') +const { createItem } = require('./createItem') +const { deleteItem } = require('./deleteItem') +const { getItem } = require('./getItem') +const { getItems } = require('./getItems') +const { listInitOptions } = require('./listInitOptions') +const { updateItem } = require('./updateItem') + +module.exports = { + buildSort, + checkQueryString, + cleanPaginationID, + createItem, + deleteItem, + getItem, + getItems, + listInitOptions, + updateItem +} diff --git a/app/middleware/db/listInitOptions.js b/app/middleware/db/listInitOptions.js new file mode 100644 index 0000000..4ef77c2 --- /dev/null +++ b/app/middleware/db/listInitOptions.js @@ -0,0 +1,24 @@ +const { buildSort } = require('./buildSort') + +/** + * Builds initial options for query + * @param {Object} query - query object + */ +const listInitOptions = async (req) => { + return new Promise((resolve) => { + const order = req.query.order || -1 + const sort = req.query.sort || 'createdAt' + const sortBy = buildSort(sort, order) + const page = parseInt(req.query.page, 10) || 1 + const limit = parseInt(req.query.limit, 10) || 5 + const options = { + sort: sortBy, + lean: true, + page, + limit + } + resolve(options) + }) +} + +module.exports = { listInitOptions } diff --git a/app/middleware/db/updateItem.js b/app/middleware/db/updateItem.js new file mode 100644 index 0000000..2a2cacf --- /dev/null +++ b/app/middleware/db/updateItem.js @@ -0,0 +1,25 @@ +const { itemNotFound } = require('../../middleware/utils') + +/** + * Updates an item in database by id + * @param {string} id - item id + * @param {Object} req - request object + */ +const updateItem = (id, model, req) => { + return new Promise((resolve, reject) => { + model.findByIdAndUpdate( + id, + req, + { + new: true, + runValidators: true + }, + (err, item) => { + itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(item) + } + ) + }) +} + +module.exports = { updateItem } diff --git a/app/middleware/emailer.js b/app/middleware/emailer.js deleted file mode 100644 index b701d4b..0000000 --- a/app/middleware/emailer.js +++ /dev/null @@ -1,137 +0,0 @@ -const nodemailer = require('nodemailer') -const mg = require('nodemailer-mailgun-transport') -const i18n = require('i18n') -const User = require('../models/user') -const { itemAlreadyExists } = require('../middleware/utils') - -/** - * Sends email - * @param {Object} data - data - * @param {boolean} callback - callback - */ -const sendEmail = async (data, callback) => { - const auth = { - auth: { - // eslint-disable-next-line camelcase - api_key: process.env.EMAIL_SMTP_API_MAILGUN, - domain: process.env.EMAIL_SMTP_DOMAIN_MAILGUN - } - } - const transporter = nodemailer.createTransport(mg(auth)) - const mailOptions = { - from: `${process.env.EMAIL_FROM_NAME} <${process.env.EMAIL_FROM_ADDRESS}>`, - to: `${data.user.name} <${data.user.email}>`, - subject: data.subject, - html: data.htmlMessage - } - transporter.sendMail(mailOptions, (err) => { - if (err) { - return callback(false) - } - return callback(true) - }) -} - -/** - * Prepares to send email - * @param {string} user - user object - * @param {string} subject - subject - * @param {string} htmlMessage - html message - */ -const prepareToSendEmail = (user, subject, htmlMessage) => { - user = { - name: user.name, - email: user.email, - verification: user.verification - } - const data = { - user, - subject, - htmlMessage - } - if (process.env.NODE_ENV === 'production') { - sendEmail(data, (messageSent) => - messageSent - ? console.log(`Email SENT to: ${user.email}`) - : console.log(`Email FAILED to: ${user.email}`) - ) - } else if (process.env.NODE_ENV === 'development') { - console.log(data) - } -} - -module.exports = { - /** - * Checks User model if user with an specific email exists - * @param {string} email - user email - */ - async emailExists(email) { - return new Promise((resolve, reject) => { - User.findOne( - { - email - }, - (err, item) => { - itemAlreadyExists(err, item, reject, 'EMAIL_ALREADY_EXISTS') - resolve(false) - } - ) - }) - }, - - /** - * Checks User model if user with an specific email exists but excluding user id - * @param {string} id - user id - * @param {string} email - user email - */ - async emailExistsExcludingMyself(id, email) { - return new Promise((resolve, reject) => { - User.findOne( - { - email, - _id: { - $ne: id - } - }, - (err, item) => { - itemAlreadyExists(err, item, reject, 'EMAIL_ALREADY_EXISTS') - resolve(false) - } - ) - }) - }, - - /** - * Sends registration email - * @param {string} locale - locale - * @param {Object} user - user object - */ - async sendRegistrationEmailMessage(locale, user) { - i18n.setLocale(locale) - const subject = i18n.__('registration.SUBJECT') - const htmlMessage = i18n.__( - 'registration.MESSAGE', - user.name, - process.env.FRONTEND_URL, - user.verification - ) - prepareToSendEmail(user, subject, htmlMessage) - }, - - /** - * Sends reset password email - * @param {string} locale - locale - * @param {Object} user - user object - */ - async sendResetPasswordEmailMessage(locale, user) { - i18n.setLocale(locale) - const subject = i18n.__('forgotPassword.SUBJECT') - const htmlMessage = i18n.__( - 'forgotPassword.MESSAGE', - user.email, - process.env.FRONTEND_URL, - user.verification - ) - prepareToSendEmail(user, subject, htmlMessage) - } -} diff --git a/app/middleware/emailer/emailExists.js b/app/middleware/emailer/emailExists.js new file mode 100644 index 0000000..1881fb4 --- /dev/null +++ b/app/middleware/emailer/emailExists.js @@ -0,0 +1,22 @@ +const User = require('../../models/user') +const { itemAlreadyExists } = require('../../middleware/utils') + +/** + * Checks User model if user with an specific email exists + * @param {string} email - user email + */ +const emailExists = (email) => { + return new Promise((resolve) => { + User.findOne( + { + email + }, + (err, item) => { + itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS') + resolve(false) + } + ) + }) +} + +module.exports = { emailExists } diff --git a/app/middleware/emailer/emailExistsExcludingMyself.js b/app/middleware/emailer/emailExistsExcludingMyself.js new file mode 100644 index 0000000..94bde20 --- /dev/null +++ b/app/middleware/emailer/emailExistsExcludingMyself.js @@ -0,0 +1,26 @@ +const User = require('../../models/user') +const { itemAlreadyExists } = require('../../middleware/utils') + +/** + * Checks User model if user with an specific email exists but excluding user id + * @param {string} id - user id + * @param {string} email - user email + */ +const emailExistsExcludingMyself = (id, email) => { + return new Promise((resolve) => { + User.findOne( + { + email, + _id: { + $ne: id + } + }, + (err, item) => { + itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS') + resolve(false) + } + ) + }) +} + +module.exports = { emailExistsExcludingMyself } diff --git a/app/middleware/emailer/index.js b/app/middleware/emailer/index.js new file mode 100644 index 0000000..d9e4939 --- /dev/null +++ b/app/middleware/emailer/index.js @@ -0,0 +1,19 @@ +const { emailExists } = require('./emailExists') +const { emailExistsExcludingMyself } = require('./emailExistsExcludingMyself') +const { prepareToSendEmail } = require('./prepareToSendEmail') +const { sendEmail } = require('./sendEmail') +const { + sendRegistrationEmailMessage +} = require('./sendRegistrationEmailMessage') +const { + sendResetPasswordEmailMessage +} = require('./sendResetPasswordEmailMessage') + +module.exports = { + emailExists, + emailExistsExcludingMyself, + prepareToSendEmail, + sendEmail, + sendRegistrationEmailMessage, + sendResetPasswordEmailMessage +} diff --git a/app/middleware/emailer/prepareToSendEmail.js b/app/middleware/emailer/prepareToSendEmail.js new file mode 100644 index 0000000..1b77efc --- /dev/null +++ b/app/middleware/emailer/prepareToSendEmail.js @@ -0,0 +1,31 @@ +const { sendEmail } = require('./sendEmail') + +/** + * Prepares to send email + * @param {string} user - user object + * @param {string} subject - subject + * @param {string} htmlMessage - html message + */ +const prepareToSendEmail = (user, subject, htmlMessage) => { + user = { + name: user.name, + email: user.email, + verification: user.verification + } + const data = { + user, + subject, + htmlMessage + } + if (process.env.NODE_ENV === 'production') { + sendEmail(data, (messageSent) => + messageSent + ? console.log(`Email SENT to: ${user.email}`) + : console.log(`Email FAILED to: ${user.email}`) + ) + } else if (process.env.NODE_ENV === 'development') { + console.log(data) + } +} + +module.exports = { prepareToSendEmail } diff --git a/app/middleware/emailer/sendEmail.js b/app/middleware/emailer/sendEmail.js new file mode 100644 index 0000000..d83b56c --- /dev/null +++ b/app/middleware/emailer/sendEmail.js @@ -0,0 +1,32 @@ +const nodemailer = require('nodemailer') +const mg = require('nodemailer-mailgun-transport') + +/** + * Sends email + * @param {Object} data - data + * @param {boolean} callback - callback + */ +const sendEmail = async (data, callback) => { + const auth = { + auth: { + // eslint-disable-next-line camelcase + api_key: process.env.EMAIL_SMTP_API_MAILGUN, + domain: process.env.EMAIL_SMTP_DOMAIN_MAILGUN + } + } + const transporter = nodemailer.createTransport(mg(auth)) + const mailOptions = { + from: `${process.env.EMAIL_FROM_NAME} <${process.env.EMAIL_FROM_ADDRESS}>`, + to: `${data.user.name} <${data.user.email}>`, + subject: data.subject, + html: data.htmlMessage + } + transporter.sendMail(mailOptions, (err) => { + if (err) { + return callback(false) + } + return callback(true) + }) +} + +module.exports = { sendEmail } diff --git a/app/middleware/emailer/sendRegistrationEmailMessage.js b/app/middleware/emailer/sendRegistrationEmailMessage.js new file mode 100644 index 0000000..2ce591d --- /dev/null +++ b/app/middleware/emailer/sendRegistrationEmailMessage.js @@ -0,0 +1,21 @@ +const i18n = require('i18n') +const { prepareToSendEmail } = require('./prepareToSendEmail') + +/** + * Sends registration email + * @param {string} locale - locale + * @param {Object} user - user object + */ +const sendRegistrationEmailMessage = (locale, user) => { + i18n.setLocale(locale) + const subject = i18n.__('registration.SUBJECT') + const htmlMessage = i18n.__( + 'registration.MESSAGE', + user.name, + process.env.FRONTEND_URL, + user.verification + ) + prepareToSendEmail(user, subject, htmlMessage) +} + +module.exports = { sendRegistrationEmailMessage } diff --git a/app/middleware/emailer/sendResetPasswordEmailMessage.js b/app/middleware/emailer/sendResetPasswordEmailMessage.js new file mode 100644 index 0000000..818b5aa --- /dev/null +++ b/app/middleware/emailer/sendResetPasswordEmailMessage.js @@ -0,0 +1,21 @@ +const i18n = require('i18n') +const { prepareToSendEmail } = require('./prepareToSendEmail') + +/** + * Sends reset password email + * @param {string} locale - locale + * @param {Object} user - user object + */ +const sendResetPasswordEmailMessage = (locale, user) => { + i18n.setLocale(locale) + const subject = i18n.__('forgotPassword.SUBJECT') + const htmlMessage = i18n.__( + 'forgotPassword.MESSAGE', + user.email, + process.env.FRONTEND_URL, + user.verification + ) + prepareToSendEmail(user, subject, htmlMessage) +} + +module.exports = { sendResetPasswordEmailMessage } diff --git a/app/middleware/utils.js b/app/middleware/utils.js deleted file mode 100644 index 0bf393e..0000000 --- a/app/middleware/utils.js +++ /dev/null @@ -1,133 +0,0 @@ -const mongoose = require('mongoose') -const requestIp = require('request-ip') -const { validationResult } = require('express-validator') - -/** - * Removes extension from file - * @param {string} file - filename - */ -exports.removeExtensionFromFile = (file) => { - return file.split('.').slice(0, -1).join('.').toString() -} - -/** - * Gets IP from user - * @param {*} req - request object - */ -exports.getIP = (req) => requestIp.getClientIp(req) - -/** - * Gets browser info from user - * @param {*} req - request object - */ -exports.getBrowserInfo = (req) => req.headers['user-agent'] - -/** - * Gets country from user using CloudFlare header 'cf-ipcountry' - * @param {*} req - request object - */ -exports.getCountry = (req) => - req.headers['cf-ipcountry'] ? req.headers['cf-ipcountry'] : 'XX' - -/** - * Handles error by printing to console in development env and builds and sends an error response - * @param {Object} res - response object - * @param {Object} err - error object - */ -exports.handleError = (res, err) => { - // Prints error in console - if (process.env.NODE_ENV === 'development') { - console.log(err) - } - // Sends error to user - res.status(err.code).json({ - errors: { - msg: err.message - } - }) -} - -/** - * Builds error object - * @param {number} code - error code - * @param {string} message - error text - */ -exports.buildErrObject = (code, message) => { - return { - code, - message - } -} - -/** - * Builds error for validation files - * @param {Object} req - request object - * @param {Object} res - response object - * @param {Object} next - next object - */ -exports.validationResult = (req, res, next) => { - try { - validationResult(req).throw() - if (req.body.email) { - req.body.email = req.body.email.toLowerCase() - } - return next() - } catch (err) { - return this.handleError(res, this.buildErrObject(422, err.array())) - } -} - -/** - * Builds success object - * @param {string} message - success text - */ -exports.buildSuccObject = (message) => { - return { - msg: message - } -} - -/** - * Checks if given ID is good for MongoDB - * @param {string} id - id to check - */ -exports.isIDGood = async (id) => { - return new Promise((resolve, reject) => { - const goodID = mongoose.Types.ObjectId.isValid(id) - return goodID - ? resolve(id) - : reject(this.buildErrObject(422, 'ID_MALFORMED')) - }) -} - -/** - * Item not found - * @param {Object} err - error object - * @param {Object} item - item result object - * @param {Object} reject - reject object - * @param {string} message - message - */ -exports.itemNotFound = (err, item, reject, message) => { - if (err) { - reject(this.buildErrObject(422, err.message)) - } - if (!item) { - reject(this.buildErrObject(404, message)) - } -} - -/** - * Item already exists - * @param {Object} err - error object - * @param {Object} item - item result object - * @param {Object} reject - reject object - * @param {string} message - message - */ -exports.itemAlreadyExists = (err, item, reject, message) => { - if (err) { - reject(this.buildErrObject(422, err.message)) - } - if (item) { - reject(this.buildErrObject(422, message)) - } -} diff --git a/app/middleware/utils/buildErrObject.js b/app/middleware/utils/buildErrObject.js new file mode 100644 index 0000000..9a65bf7 --- /dev/null +++ b/app/middleware/utils/buildErrObject.js @@ -0,0 +1,13 @@ +/** + * Builds error object + * @param {number} code - error code + * @param {string} message - error text + */ +const buildErrObject = (code, message) => { + return { + code, + message + } +} + +module.exports = { buildErrObject } diff --git a/app/middleware/utils/buildSuccObject.js b/app/middleware/utils/buildSuccObject.js new file mode 100644 index 0000000..9fe9761 --- /dev/null +++ b/app/middleware/utils/buildSuccObject.js @@ -0,0 +1,11 @@ +/** + * Builds success object + * @param {string} message - success text + */ +const buildSuccObject = (message) => { + return { + msg: message + } +} + +module.exports = { buildSuccObject } diff --git a/app/middleware/utils/getBrowserInfo.js b/app/middleware/utils/getBrowserInfo.js new file mode 100644 index 0000000..6a6529b --- /dev/null +++ b/app/middleware/utils/getBrowserInfo.js @@ -0,0 +1,7 @@ +/** + * Gets browser info from user + * @param {*} req - request object + */ +const getBrowserInfo = (req) => req.headers['user-agent'] + +module.exports = { getBrowserInfo } diff --git a/app/middleware/utils/getCountry.js b/app/middleware/utils/getCountry.js new file mode 100644 index 0000000..785fc6e --- /dev/null +++ b/app/middleware/utils/getCountry.js @@ -0,0 +1,8 @@ +/** + * Gets country from user using CloudFlare header 'cf-ipcountry' + * @param {*} req - request object + */ +const getCountry = (req) => + req.headers['cf-ipcountry'] ? req.headers['cf-ipcountry'] : 'XX' + +module.exports = { getCountry } diff --git a/app/middleware/utils/getIP.js b/app/middleware/utils/getIP.js new file mode 100644 index 0000000..af0be88 --- /dev/null +++ b/app/middleware/utils/getIP.js @@ -0,0 +1,9 @@ +const requestIp = require('request-ip') + +/** + * Gets IP from user + * @param {*} req - request object + */ +const getIP = (req) => requestIp.getClientIp(req) + +module.exports = { getIP } diff --git a/app/middleware/utils/handleError.js b/app/middleware/utils/handleError.js new file mode 100644 index 0000000..c88b9d3 --- /dev/null +++ b/app/middleware/utils/handleError.js @@ -0,0 +1,19 @@ +/** + * Handles error by printing to console in development env and builds and sends an error response + * @param {Object} res - response object + * @param {Object} err - error object + */ +const handleError = (res, err) => { + // Prints error in console + if (process.env.NODE_ENV === 'development') { + console.log(err) + } + // Sends error to user + res.status(err.code).json({ + errors: { + msg: err.message + } + }) +} + +module.exports = { handleError } diff --git a/app/middleware/utils/index.js b/app/middleware/utils/index.js new file mode 100644 index 0000000..adb46c9 --- /dev/null +++ b/app/middleware/utils/index.js @@ -0,0 +1,25 @@ +const { buildErrObject } = require('./buildErrObject') +const { buildSuccObject } = require('./buildSuccObject') +const { getBrowserInfo } = require('./getBrowserInfo') +const { getCountry } = require('./getCountry') +const { getIP } = require('./getIP') +const { handleError } = require('./handleError') +const { isIDGood } = require('./isIDGood') +const { itemAlreadyExists } = require('./itemAlreadyExists') +const { itemNotFound } = require('./itemNotFound') +const { removeExtensionFromFile } = require('./removeExtensionFromFile') +const { validateResult } = require('./validateResult') + +module.exports = { + buildErrObject, + buildSuccObject, + getBrowserInfo, + getCountry, + getIP, + handleError, + isIDGood, + itemAlreadyExists, + itemNotFound, + removeExtensionFromFile, + validateResult +} diff --git a/app/middleware/utils/isIDGood.js b/app/middleware/utils/isIDGood.js new file mode 100644 index 0000000..8159f9c --- /dev/null +++ b/app/middleware/utils/isIDGood.js @@ -0,0 +1,15 @@ +const mongoose = require('mongoose') +const { buildErrObject } = require('./buildErrObject') + +/** + * Checks if given ID is good for MongoDB + * @param {string} id - id to check + */ +const isIDGood = async (id) => { + return new Promise((resolve, reject) => { + const goodID = mongoose.Types.ObjectId.isValid(id) + return goodID ? resolve(id) : reject(buildErrObject(422, 'ID_MALFORMED')) + }) +} + +module.exports = { isIDGood } diff --git a/app/middleware/utils/itemAlreadyExists.js b/app/middleware/utils/itemAlreadyExists.js new file mode 100644 index 0000000..a7246ea --- /dev/null +++ b/app/middleware/utils/itemAlreadyExists.js @@ -0,0 +1,22 @@ +const { buildErrObject } = require('./buildErrObject') + +/** + * Item already exists + * @param {Object} err - error object + * @param {Object} item - item result object + * @param {Object} reject - reject object + * @param {string} message - message + */ +const itemAlreadyExists = (err, item, message) => { + return new Promise((resolve, reject) => { + if (err) { + reject(buildErrObject(422, err.message)) + } + if (item) { + reject(buildErrObject(422, message)) + } + resolve() + }) +} + +module.exports = { itemAlreadyExists } diff --git a/app/middleware/utils/itemNotFound.js b/app/middleware/utils/itemNotFound.js new file mode 100644 index 0000000..f63c4af --- /dev/null +++ b/app/middleware/utils/itemNotFound.js @@ -0,0 +1,22 @@ +const { buildErrObject } = require('./buildErrObject') + +/** + * Item not found + * @param {Object} err - error object + * @param {Object} item - item result object + * @param {Object} reject - reject object + * @param {string} message - message + */ +const itemNotFound = (err, item, message) => { + return new Promise((resolve, reject) => { + if (err) { + return reject(buildErrObject(422, err.message)) + } + if (!item) { + return reject(buildErrObject(404, message)) + } + resolve() + }) +} + +module.exports = { itemNotFound } diff --git a/app/middleware/utils/removeExtensionFromFile.js b/app/middleware/utils/removeExtensionFromFile.js new file mode 100644 index 0000000..542175e --- /dev/null +++ b/app/middleware/utils/removeExtensionFromFile.js @@ -0,0 +1,9 @@ +/** + * Removes extension from file + * @param {string} file - filename + */ +const removeExtensionFromFile = (file) => { + return file.split('.').slice(0, -1).join('.').toString() +} + +module.exports = { removeExtensionFromFile } diff --git a/app/middleware/utils/validateResult.js b/app/middleware/utils/validateResult.js new file mode 100644 index 0000000..f53c519 --- /dev/null +++ b/app/middleware/utils/validateResult.js @@ -0,0 +1,22 @@ +const { validationResult } = require('express-validator') +const { handleError, buildErrObject } = require('../../middleware/utils') + +/** + * Builds error for validation files + * @param {Object} req - request object + * @param {Object} res - response object + * @param {Object} next - next object + */ +const validateResult = (req, res, next) => { + try { + validationResult(req).throw() + if (req.body.email) { + req.body.email = req.body.email.toLowerCase() + } + return next() + } catch (err) { + return handleError(res, buildErrObject(422, err.array())) + } +} + +module.exports = { validateResult } diff --git a/package-lock.json b/package-lock.json index 4e3c0be..3553505 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz", "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==", - "dev": true, "requires": { "@babel/types": "^7.10.3", "jsesc": "^2.5.1", @@ -88,8 +87,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -97,7 +95,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz", "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==", - "dev": true, "requires": { "@babel/helper-get-function-arity": "^7.10.3", "@babel/template": "^7.10.3", @@ -108,7 +105,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz", "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==", - "dev": true, "requires": { "@babel/types": "^7.10.3" } @@ -181,7 +177,6 @@ "version": "7.10.1", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", - "dev": true, "requires": { "@babel/types": "^7.10.1" } @@ -189,8 +184,7 @@ "@babel/helper-validator-identifier": { "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz", - "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==", - "dev": true + "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==" }, "@babel/helpers": { "version": "7.10.1", @@ -216,14 +210,12 @@ "@babel/parser": { "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz", - "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==", - "dev": true + "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==" }, "@babel/template": { "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, "requires": { "@babel/code-frame": "^7.10.3", "@babel/parser": "^7.10.3", @@ -234,7 +226,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", - "dev": true, "requires": { "@babel/highlight": "^7.10.3" } @@ -243,7 +234,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz", "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.3", "chalk": "^2.0.0", @@ -256,7 +246,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz", "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==", - "dev": true, "requires": { "@babel/code-frame": "^7.10.3", "@babel/generator": "^7.10.3", @@ -273,7 +262,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", - "dev": true, "requires": { "@babel/highlight": "^7.10.3" } @@ -282,7 +270,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz", "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.3", "chalk": "^2.0.0", @@ -293,7 +280,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, "requires": { "ms": "^2.1.1" } @@ -301,8 +287,7 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" } } }, @@ -310,7 +295,6 @@ "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.3", "lodash": "^4.17.13", @@ -774,6 +758,19 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "babel-eslint": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", + "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0", + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" + } + }, "bail": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", @@ -1903,6 +1900,7 @@ "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", @@ -1917,8 +1915,30 @@ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "requires": { "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", "has-symbols": "^1.0.1", "object-keys": "^1.1.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "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" + } + } } } } @@ -2271,8 +2291,7 @@ "eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" }, "espree": { "version": "7.3.0", @@ -3655,6 +3674,11 @@ "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", "dev": true }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" + }, "is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -3953,8 +3977,7 @@ "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, "json-buffer": { "version": "3.0.0", @@ -5704,8 +5727,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-proxy": { "version": "1.0.0", @@ -6348,7 +6370,6 @@ "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -6917,8 +6938,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-readable-stream": { "version": "1.0.0", diff --git a/package.json b/package.json index 4114d3d..0b89cd4 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ ] }, "dependencies": { + "babel-eslint": "^10.1.0", "bcrypt": "^4.0.1", "body-parser": "^1.19.0", "compression": "^1.7.4", From 3ab91fab0bbb5cdda94c0f89e727cb6700a93714 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 00:27:32 -0400 Subject: [PATCH 07/23] Changing utils and emailer refs --- app/controllers/auth/forgotPassword.js | 8 ++++---- app/controllers/auth/getRefreshToken.js | 6 +++--- app/controllers/auth/helpers/blockUser.js | 6 +++--- .../checkLoginAttemptsAndBlockExpires.js | 4 ++-- .../auth/helpers/checkPermissions.js | 6 +++--- .../auth/helpers/findForgotPassword.js | 4 ++-- app/controllers/auth/helpers/findUser.js | 4 ++-- app/controllers/auth/helpers/findUserById.js | 4 ++-- .../auth/helpers/findUserToResetPassword.js | 4 ++-- app/controllers/auth/helpers/generateToken.js | 4 ++-- .../auth/helpers/getUserIdFromToken.js | 8 ++++---- .../auth/helpers/markResetPasswordAsUsed.js | 18 ++++++++++++------ .../auth/helpers/passwordsDoNotMatch.js | 6 +++--- app/controllers/auth/helpers/registerUser.js | 4 ++-- .../auth/helpers/saveForgotPassword.js | 15 ++++++++++----- .../auth/helpers/saveLoginAttemptsToDB.js | 4 ++-- .../helpers/saveUserAccessAndReturnToken.js | 15 ++++++++++----- app/controllers/auth/helpers/updatePassword.js | 4 ++-- app/controllers/auth/helpers/userIsBlocked.js | 4 ++-- .../auth/helpers/verificationExists.js | 4 ++-- app/controllers/auth/helpers/verifyUser.js | 4 ++-- app/controllers/auth/login.js | 10 +++++----- app/controllers/auth/register.js | 13 ++++++++----- app/controllers/auth/resetPassword.js | 4 ++-- app/controllers/auth/roleAuthorization.js | 4 ++-- app/controllers/auth/verify.js | 4 ++-- app/controllers/cities/createItem.js | 4 ++-- app/controllers/cities/deleteItem.js | 6 +++--- app/controllers/cities/getAllItems.js | 4 ++-- app/controllers/cities/getItem.js | 6 +++--- app/controllers/cities/getItems.js | 4 ++-- app/controllers/cities/helpers/cityExists.js | 4 ++-- .../helpers/cityExistsExcludingItself.js | 4 ++-- .../cities/helpers/getAllItemsFromDB.js | 4 ++-- app/controllers/cities/updateItem.js | 6 +++--- app/controllers/profile/changePassword.js | 8 ++++---- app/controllers/profile/getProfile.js | 6 +++--- .../profile/helpers/changePasswordInDB.js | 12 ++++++++---- app/controllers/profile/helpers/findUser.js | 4 ++-- .../profile/helpers/getProfileFromDB.js | 4 ++-- .../profile/helpers/passwordsDoNotMatch.js | 4 ++-- .../profile/helpers/updateProfileInDB.js | 4 ++-- app/controllers/profile/updateProfile.js | 6 +++--- app/controllers/users/createItem.js | 13 ++++++++----- app/controllers/users/deleteItem.js | 6 +++--- app/controllers/users/getItem.js | 6 +++--- app/controllers/users/getItems.js | 4 ++-- .../users/helpers/createItemInDb.js | 4 ++-- app/controllers/users/updateItem.js | 13 +++++-------- 49 files changed, 165 insertions(+), 142 deletions(-) diff --git a/app/controllers/auth/forgotPassword.js b/app/controllers/auth/forgotPassword.js index 910a72a..1fabf7c 100644 --- a/app/controllers/auth/forgotPassword.js +++ b/app/controllers/auth/forgotPassword.js @@ -4,8 +4,8 @@ const { forgotPasswordResponse, saveForgotPassword } = require('./helpers') -const utils = require('../../middleware/utils') -const emailer = require('../../middleware/emailer') +const { handleError } = require('../../middleware/utils') +const { sendResetPasswordEmailMessage } = require('../../middleware/emailer') /** * Forgot password function called by route @@ -19,10 +19,10 @@ const forgotPassword = async (req, res) => { const data = matchedData(req) await findUser(data.email) const item = await saveForgotPassword(req) - emailer.sendResetPasswordEmailMessage(locale, item) + sendResetPasswordEmailMessage(locale, item) res.status(200).json(forgotPasswordResponse(item)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/getRefreshToken.js b/app/controllers/auth/getRefreshToken.js index 2eb418d..ccc02d4 100644 --- a/app/controllers/auth/getRefreshToken.js +++ b/app/controllers/auth/getRefreshToken.js @@ -3,7 +3,7 @@ const { findUserById, saveUserAccessAndReturnToken } = require('./helpers') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') /** * Refresh token function called by route @@ -16,14 +16,14 @@ const getRefreshToken = async (req, res) => { .replace('Bearer ', '') .trim() let userId = await getUserIdFromToken(tokenEncrypted) - userId = await utils.isIDGood(userId) + userId = await isIDGood(userId) const user = await findUserById(userId) const token = await saveUserAccessAndReturnToken(req, user) // Removes user info from response delete token.user res.status(200).json(token) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/helpers/blockUser.js b/app/controllers/auth/helpers/blockUser.js index 4a0f953..6a41c1c 100644 --- a/app/controllers/auth/helpers/blockUser.js +++ b/app/controllers/auth/helpers/blockUser.js @@ -1,7 +1,7 @@ const { addHours } = require('date-fns') const HOURS_TO_BLOCK = 2 -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK @@ -12,10 +12,10 @@ const blockUser = (user) => { user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK) user.save((err, result) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } if (result) { - resolve(utils.buildErrObject(409, 'BLOCKED_USER')) + resolve(buildErrObject(409, 'BLOCKED_USER')) } }) }) diff --git a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js index 521e059..c7410b5 100644 --- a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js +++ b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js @@ -1,5 +1,5 @@ const { blockIsExpired } = require('./blockIsExpired') -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * @@ -12,7 +12,7 @@ const checkLoginAttemptsAndBlockExpires = (user) => { user.loginAttempts = 0 user.save((err, result) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } if (result) { resolve(true) diff --git a/app/controllers/auth/helpers/checkPermissions.js b/app/controllers/auth/helpers/checkPermissions.js index 2f710f0..82ca6c2 100644 --- a/app/controllers/auth/helpers/checkPermissions.js +++ b/app/controllers/auth/helpers/checkPermissions.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound, buildErrObject } = require('../../../middleware/utils') /** * Checks against user if has quested role @@ -9,11 +9,11 @@ const utils = require('../../../middleware/utils') const checkPermissions = (data, next) => { return new Promise((resolve, reject) => { User.findById(data.id, (err, result) => { - utils.itemNotFound(err, result, 'NOT_FOUND') + itemNotFound(err, result, 'NOT_FOUND') if (data.roles.indexOf(result.role) > -1) { return resolve(next()) } - return reject(utils.buildErrObject(401, 'UNAUTHORIZED')) + return reject(buildErrObject(401, 'UNAUTHORIZED')) }) }) } diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js index 0e1ae6a..5c10d82 100644 --- a/app/controllers/auth/helpers/findForgotPassword.js +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -1,5 +1,5 @@ const ForgotPassword = require('../../../models/forgotPassword') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Checks if a forgot password verification exists @@ -13,7 +13,7 @@ const findForgotPassword = (id) => { used: false }, (err, item) => { - utils.itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED') + itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED') resolve(item) } ) diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js index a6576fb..9c95f24 100644 --- a/app/controllers/auth/helpers/findUser.js +++ b/app/controllers/auth/helpers/findUser.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Finds user by email @@ -13,7 +13,7 @@ const findUser = (email) => { }, 'password loginAttempts blockExpires name email role verified verification', (err, item) => { - utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST') + itemNotFound(err, item, 'USER_DOES_NOT_EXIST') resolve(item) } ) diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js index f75892b..1c9aead 100644 --- a/app/controllers/auth/helpers/findUserById.js +++ b/app/controllers/auth/helpers/findUserById.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Finds user by ID @@ -8,7 +8,7 @@ const utils = require('../../../middleware/utils') const findUserById = (userId) => { return new Promise((resolve) => { User.findById(userId, (err, item) => { - utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST') + itemNotFound(err, item, 'USER_DOES_NOT_EXIST') resolve(item) }) }) diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js index a932463..ce9331c 100644 --- a/app/controllers/auth/helpers/findUserToResetPassword.js +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Finds user by email to reset password @@ -12,7 +12,7 @@ const findUserToResetPassword = (email) => { email }, (err, user) => { - utils.itemNotFound(err, user, 'NOT_FOUND') + itemNotFound(err, user, 'NOT_FOUND') resolve(user) } ) diff --git a/app/controllers/auth/helpers/generateToken.js b/app/controllers/auth/helpers/generateToken.js index 4a63b89..c7f1d77 100644 --- a/app/controllers/auth/helpers/generateToken.js +++ b/app/controllers/auth/helpers/generateToken.js @@ -1,5 +1,5 @@ const jwt = require('jsonwebtoken') -const auth = require('../../../middleware/auth') +const { encrypt } = require('../../../middleware/auth') /** * Generates a token @@ -11,7 +11,7 @@ const generateToken = (user) => { Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES // returns signed and encrypted token - return auth.encrypt( + return encrypt( jwt.sign( { data: { diff --git a/app/controllers/auth/helpers/getUserIdFromToken.js b/app/controllers/auth/helpers/getUserIdFromToken.js index dfca050..57f20b9 100644 --- a/app/controllers/auth/helpers/getUserIdFromToken.js +++ b/app/controllers/auth/helpers/getUserIdFromToken.js @@ -1,6 +1,6 @@ const jwt = require('jsonwebtoken') -const utils = require('../../../middleware/utils') -const auth = require('../../../middleware/auth') +const { buildErrObject } = require('../../../middleware/utils') +const { decrypt } = require('../../../middleware/auth') /** * Gets user id from token @@ -9,9 +9,9 @@ const auth = require('../../../middleware/auth') const getUserIdFromToken = (token) => { return new Promise((resolve, reject) => { // Decrypts, verifies and decode token - jwt.verify(auth.decrypt(token), process.env.JWT_SECRET, (err, decoded) => { + jwt.verify(decrypt(token), process.env.JWT_SECRET, (err, decoded) => { if (err) { - reject(utils.buildErrObject(409, 'BAD_TOKEN')) + reject(buildErrObject(409, 'BAD_TOKEN')) } resolve(decoded.data._id) }) diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js index 9649d59..a6fbd4d 100644 --- a/app/controllers/auth/helpers/markResetPasswordAsUsed.js +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -1,4 +1,10 @@ -const utils = require('../../../middleware/utils') +const { + getIP, + getBrowserInfo, + getCountry, + itemNotFound, + buildSuccObject +} = require('../../../middleware/utils') /** * Marks a request to reset password as used @@ -8,12 +14,12 @@ const utils = require('../../../middleware/utils') const markResetPasswordAsUsed = (req, forgot) => { return new Promise((resolve) => { forgot.used = true - forgot.ipChanged = utils.getIP(req) - forgot.browserChanged = utils.getBrowserInfo(req) - forgot.countryChanged = utils.getCountry(req) + forgot.ipChanged = getIP(req) + forgot.browserChanged = getBrowserInfo(req) + forgot.countryChanged = getCountry(req) forgot.save((err, item) => { - utils.itemNotFound(err, item, 'NOT_FOUND') - resolve(utils.buildSuccObject('PASSWORD_CHANGED')) + itemNotFound(err, item, 'NOT_FOUND') + resolve(buildSuccObject('PASSWORD_CHANGED')) }) }) } diff --git a/app/controllers/auth/helpers/passwordsDoNotMatch.js b/app/controllers/auth/helpers/passwordsDoNotMatch.js index e2cd67a..1621ced 100644 --- a/app/controllers/auth/helpers/passwordsDoNotMatch.js +++ b/app/controllers/auth/helpers/passwordsDoNotMatch.js @@ -1,6 +1,6 @@ const { saveLoginAttemptsToDB } = require('./saveLoginAttemptsToDB') const { blockUser } = require('./blockUser') -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') const LOGIN_ATTEMPTS = 5 /** @@ -12,11 +12,11 @@ const passwordsDoNotMatch = async (user) => { await saveLoginAttemptsToDB(user) return new Promise((resolve, reject) => { if (user.loginAttempts <= LOGIN_ATTEMPTS) { - resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) + resolve(buildErrObject(409, 'WRONG_PASSWORD')) } else { resolve(blockUser(user)) } - reject(utils.buildErrObject(422, 'ERROR')) + reject(buildErrObject(422, 'ERROR')) }) } diff --git a/app/controllers/auth/helpers/registerUser.js b/app/controllers/auth/helpers/registerUser.js index 572dd2a..02fb5ae 100644 --- a/app/controllers/auth/helpers/registerUser.js +++ b/app/controllers/auth/helpers/registerUser.js @@ -1,6 +1,6 @@ const uuid = require('uuid') const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Registers a new user in database @@ -16,7 +16,7 @@ const registerUser = (req) => { }) user.save((err, item) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } resolve(item) }) diff --git a/app/controllers/auth/helpers/saveForgotPassword.js b/app/controllers/auth/helpers/saveForgotPassword.js index 466567d..9759933 100644 --- a/app/controllers/auth/helpers/saveForgotPassword.js +++ b/app/controllers/auth/helpers/saveForgotPassword.js @@ -1,6 +1,11 @@ const uuid = require('uuid') const ForgotPassword = require('../../../models/forgotPassword') -const utils = require('../../../middleware/utils') +const { + getIP, + getBrowserInfo, + getCountry, + buildErrObject +} = require('../../../middleware/utils') /** * Creates a new password forgot @@ -11,13 +16,13 @@ const saveForgotPassword = (req) => { const forgot = new ForgotPassword({ email: req.body.email, verification: uuid.v4(), - ipRequest: utils.getIP(req), - browserRequest: utils.getBrowserInfo(req), - countryRequest: utils.getCountry(req) + ipRequest: getIP(req), + browserRequest: getBrowserInfo(req), + countryRequest: getCountry(req) }) forgot.save((err, item) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } resolve(item) }) diff --git a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js index 5efbebb..7d4e5f2 100644 --- a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js +++ b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js @@ -1,4 +1,4 @@ -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Saves login attempts to dabatabse @@ -8,7 +8,7 @@ const saveLoginAttemptsToDB = (user) => { return new Promise((resolve, reject) => { user.save((err, result) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } if (result) { resolve(true) diff --git a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js index 6101e3e..2f92e51 100644 --- a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js +++ b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js @@ -1,7 +1,12 @@ const UserAccess = require('../../../models/userAccess') const { setUserInfo } = require('./setUserInfo') const { generateToken } = require('./generateToken') -const utils = require('../../../middleware/utils') +const { + getIP, + getBrowserInfo, + getCountry, + buildErrObject +} = require('../../../middleware/utils') /** * Saves a new user access and then returns token @@ -12,13 +17,13 @@ const saveUserAccessAndReturnToken = (req, user) => { return new Promise((resolve, reject) => { const userAccess = new UserAccess({ email: user.email, - ip: utils.getIP(req), - browser: utils.getBrowserInfo(req), - country: utils.getCountry(req) + ip: getIP(req), + browser: getBrowserInfo(req), + country: getCountry(req) }) userAccess.save((err) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } const userInfo = setUserInfo(user) // Returns data with access token diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js index 4e56921..8fc8cad 100644 --- a/app/controllers/auth/helpers/updatePassword.js +++ b/app/controllers/auth/helpers/updatePassword.js @@ -1,4 +1,4 @@ -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Updates a user password in database @@ -9,7 +9,7 @@ const updatePassword = (password, user) => { return new Promise((resolve) => { user.password = password user.save((err, item) => { - utils.itemNotFound(err, item, 'NOT_FOUND') + itemNotFound(err, item, 'NOT_FOUND') resolve(item) }) }) diff --git a/app/controllers/auth/helpers/userIsBlocked.js b/app/controllers/auth/helpers/userIsBlocked.js index 80dcf1e..92ce076 100644 --- a/app/controllers/auth/helpers/userIsBlocked.js +++ b/app/controllers/auth/helpers/userIsBlocked.js @@ -1,4 +1,4 @@ -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Checks if blockExpires from user is greater than now @@ -7,7 +7,7 @@ const utils = require('../../../middleware/utils') const userIsBlocked = (user) => { return new Promise((resolve, reject) => { if (user.blockExpires > new Date()) { - reject(utils.buildErrObject(409, 'BLOCKED_USER')) + reject(buildErrObject(409, 'BLOCKED_USER')) } resolve(true) }) diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js index bf23804..e93876e 100644 --- a/app/controllers/auth/helpers/verificationExists.js +++ b/app/controllers/auth/helpers/verificationExists.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Checks if verification id exists for user @@ -13,7 +13,7 @@ const verificationExists = (id) => { verified: false }, (err, user) => { - utils.itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED') + itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED') resolve(user) } ) diff --git a/app/controllers/auth/helpers/verifyUser.js b/app/controllers/auth/helpers/verifyUser.js index d095b31..d35e948 100644 --- a/app/controllers/auth/helpers/verifyUser.js +++ b/app/controllers/auth/helpers/verifyUser.js @@ -1,4 +1,4 @@ -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Verifies an user @@ -9,7 +9,7 @@ const verifyUser = (user) => { user.verified = true user.save((err, item) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } resolve({ email: item.email, diff --git a/app/controllers/auth/login.js b/app/controllers/auth/login.js index 14eeb5b..1795e70 100644 --- a/app/controllers/auth/login.js +++ b/app/controllers/auth/login.js @@ -9,8 +9,8 @@ const { saveUserAccessAndReturnToken } = require('./helpers') -const utils = require('../../middleware/utils') -const auth = require('../../middleware/auth') +const { handleError } = require('../../middleware/utils') +const { checkPassword } = require('../../middleware/auth') /** * Login function called by route @@ -23,9 +23,9 @@ const login = async (req, res) => { const user = await findUser(data.email) await userIsBlocked(user) await checkLoginAttemptsAndBlockExpires(user) - const isPasswordMatch = await auth.checkPassword(data.password, user) + const isPasswordMatch = await checkPassword(data.password, user) if (!isPasswordMatch) { - utils.handleError(res, await passwordsDoNotMatch(user)) + handleError(res, await passwordsDoNotMatch(user)) } else { // all ok, register access and return token user.loginAttempts = 0 @@ -33,7 +33,7 @@ const login = async (req, res) => { res.status(200).json(await saveUserAccessAndReturnToken(req, user)) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/register.js b/app/controllers/auth/register.js index 3c6dc7e..5edc915 100644 --- a/app/controllers/auth/register.js +++ b/app/controllers/auth/register.js @@ -2,8 +2,11 @@ const { matchedData } = require('express-validator') const { registerUser, setUserInfo, returnRegisterToken } = require('./helpers') -const utils = require('../../middleware/utils') -const emailer = require('../../middleware/emailer') +const { handleError } = require('../../middleware/utils') +const { + emailExists, + sendRegistrationEmailMessage +} = require('../../middleware/emailer') /** * Register function called by route @@ -15,16 +18,16 @@ const register = async (req, res) => { // Gets locale from header 'Accept-Language' const locale = req.getLocale() req = matchedData(req) - const doesEmailExists = await emailer.emailExists(req.email) + const doesEmailExists = await emailExists(req.email) if (!doesEmailExists) { const item = await registerUser(req) const userInfo = setUserInfo(item) const response = returnRegisterToken(item, userInfo) - emailer.sendRegistrationEmailMessage(locale, item) + sendRegistrationEmailMessage(locale, item) res.status(201).json(response) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/resetPassword.js b/app/controllers/auth/resetPassword.js index d0d28e9..b1ee101 100644 --- a/app/controllers/auth/resetPassword.js +++ b/app/controllers/auth/resetPassword.js @@ -5,7 +5,7 @@ const { updatePassword, markResetPasswordAsUsed } = require('./helpers') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') /** * Reset password function called by route @@ -21,7 +21,7 @@ const resetPassword = async (req, res) => { const result = await markResetPasswordAsUsed(req, forgotPassword) res.status(200).json(result) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/roleAuthorization.js b/app/controllers/auth/roleAuthorization.js index bb3b1ac..f81cd2c 100644 --- a/app/controllers/auth/roleAuthorization.js +++ b/app/controllers/auth/roleAuthorization.js @@ -1,6 +1,6 @@ const { checkPermissions } = require('./helpers') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') /** * Roles authorization function called by route @@ -14,7 +14,7 @@ const roleAuthorization = (roles) => async (req, res, next) => { } await checkPermissions(data, next) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/auth/verify.js b/app/controllers/auth/verify.js index 3e0702a..f11439a 100644 --- a/app/controllers/auth/verify.js +++ b/app/controllers/auth/verify.js @@ -1,7 +1,7 @@ const { matchedData } = require('express-validator') const { verificationExists, verifyUser } = require('./helpers') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') /** * Verify function called by route @@ -14,7 +14,7 @@ const verify = async (req, res) => { const user = await verificationExists(req.id) res.status(200).json(await verifyUser(user)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/createItem.js b/app/controllers/cities/createItem.js index deb24cb..fe25637 100644 --- a/app/controllers/cities/createItem.js +++ b/app/controllers/cities/createItem.js @@ -1,6 +1,6 @@ const City = require('../../models/city') const db = require('../../middleware/db') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const { cityExists } = require('./helpers') @@ -17,7 +17,7 @@ const createItem = async (req, res) => { res.status(201).json(await db.createItem(req, City)) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/deleteItem.js b/app/controllers/cities/deleteItem.js index 014bfc9..a98ae88 100755 --- a/app/controllers/cities/deleteItem.js +++ b/app/controllers/cities/deleteItem.js @@ -1,6 +1,6 @@ const City = require('../../models/city') const { matchedData } = require('express-validator') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const db = require('../../middleware/db') /** @@ -11,10 +11,10 @@ const db = require('../../middleware/db') const deleteItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) + const id = await isIDGood(req.id) res.status(200).json(await db.deleteItem(id, City)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/getAllItems.js b/app/controllers/cities/getAllItems.js index f3e3374..fca37fb 100644 --- a/app/controllers/cities/getAllItems.js +++ b/app/controllers/cities/getAllItems.js @@ -1,4 +1,4 @@ -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') const { getAllItemsFromDB } = require('./helpers') /** @@ -10,7 +10,7 @@ const getAllItems = async (req, res) => { try { res.status(200).json(await getAllItemsFromDB()) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/getItem.js b/app/controllers/cities/getItem.js index bcb111c..6c0688f 100644 --- a/app/controllers/cities/getItem.js +++ b/app/controllers/cities/getItem.js @@ -1,7 +1,7 @@ const { matchedData } = require('express-validator') const City = require('../../models/city') const db = require('../../middleware/db') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') /** * Get item function called by route @@ -11,10 +11,10 @@ const utils = require('../../middleware/utils') const getItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) + const id = await isIDGood(req.id) res.status(200).json(await db.getItem(id, City)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/getItems.js b/app/controllers/cities/getItems.js index 69cbed3..bb703b3 100644 --- a/app/controllers/cities/getItems.js +++ b/app/controllers/cities/getItems.js @@ -1,6 +1,6 @@ const City = require('../../models/city') const db = require('../../middleware/db') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') /** * Get items function called by route @@ -12,7 +12,7 @@ const getItems = async (req, res) => { const query = await db.checkQueryString(req.query) res.status(200).json(await db.getItems(req, City, query)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/cities/helpers/cityExists.js b/app/controllers/cities/helpers/cityExists.js index c72e8e8..8b2fca5 100644 --- a/app/controllers/cities/helpers/cityExists.js +++ b/app/controllers/cities/helpers/cityExists.js @@ -1,5 +1,5 @@ const City = require('../../../models/city') -const utils = require('../../../middleware/utils') +const { itemAlreadyExists } = require('../../../middleware/utils') /** * Checks if a city already exists in database @@ -12,7 +12,7 @@ const cityExists = (name) => { name }, (err, item) => { - utils.itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') + itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') resolve(false) } ) diff --git a/app/controllers/cities/helpers/cityExistsExcludingItself.js b/app/controllers/cities/helpers/cityExistsExcludingItself.js index 72d17de..7249759 100644 --- a/app/controllers/cities/helpers/cityExistsExcludingItself.js +++ b/app/controllers/cities/helpers/cityExistsExcludingItself.js @@ -1,5 +1,5 @@ const City = require('../../../models/city') -const utils = require('../../../middleware/utils') +const { itemAlreadyExists } = require('../../../middleware/utils') /** * Checks if a city already exists excluding itself @@ -16,7 +16,7 @@ const cityExistsExcludingItself = (id, name) => { } }, (err, item) => { - utils.itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') + itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') resolve(false) } ) diff --git a/app/controllers/cities/helpers/getAllItemsFromDB.js b/app/controllers/cities/helpers/getAllItemsFromDB.js index ad0ecc1..7626c14 100644 --- a/app/controllers/cities/helpers/getAllItemsFromDB.js +++ b/app/controllers/cities/helpers/getAllItemsFromDB.js @@ -1,5 +1,5 @@ const City = require('../../../models/city') -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Gets all items from database @@ -16,7 +16,7 @@ const getAllItemsFromDB = () => { }, (err, items) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } resolve(items) } diff --git a/app/controllers/cities/updateItem.js b/app/controllers/cities/updateItem.js index 1cdfafb..3e9ccbb 100644 --- a/app/controllers/cities/updateItem.js +++ b/app/controllers/cities/updateItem.js @@ -1,6 +1,6 @@ const City = require('../../models/city') const db = require('../../middleware/db') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const { cityExistsExcludingItself } = require('./helpers') @@ -12,13 +12,13 @@ const { cityExistsExcludingItself } = require('./helpers') const updateItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) + const id = await isIDGood(req.id) const doesCityExists = await cityExistsExcludingItself(id, req.name) if (!doesCityExists) { res.status(200).json(await db.updateItem(id, City, req)) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/profile/changePassword.js b/app/controllers/profile/changePassword.js index 5319f29..667ddfa 100755 --- a/app/controllers/profile/changePassword.js +++ b/app/controllers/profile/changePassword.js @@ -1,4 +1,4 @@ -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const auth = require('../../middleware/auth') const { @@ -14,18 +14,18 @@ const { */ const changePassword = async (req, res) => { try { - const id = await utils.isIDGood(req.user._id) + const id = await isIDGood(req.user._id) const user = await findUser(id) req = matchedData(req) const isPasswordMatch = await auth.checkPassword(req.oldPassword, user) if (!isPasswordMatch) { - utils.handleError(res, await passwordsDoNotMatch()) + handleError(res, await passwordsDoNotMatch()) } else { // all ok, proceed to change password res.status(200).json(await changePasswordInDB(id, req)) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/profile/getProfile.js b/app/controllers/profile/getProfile.js index d768682..2856efb 100644 --- a/app/controllers/profile/getProfile.js +++ b/app/controllers/profile/getProfile.js @@ -1,5 +1,5 @@ const { getProfileFromDB } = require('./helpers') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') /** * Get profile function called by route @@ -8,10 +8,10 @@ const utils = require('../../middleware/utils') */ const getProfile = async (req, res) => { try { - const id = await utils.isIDGood(req.user._id) + const id = await isIDGood(req.user._id) res.status(200).json(await getProfileFromDB(id)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js index fca8d32..b501acc 100644 --- a/app/controllers/profile/helpers/changePasswordInDB.js +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -1,5 +1,9 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { + itemNotFound, + buildErrObject, + buildSuccObject +} = require('../../../middleware/utils') /** * Changes password in database @@ -9,7 +13,7 @@ const utils = require('../../../middleware/utils') const changePasswordInDB = (id, req) => { return new Promise((resolve, reject) => { User.findById(id, '+password', (err, user) => { - utils.itemNotFound(err, user, 'NOT_FOUND') + itemNotFound(err, user, 'NOT_FOUND') // Assigns new password to user user.password = req.newPassword @@ -17,9 +21,9 @@ const changePasswordInDB = (id, req) => { // Saves in DB user.save((error) => { if (err) { - reject(utils.buildErrObject(422, error.message)) + reject(buildErrObject(422, error.message)) } - resolve(utils.buildSuccObject('PASSWORD_CHANGED')) + resolve(buildSuccObject('PASSWORD_CHANGED')) }) }) }) diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js index d026ada..566b190 100644 --- a/app/controllers/profile/helpers/findUser.js +++ b/app/controllers/profile/helpers/findUser.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Finds user by id @@ -8,7 +8,7 @@ const utils = require('../../../middleware/utils') const findUser = (id) => { return new Promise((resolve) => { User.findById(id, 'password email', (err, user) => { - utils.itemNotFound(err, user, 'USER_DOES_NOT_EXIST') + itemNotFound(err, user, 'USER_DOES_NOT_EXIST') resolve(user) }) }) diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js index d6a9b8c..a044da9 100644 --- a/app/controllers/profile/helpers/getProfileFromDB.js +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Gets profile from database by id @@ -8,7 +8,7 @@ const utils = require('../../../middleware/utils') const getProfileFromDB = (id) => { return new Promise((resolve) => { User.findById(id, '-_id -updatedAt -createdAt', (err, user) => { - utils.itemNotFound(err, user, 'NOT_FOUND') + itemNotFound(err, user, 'NOT_FOUND') resolve(user) }) }) diff --git a/app/controllers/profile/helpers/passwordsDoNotMatch.js b/app/controllers/profile/helpers/passwordsDoNotMatch.js index 7874d34..0c752ab 100644 --- a/app/controllers/profile/helpers/passwordsDoNotMatch.js +++ b/app/controllers/profile/helpers/passwordsDoNotMatch.js @@ -1,4 +1,4 @@ -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Build passwords do not match object @@ -6,7 +6,7 @@ const utils = require('../../../middleware/utils') */ const passwordsDoNotMatch = () => { return new Promise((resolve) => { - resolve(utils.buildErrObject(409, 'WRONG_PASSWORD')) + resolve(buildErrObject(409, 'WRONG_PASSWORD')) }) } diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js index 94f4eb1..aa6205f 100644 --- a/app/controllers/profile/helpers/updateProfileInDB.js +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -1,5 +1,5 @@ const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { itemNotFound } = require('../../../middleware/utils') /** * Updates profile in database @@ -17,7 +17,7 @@ const updateProfileInDB = (req, id) => { select: '-role -_id -updatedAt -createdAt' }, (err, user) => { - utils.itemNotFound(err, user, 'NOT_FOUND') + itemNotFound(err, user, 'NOT_FOUND') resolve(user) } ) diff --git a/app/controllers/profile/updateProfile.js b/app/controllers/profile/updateProfile.js index 079b381..88ebb0d 100644 --- a/app/controllers/profile/updateProfile.js +++ b/app/controllers/profile/updateProfile.js @@ -1,4 +1,4 @@ -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const { updateProfileInDB } = require('./helpers') @@ -9,11 +9,11 @@ const { updateProfileInDB } = require('./helpers') */ const updateProfile = async (req, res) => { try { - const id = await utils.isIDGood(req.user._id) + const id = await isIDGood(req.user._id) req = matchedData(req) res.status(200).json(await updateProfileInDB(req, id)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/users/createItem.js b/app/controllers/users/createItem.js index 3b4a538..30661cc 100644 --- a/app/controllers/users/createItem.js +++ b/app/controllers/users/createItem.js @@ -1,6 +1,9 @@ const { matchedData } = require('express-validator') -const utils = require('../../middleware/utils') -const emailer = require('../../middleware/emailer') +const { handleError } = require('../../middleware/utils') +const { + emailExists, + sendRegistrationEmailMessage +} = require('../../middleware/emailer') const { createItemInDb } = require('./helpers') /** @@ -13,14 +16,14 @@ const createItem = async (req, res) => { // Gets locale from header 'Accept-Language' const locale = req.getLocale() req = matchedData(req) - const doesEmailExists = await emailer.emailExists(req.email) + const doesEmailExists = await emailExists(req.email) if (!doesEmailExists) { const item = await createItemInDb(req) - emailer.sendRegistrationEmailMessage(locale, item) + sendRegistrationEmailMessage(locale, item) res.status(201).json(item) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/users/deleteItem.js b/app/controllers/users/deleteItem.js index 5625db2..a808ccc 100755 --- a/app/controllers/users/deleteItem.js +++ b/app/controllers/users/deleteItem.js @@ -1,6 +1,6 @@ const model = require('../../models/user') const { matchedData } = require('express-validator') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const db = require('../../middleware/db') /** @@ -11,10 +11,10 @@ const db = require('../../middleware/db') const deleteItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) + const id = await isIDGood(req.id) res.status(200).json(await db.deleteItem(id, model)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/users/getItem.js b/app/controllers/users/getItem.js index babd5a5..568f39d 100644 --- a/app/controllers/users/getItem.js +++ b/app/controllers/users/getItem.js @@ -1,6 +1,6 @@ const User = require('../../models/user') const { matchedData } = require('express-validator') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const db = require('../../middleware/db') /** @@ -11,10 +11,10 @@ const db = require('../../middleware/db') const getItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) + const id = await isIDGood(req.id) res.status(200).json(await db.getItem(id, User)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/users/getItems.js b/app/controllers/users/getItems.js index 2a16763..3c810fd 100644 --- a/app/controllers/users/getItems.js +++ b/app/controllers/users/getItems.js @@ -1,5 +1,5 @@ const User = require('../../models/user') -const utils = require('../../middleware/utils') +const { handleError } = require('../../middleware/utils') const db = require('../../middleware/db') /** @@ -12,7 +12,7 @@ const getItems = async (req, res) => { const query = await db.checkQueryString(req.query) res.status(200).json(await db.getItems(req, User, query)) } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } diff --git a/app/controllers/users/helpers/createItemInDb.js b/app/controllers/users/helpers/createItemInDb.js index 009322e..7f54a89 100644 --- a/app/controllers/users/helpers/createItemInDb.js +++ b/app/controllers/users/helpers/createItemInDb.js @@ -1,6 +1,6 @@ const uuid = require('uuid') const User = require('../../../models/user') -const utils = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Creates a new item in database @@ -20,7 +20,7 @@ const createItemInDb = (req) => { }) user.save((err, item) => { if (err) { - reject(utils.buildErrObject(422, err.message)) + reject(buildErrObject(422, err.message)) } // Removes properties with rest operator const removeProperties = ({ diff --git a/app/controllers/users/updateItem.js b/app/controllers/users/updateItem.js index ca33ed9..bea8eb2 100644 --- a/app/controllers/users/updateItem.js +++ b/app/controllers/users/updateItem.js @@ -1,8 +1,8 @@ const model = require('../../models/user') const { matchedData } = require('express-validator') -const utils = require('../../middleware/utils') +const { isIDGood, handleError } = require('../../middleware/utils') const db = require('../../middleware/db') -const emailer = require('../../middleware/emailer') +const { emailExistsExcludingMyself } = require('../../middleware/emailer') /** * Update item function called by route @@ -12,16 +12,13 @@ const emailer = require('../../middleware/emailer') const updateItem = async (req, res) => { try { req = matchedData(req) - const id = await utils.isIDGood(req.id) - const doesEmailExists = await emailer.emailExistsExcludingMyself( - id, - req.email - ) + const id = await isIDGood(req.id) + const doesEmailExists = await emailExistsExcludingMyself(id, req.email) if (!doesEmailExists) { res.status(200).json(await db.updateItem(id, model, req)) } } catch (error) { - utils.handleError(res, error) + handleError(res, error) } } From 788b025b3674747571f6d5752e2c0456ada65156 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 01:02:15 -0400 Subject: [PATCH 08/23] Remove unneeded function --- app/controllers/profile/helpers/index.js | 2 -- .../profile/helpers/passwordsDoNotMatch.js | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 app/controllers/profile/helpers/passwordsDoNotMatch.js diff --git a/app/controllers/profile/helpers/index.js b/app/controllers/profile/helpers/index.js index 988db62..c2a963c 100644 --- a/app/controllers/profile/helpers/index.js +++ b/app/controllers/profile/helpers/index.js @@ -1,13 +1,11 @@ const { changePasswordInDB } = require('./changePasswordInDB') const { findUser } = require('./findUser') const { getProfileFromDB } = require('./getProfileFromDB') -const { passwordsDoNotMatch } = require('./passwordsDoNotMatch') const { updateProfileInDB } = require('./updateProfileInDB') module.exports = { changePasswordInDB, findUser, getProfileFromDB, - passwordsDoNotMatch, updateProfileInDB } diff --git a/app/controllers/profile/helpers/passwordsDoNotMatch.js b/app/controllers/profile/helpers/passwordsDoNotMatch.js deleted file mode 100644 index 0c752ab..0000000 --- a/app/controllers/profile/helpers/passwordsDoNotMatch.js +++ /dev/null @@ -1,13 +0,0 @@ -const { buildErrObject } = require('../../../middleware/utils') - -/** - * Build passwords do not match object - * @param {Object} user - user object - */ -const passwordsDoNotMatch = () => { - return new Promise((resolve) => { - resolve(buildErrObject(409, 'WRONG_PASSWORD')) - }) -} - -module.exports = { passwordsDoNotMatch } From 5efb512d8242bce08f7be1396d47fa6da17bcd57 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 01:04:17 -0400 Subject: [PATCH 09/23] Cleanup --- app/controllers/auth/helpers/blockUser.js | 4 +-- .../checkLoginAttemptsAndBlockExpires.js | 9 +++--- .../auth/helpers/passwordsDoNotMatch.js | 2 +- .../auth/helpers/returnRegisterToken.js | 18 ++++++----- .../auth/helpers/saveForgotPassword.js | 2 +- .../auth/helpers/saveLoginAttemptsToDB.js | 2 +- .../helpers/saveUserAccessAndReturnToken.js | 2 +- app/controllers/auth/helpers/setUserInfo.js | 30 ++++++++++--------- app/controllers/auth/helpers/userIsBlocked.js | 2 +- app/controllers/auth/helpers/verifyUser.js | 2 +- app/controllers/auth/register.js | 4 +-- .../cities/helpers/getAllItemsFromDB.js | 2 +- .../profile/helpers/changePasswordInDB.js | 2 +- 13 files changed, 42 insertions(+), 39 deletions(-) diff --git a/app/controllers/auth/helpers/blockUser.js b/app/controllers/auth/helpers/blockUser.js index 6a41c1c..0341015 100644 --- a/app/controllers/auth/helpers/blockUser.js +++ b/app/controllers/auth/helpers/blockUser.js @@ -12,10 +12,10 @@ const blockUser = (user) => { user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK) user.save((err, result) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } if (result) { - resolve(buildErrObject(409, 'BLOCKED_USER')) + return resolve(buildErrObject(409, 'BLOCKED_USER')) } }) }) diff --git a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js index c7410b5..2390fd9 100644 --- a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js +++ b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js @@ -12,16 +12,15 @@ const checkLoginAttemptsAndBlockExpires = (user) => { user.loginAttempts = 0 user.save((err, result) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } if (result) { - resolve(true) + return resolve(true) } }) - } else { - // User is not blocked, check password (normal behaviour) - resolve(true) } + // User is not blocked, check password (normal behaviour) + resolve(true) }) } diff --git a/app/controllers/auth/helpers/passwordsDoNotMatch.js b/app/controllers/auth/helpers/passwordsDoNotMatch.js index 1621ced..15cd20f 100644 --- a/app/controllers/auth/helpers/passwordsDoNotMatch.js +++ b/app/controllers/auth/helpers/passwordsDoNotMatch.js @@ -12,7 +12,7 @@ const passwordsDoNotMatch = async (user) => { await saveLoginAttemptsToDB(user) return new Promise((resolve, reject) => { if (user.loginAttempts <= LOGIN_ATTEMPTS) { - resolve(buildErrObject(409, 'WRONG_PASSWORD')) + return resolve(buildErrObject(409, 'WRONG_PASSWORD')) } else { resolve(blockUser(user)) } diff --git a/app/controllers/auth/helpers/returnRegisterToken.js b/app/controllers/auth/helpers/returnRegisterToken.js index 01e7829..95bf874 100644 --- a/app/controllers/auth/helpers/returnRegisterToken.js +++ b/app/controllers/auth/helpers/returnRegisterToken.js @@ -6,14 +6,16 @@ const { generateToken } = require('./generateToken') * @param {Object} userInfo - user object */ const returnRegisterToken = (item, userInfo) => { - if (process.env.NODE_ENV !== 'production') { - userInfo.verification = item.verification - } - const data = { - token: generateToken(item._id), - user: userInfo - } - return data + return new Promise((resolve) => { + if (process.env.NODE_ENV !== 'production') { + userInfo.verification = item.verification + } + const data = { + token: generateToken(item._id), + user: userInfo + } + resolve(data) + }) } module.exports = { returnRegisterToken } diff --git a/app/controllers/auth/helpers/saveForgotPassword.js b/app/controllers/auth/helpers/saveForgotPassword.js index 9759933..7cd5230 100644 --- a/app/controllers/auth/helpers/saveForgotPassword.js +++ b/app/controllers/auth/helpers/saveForgotPassword.js @@ -22,7 +22,7 @@ const saveForgotPassword = (req) => { }) forgot.save((err, item) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } resolve(item) }) diff --git a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js index 7d4e5f2..75f26e3 100644 --- a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js +++ b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js @@ -8,7 +8,7 @@ const saveLoginAttemptsToDB = (user) => { return new Promise((resolve, reject) => { user.save((err, result) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } if (result) { resolve(true) diff --git a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js index 2f92e51..85982b4 100644 --- a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js +++ b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js @@ -23,7 +23,7 @@ const saveUserAccessAndReturnToken = (req, user) => { }) userAccess.save((err) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } const userInfo = setUserInfo(user) // Returns data with access token diff --git a/app/controllers/auth/helpers/setUserInfo.js b/app/controllers/auth/helpers/setUserInfo.js index 2fd5d90..ba5c256 100644 --- a/app/controllers/auth/helpers/setUserInfo.js +++ b/app/controllers/auth/helpers/setUserInfo.js @@ -3,21 +3,23 @@ * @param {Object} req - request object */ const setUserInfo = (req) => { - let user = { - _id: req._id, - name: req.name, - email: req.email, - role: req.role, - verified: req.verified - } - // Adds verification for testing purposes - if (process.env.NODE_ENV !== 'production') { - user = { - ...user, - verification: req.verification + return new Promise((resolve) => { + let user = { + _id: req._id, + name: req.name, + email: req.email, + role: req.role, + verified: req.verified } - } - return user + // Adds verification for testing purposes + if (process.env.NODE_ENV !== 'production') { + user = { + ...user, + verification: req.verification + } + } + resolve(user) + }) } module.exports = { setUserInfo } diff --git a/app/controllers/auth/helpers/userIsBlocked.js b/app/controllers/auth/helpers/userIsBlocked.js index 92ce076..2df7bf6 100644 --- a/app/controllers/auth/helpers/userIsBlocked.js +++ b/app/controllers/auth/helpers/userIsBlocked.js @@ -7,7 +7,7 @@ const { buildErrObject } = require('../../../middleware/utils') const userIsBlocked = (user) => { return new Promise((resolve, reject) => { if (user.blockExpires > new Date()) { - reject(buildErrObject(409, 'BLOCKED_USER')) + return reject(buildErrObject(409, 'BLOCKED_USER')) } resolve(true) }) diff --git a/app/controllers/auth/helpers/verifyUser.js b/app/controllers/auth/helpers/verifyUser.js index d35e948..a042307 100644 --- a/app/controllers/auth/helpers/verifyUser.js +++ b/app/controllers/auth/helpers/verifyUser.js @@ -9,7 +9,7 @@ const verifyUser = (user) => { user.verified = true user.save((err, item) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } resolve({ email: item.email, diff --git a/app/controllers/auth/register.js b/app/controllers/auth/register.js index 5edc915..4674f18 100644 --- a/app/controllers/auth/register.js +++ b/app/controllers/auth/register.js @@ -21,8 +21,8 @@ const register = async (req, res) => { const doesEmailExists = await emailExists(req.email) if (!doesEmailExists) { const item = await registerUser(req) - const userInfo = setUserInfo(item) - const response = returnRegisterToken(item, userInfo) + const userInfo = await setUserInfo(item) + const response = await returnRegisterToken(item, userInfo) sendRegistrationEmailMessage(locale, item) res.status(201).json(response) } diff --git a/app/controllers/cities/helpers/getAllItemsFromDB.js b/app/controllers/cities/helpers/getAllItemsFromDB.js index 7626c14..0f8b029 100644 --- a/app/controllers/cities/helpers/getAllItemsFromDB.js +++ b/app/controllers/cities/helpers/getAllItemsFromDB.js @@ -16,7 +16,7 @@ const getAllItemsFromDB = () => { }, (err, items) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } resolve(items) } diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js index b501acc..e1f1f7b 100644 --- a/app/controllers/profile/helpers/changePasswordInDB.js +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -21,7 +21,7 @@ const changePasswordInDB = (id, req) => { // Saves in DB user.save((error) => { if (err) { - reject(buildErrObject(422, error.message)) + return reject(buildErrObject(422, error.message)) } resolve(buildSuccObject('PASSWORD_CHANGED')) }) From 375451e53846c7a117614f400faaaba01467e49d Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 01:35:06 -0400 Subject: [PATCH 10/23] More cleanup --- .../auth/helpers/passwordsDoNotMatch.js | 19 +++++++++------- app/controllers/cities/helpers/cityExists.js | 12 +++++++--- .../helpers/cityExistsExcludingItself.js | 13 ++++++++--- app/middleware/emailer/emailExists.js | 12 +++++++--- .../emailer/emailExistsExcludingMyself.js | 15 +++++++++---- app/middleware/utils/index.js | 2 -- app/middleware/utils/itemAlreadyExists.js | 22 ------------------- 7 files changed, 50 insertions(+), 45 deletions(-) delete mode 100644 app/middleware/utils/itemAlreadyExists.js diff --git a/app/controllers/auth/helpers/passwordsDoNotMatch.js b/app/controllers/auth/helpers/passwordsDoNotMatch.js index 15cd20f..81c71da 100644 --- a/app/controllers/auth/helpers/passwordsDoNotMatch.js +++ b/app/controllers/auth/helpers/passwordsDoNotMatch.js @@ -8,15 +8,18 @@ const LOGIN_ATTEMPTS = 5 * @param {Object} user - user object */ const passwordsDoNotMatch = async (user) => { - user.loginAttempts += 1 - await saveLoginAttemptsToDB(user) - return new Promise((resolve, reject) => { - if (user.loginAttempts <= LOGIN_ATTEMPTS) { - return resolve(buildErrObject(409, 'WRONG_PASSWORD')) - } else { - resolve(blockUser(user)) + return new Promise(async (resolve, reject) => { + try { + user.loginAttempts += 1 + await saveLoginAttemptsToDB(user) + if (user.loginAttempts <= LOGIN_ATTEMPTS) { + return reject(buildErrObject(409, 'WRONG_PASSWORD')) + } + + resolve(await blockUser(user)) + } catch (error) { + throw error } - reject(buildErrObject(422, 'ERROR')) }) } diff --git a/app/controllers/cities/helpers/cityExists.js b/app/controllers/cities/helpers/cityExists.js index 8b2fca5..51fa5a4 100644 --- a/app/controllers/cities/helpers/cityExists.js +++ b/app/controllers/cities/helpers/cityExists.js @@ -1,18 +1,24 @@ const City = require('../../../models/city') -const { itemAlreadyExists } = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Checks if a city already exists in database * @param {string} name - name of item */ const cityExists = (name) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { City.findOne( { name }, (err, item) => { - itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') + if (err) { + return reject(buildErrObject(422, err.message)) + } + + if (item) { + return reject(buildErrObject(422, 'CITY_ALREADY_EXISTS')) + } resolve(false) } ) diff --git a/app/controllers/cities/helpers/cityExistsExcludingItself.js b/app/controllers/cities/helpers/cityExistsExcludingItself.js index 7249759..d157aa7 100644 --- a/app/controllers/cities/helpers/cityExistsExcludingItself.js +++ b/app/controllers/cities/helpers/cityExistsExcludingItself.js @@ -1,5 +1,5 @@ const City = require('../../../models/city') -const { itemAlreadyExists } = require('../../../middleware/utils') +const { buildErrObject } = require('../../../middleware/utils') /** * Checks if a city already exists excluding itself @@ -7,7 +7,7 @@ const { itemAlreadyExists } = require('../../../middleware/utils') * @param {string} name - name of item */ const cityExistsExcludingItself = (id, name) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { City.findOne( { name, @@ -16,7 +16,14 @@ const cityExistsExcludingItself = (id, name) => { } }, (err, item) => { - itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS') + if (err) { + return reject(buildErrObject(422, err.message)) + } + + if (item) { + return reject(buildErrObject(422, 'CITY_ALREADY_EXISTS')) + } + resolve(false) } ) diff --git a/app/middleware/emailer/emailExists.js b/app/middleware/emailer/emailExists.js index 1881fb4..c8d7263 100644 --- a/app/middleware/emailer/emailExists.js +++ b/app/middleware/emailer/emailExists.js @@ -1,18 +1,24 @@ const User = require('../../models/user') -const { itemAlreadyExists } = require('../../middleware/utils') +const { buildErrObject } = require('../../middleware/utils') /** * Checks User model if user with an specific email exists * @param {string} email - user email */ const emailExists = (email) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findOne( { email }, (err, item) => { - itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS') + if (err) { + return reject(buildErrObject(422, err.message)) + } + + if (item) { + return reject(buildErrObject(422, 'EMAIL_ALREADY_EXISTS')) + } resolve(false) } ) diff --git a/app/middleware/emailer/emailExistsExcludingMyself.js b/app/middleware/emailer/emailExistsExcludingMyself.js index 94bde20..c0af124 100644 --- a/app/middleware/emailer/emailExistsExcludingMyself.js +++ b/app/middleware/emailer/emailExistsExcludingMyself.js @@ -1,5 +1,5 @@ const User = require('../../models/user') -const { itemAlreadyExists } = require('../../middleware/utils') +const { buildErrObject } = require('../../middleware/utils') /** * Checks User model if user with an specific email exists but excluding user id @@ -7,7 +7,7 @@ const { itemAlreadyExists } = require('../../middleware/utils') * @param {string} email - user email */ const emailExistsExcludingMyself = (id, email) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findOne( { email, @@ -15,8 +15,15 @@ const emailExistsExcludingMyself = (id, email) => { $ne: id } }, - (err, item) => { - itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS') + async (err, item) => { + if (err) { + return reject(buildErrObject(422, err.message)) + } + + if (item) { + return reject(buildErrObject(422, 'EMAIL_ALREADY_EXISTS')) + } + resolve(false) } ) diff --git a/app/middleware/utils/index.js b/app/middleware/utils/index.js index adb46c9..0b01184 100644 --- a/app/middleware/utils/index.js +++ b/app/middleware/utils/index.js @@ -5,7 +5,6 @@ const { getCountry } = require('./getCountry') const { getIP } = require('./getIP') const { handleError } = require('./handleError') const { isIDGood } = require('./isIDGood') -const { itemAlreadyExists } = require('./itemAlreadyExists') const { itemNotFound } = require('./itemNotFound') const { removeExtensionFromFile } = require('./removeExtensionFromFile') const { validateResult } = require('./validateResult') @@ -18,7 +17,6 @@ module.exports = { getIP, handleError, isIDGood, - itemAlreadyExists, itemNotFound, removeExtensionFromFile, validateResult diff --git a/app/middleware/utils/itemAlreadyExists.js b/app/middleware/utils/itemAlreadyExists.js deleted file mode 100644 index a7246ea..0000000 --- a/app/middleware/utils/itemAlreadyExists.js +++ /dev/null @@ -1,22 +0,0 @@ -const { buildErrObject } = require('./buildErrObject') - -/** - * Item already exists - * @param {Object} err - error object - * @param {Object} item - item result object - * @param {Object} reject - reject object - * @param {string} message - message - */ -const itemAlreadyExists = (err, item, message) => { - return new Promise((resolve, reject) => { - if (err) { - reject(buildErrObject(422, err.message)) - } - if (item) { - reject(buildErrObject(422, message)) - } - resolve() - }) -} - -module.exports = { itemAlreadyExists } From b5dbd7d4e72a5da896d176aada8a990cabe2fd47 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 01:59:52 -0400 Subject: [PATCH 11/23] Cleanup and renaming --- .../cities/{createItem.js => createCity.js} | 8 ++-- .../cities/{deleteItem.js => deleteCity.js} | 8 ++-- .../{getAllItems.js => getAllCities.js} | 4 +- .../cities/{getItems.js => getCities.js} | 10 ++--- .../cities/{getItem.js => getCity.js} | 8 ++-- app/controllers/cities/index.js | 24 +++++------ .../cities/{updateItem.js => updateCity.js} | 8 ++-- app/controllers/cities/validators/index.js | 16 ++++---- ...ateCreateItem.js => validateCreateCity.js} | 4 +- ...ateDeleteItem.js => validateDeleteCity.js} | 4 +- ...{validateGetItem.js => validateGetCity.js} | 4 +- ...ateUpdateItem.js => validateUpdateCity.js} | 4 +- app/middleware/db/getItems.js | 11 +++-- app/middleware/db/listInitOptions.js | 32 +++++++++------ app/middleware/utils/validateResult.js | 3 +- app/routes/cities.js | 40 +++++++++---------- 16 files changed, 97 insertions(+), 91 deletions(-) rename app/controllers/cities/{createItem.js => createCity.js} (73%) rename app/controllers/cities/{deleteItem.js => deleteCity.js} (70%) rename app/controllers/cities/{getAllItems.js => getAllCities.js} (82%) rename app/controllers/cities/{getItems.js => getCities.js} (53%) rename app/controllers/cities/{getItem.js => getCity.js} (71%) rename app/controllers/cities/{updateItem.js => updateCity.js} (75%) rename app/controllers/cities/validators/{validateCreateItem.js => validateCreateCity.js} (83%) rename app/controllers/cities/validators/{validateDeleteItem.js => validateDeleteCity.js} (82%) rename app/controllers/cities/validators/{validateGetItem.js => validateGetCity.js} (83%) rename app/controllers/cities/validators/{validateUpdateItem.js => validateUpdateCity.js} (86%) diff --git a/app/controllers/cities/createItem.js b/app/controllers/cities/createCity.js similarity index 73% rename from app/controllers/cities/createItem.js rename to app/controllers/cities/createCity.js index fe25637..200dfa8 100644 --- a/app/controllers/cities/createItem.js +++ b/app/controllers/cities/createCity.js @@ -1,5 +1,5 @@ const City = require('../../models/city') -const db = require('../../middleware/db') +const { createItem } = require('../../middleware/db') const { handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const { cityExists } = require('./helpers') @@ -9,16 +9,16 @@ const { cityExists } = require('./helpers') * @param {Object} req - request object * @param {Object} res - response object */ -const createItem = async (req, res) => { +const createCity = async (req, res) => { try { req = matchedData(req) const doesCityExists = await cityExists(req.name) if (!doesCityExists) { - res.status(201).json(await db.createItem(req, City)) + res.status(201).json(await createItem(req, City)) } } catch (error) { handleError(res, error) } } -module.exports = { createItem } +module.exports = { createCity } diff --git a/app/controllers/cities/deleteItem.js b/app/controllers/cities/deleteCity.js similarity index 70% rename from app/controllers/cities/deleteItem.js rename to app/controllers/cities/deleteCity.js index a98ae88..76b278f 100755 --- a/app/controllers/cities/deleteItem.js +++ b/app/controllers/cities/deleteCity.js @@ -1,21 +1,21 @@ const City = require('../../models/city') const { matchedData } = require('express-validator') const { isIDGood, handleError } = require('../../middleware/utils') -const db = require('../../middleware/db') +const { deleteItem } = require('../../middleware/db') /** * Delete item function called by route * @param {Object} req - request object * @param {Object} res - response object */ -const deleteItem = async (req, res) => { +const deleteCity = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) - res.status(200).json(await db.deleteItem(id, City)) + res.status(200).json(await deleteItem(id, City)) } catch (error) { handleError(res, error) } } -module.exports = { deleteItem } +module.exports = { deleteCity } diff --git a/app/controllers/cities/getAllItems.js b/app/controllers/cities/getAllCities.js similarity index 82% rename from app/controllers/cities/getAllItems.js rename to app/controllers/cities/getAllCities.js index fca37fb..8796b15 100644 --- a/app/controllers/cities/getAllItems.js +++ b/app/controllers/cities/getAllCities.js @@ -6,7 +6,7 @@ const { getAllItemsFromDB } = require('./helpers') * @param {Object} req - request object * @param {Object} res - response object */ -const getAllItems = async (req, res) => { +const getAllCities = async (req, res) => { try { res.status(200).json(await getAllItemsFromDB()) } catch (error) { @@ -14,4 +14,4 @@ const getAllItems = async (req, res) => { } } -module.exports = { getAllItems } +module.exports = { getAllCities } diff --git a/app/controllers/cities/getItems.js b/app/controllers/cities/getCities.js similarity index 53% rename from app/controllers/cities/getItems.js rename to app/controllers/cities/getCities.js index bb703b3..7ad4067 100644 --- a/app/controllers/cities/getItems.js +++ b/app/controllers/cities/getCities.js @@ -1,5 +1,5 @@ const City = require('../../models/city') -const db = require('../../middleware/db') +const { checkQueryString, getItems } = require('../../middleware/db') const { handleError } = require('../../middleware/utils') /** @@ -7,13 +7,13 @@ const { handleError } = require('../../middleware/utils') * @param {Object} req - request object * @param {Object} res - response object */ -const getItems = async (req, res) => { +const getCities = async (req, res) => { try { - const query = await db.checkQueryString(req.query) - res.status(200).json(await db.getItems(req, City, query)) + const query = await checkQueryString(req.query) + res.status(200).json(await getItems(req, City, query)) } catch (error) { handleError(res, error) } } -module.exports = { getItems } +module.exports = { getCities } diff --git a/app/controllers/cities/getItem.js b/app/controllers/cities/getCity.js similarity index 71% rename from app/controllers/cities/getItem.js rename to app/controllers/cities/getCity.js index 6c0688f..843ed1b 100644 --- a/app/controllers/cities/getItem.js +++ b/app/controllers/cities/getCity.js @@ -1,6 +1,6 @@ const { matchedData } = require('express-validator') const City = require('../../models/city') -const db = require('../../middleware/db') +const { getItem } = require('../../middleware/db') const { isIDGood, handleError } = require('../../middleware/utils') /** @@ -8,14 +8,14 @@ const { isIDGood, handleError } = require('../../middleware/utils') * @param {Object} req - request object * @param {Object} res - response object */ -const getItem = async (req, res) => { +const getCity = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) - res.status(200).json(await db.getItem(id, City)) + res.status(200).json(await getItem(id, City)) } catch (error) { handleError(res, error) } } -module.exports = { getItem } +module.exports = { getCity } diff --git a/app/controllers/cities/index.js b/app/controllers/cities/index.js index 80f3f96..635ac42 100644 --- a/app/controllers/cities/index.js +++ b/app/controllers/cities/index.js @@ -1,15 +1,15 @@ -const { createItem } = require('./createItem') -const { deleteItem } = require('./deleteItem') -const { getAllItems } = require('./getAllItems') -const { getItem } = require('./getItem') -const { getItems } = require('./getItems') -const { updateItem } = require('./updateItem') +const { createCity } = require('./createCity') +const { deleteCity } = require('./deleteCity') +const { getAllCities } = require('./getAllCities') +const { getCity } = require('./getCity') +const { getCities } = require('./getCities') +const { updateCity } = require('./updateCity') module.exports = { - createItem, - deleteItem, - getAllItems, - getItem, - getItems, - updateItem + createCity, + deleteCity, + getAllCities, + getCity, + getCities, + updateCity } diff --git a/app/controllers/cities/updateItem.js b/app/controllers/cities/updateCity.js similarity index 75% rename from app/controllers/cities/updateItem.js rename to app/controllers/cities/updateCity.js index 3e9ccbb..bc819a5 100644 --- a/app/controllers/cities/updateItem.js +++ b/app/controllers/cities/updateCity.js @@ -1,5 +1,5 @@ const City = require('../../models/city') -const db = require('../../middleware/db') +const { updateItem } = require('../../middleware/db') const { isIDGood, handleError } = require('../../middleware/utils') const { matchedData } = require('express-validator') const { cityExistsExcludingItself } = require('./helpers') @@ -9,17 +9,17 @@ const { cityExistsExcludingItself } = require('./helpers') * @param {Object} req - request object * @param {Object} res - response object */ -const updateItem = async (req, res) => { +const updateCity = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) const doesCityExists = await cityExistsExcludingItself(id, req.name) if (!doesCityExists) { - res.status(200).json(await db.updateItem(id, City, req)) + res.status(200).json(await updateItem(id, City, req)) } } catch (error) { handleError(res, error) } } -module.exports = { updateItem } +module.exports = { updateCity } diff --git a/app/controllers/cities/validators/index.js b/app/controllers/cities/validators/index.js index 1578618..0b63739 100644 --- a/app/controllers/cities/validators/index.js +++ b/app/controllers/cities/validators/index.js @@ -1,11 +1,11 @@ -const { validateCreateItem } = require('./validateCreateItem') -const { validateDeleteItem } = require('./validateDeleteItem') -const { validateGetItem } = require('./validateGetItem') -const { validateUpdateItem } = require('./validateUpdateItem') +const { validateCreateCity } = require('./validateCreateCity') +const { validateDeleteCity } = require('./validateDeleteCity') +const { validateGetCity } = require('./validateGetCity') +const { validateUpdateCity } = require('./validateUpdateCity') module.exports = { - validateCreateItem, - validateDeleteItem, - validateGetItem, - validateUpdateItem + validateCreateCity, + validateDeleteCity, + validateGetCity, + validateUpdateCity } diff --git a/app/controllers/cities/validators/validateCreateItem.js b/app/controllers/cities/validators/validateCreateCity.js similarity index 83% rename from app/controllers/cities/validators/validateCreateItem.js rename to app/controllers/cities/validators/validateCreateCity.js index 896114a..ce3dcbf 100644 --- a/app/controllers/cities/validators/validateCreateItem.js +++ b/app/controllers/cities/validators/validateCreateCity.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates create new item request */ -const validateCreateItem = [ +const validateCreateCity = [ check('name') .exists() .withMessage('MISSING') @@ -17,4 +17,4 @@ const validateCreateItem = [ } ] -module.exports = { validateCreateItem } +module.exports = { validateCreateCity } diff --git a/app/controllers/cities/validators/validateDeleteItem.js b/app/controllers/cities/validators/validateDeleteCity.js similarity index 82% rename from app/controllers/cities/validators/validateDeleteItem.js rename to app/controllers/cities/validators/validateDeleteCity.js index 4d996f8..3d2c8a7 100644 --- a/app/controllers/cities/validators/validateDeleteItem.js +++ b/app/controllers/cities/validators/validateDeleteCity.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates delete item request */ -const validateDeleteItem = [ +const validateDeleteCity = [ check('id') .exists() .withMessage('MISSING') @@ -16,4 +16,4 @@ const validateDeleteItem = [ } ] -module.exports = { validateDeleteItem } +module.exports = { validateDeleteCity } diff --git a/app/controllers/cities/validators/validateGetItem.js b/app/controllers/cities/validators/validateGetCity.js similarity index 83% rename from app/controllers/cities/validators/validateGetItem.js rename to app/controllers/cities/validators/validateGetCity.js index 1028ffd..b9f64f6 100644 --- a/app/controllers/cities/validators/validateGetItem.js +++ b/app/controllers/cities/validators/validateGetCity.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates get item request */ -const validateGetItem = [ +const validateGetCity = [ check('id') .exists() .withMessage('MISSING') @@ -16,4 +16,4 @@ const validateGetItem = [ } ] -module.exports = { validateGetItem } +module.exports = { validateGetCity } diff --git a/app/controllers/cities/validators/validateUpdateItem.js b/app/controllers/cities/validators/validateUpdateCity.js similarity index 86% rename from app/controllers/cities/validators/validateUpdateItem.js rename to app/controllers/cities/validators/validateUpdateCity.js index 04a40bf..d3eb65a 100644 --- a/app/controllers/cities/validators/validateUpdateItem.js +++ b/app/controllers/cities/validators/validateUpdateCity.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates update item request */ -const validateUpdateItem = [ +const validateUpdateCity = [ check('name') .exists() .withMessage('MISSING') @@ -22,4 +22,4 @@ const validateUpdateItem = [ } ] -module.exports = { validateUpdateItem } +module.exports = { validateUpdateCity } diff --git a/app/middleware/db/getItems.js b/app/middleware/db/getItems.js index c14edcc..1ba9ca0 100644 --- a/app/middleware/db/getItems.js +++ b/app/middleware/db/getItems.js @@ -1,8 +1,7 @@ -const { - listInitOptions, - buildErrObject, - cleanPaginationID -} = require('../../middleware/utils') +const { buildErrObject } = require('../../middleware/utils') + +const { listInitOptions } = require('./listInitOptions') +const { cleanPaginationID } = require('./cleanPaginationID') /** * Gets items from database @@ -14,7 +13,7 @@ const getItems = async (req, model, query) => { return new Promise((resolve, reject) => { model.paginate(query, options, (err, items) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } resolve(cleanPaginationID(items)) }) diff --git a/app/middleware/db/listInitOptions.js b/app/middleware/db/listInitOptions.js index 4ef77c2..5e2da3c 100644 --- a/app/middleware/db/listInitOptions.js +++ b/app/middleware/db/listInitOptions.js @@ -1,23 +1,29 @@ +const { buildErrObject } = require('../../middleware/utils') const { buildSort } = require('./buildSort') /** * Builds initial options for query * @param {Object} query - query object */ -const listInitOptions = async (req) => { - return new Promise((resolve) => { - const order = req.query.order || -1 - const sort = req.query.sort || 'createdAt' - const sortBy = buildSort(sort, order) - const page = parseInt(req.query.page, 10) || 1 - const limit = parseInt(req.query.limit, 10) || 5 - const options = { - sort: sortBy, - lean: true, - page, - limit +const listInitOptions = (req) => { + return new Promise(async (resolve, reject) => { + try { + const order = req.query.order || -1 + const sort = req.query.sort || 'createdAt' + const sortBy = buildSort(sort, order) + const page = parseInt(req.query.page, 10) || 1 + const limit = parseInt(req.query.limit, 10) || 5 + const options = { + sort: sortBy, + lean: true, + page, + limit + } + resolve(options) + } catch (error) { + console.log(error.message) + reject(buildErrObject(422, 'ERROR_WITH_INIT_OPTIONS')) } - resolve(options) }) } diff --git a/app/middleware/utils/validateResult.js b/app/middleware/utils/validateResult.js index f53c519..f2efc59 100644 --- a/app/middleware/utils/validateResult.js +++ b/app/middleware/utils/validateResult.js @@ -1,5 +1,6 @@ const { validationResult } = require('express-validator') -const { handleError, buildErrObject } = require('../../middleware/utils') +const { handleError } = require('./handleError') +const { buildErrObject } = require('./buildErrObject') /** * Builds error for validation files diff --git a/app/routes/cities.js b/app/routes/cities.js index 8436be2..22843ef 100755 --- a/app/routes/cities.js +++ b/app/routes/cities.js @@ -10,19 +10,19 @@ const trimRequest = require('trim-request') const { roleAuthorization } = require('../controllers/auth') const { - getAllItems, - getItems, - createItem, - getItem, - updateItem, - deleteItem + getAllCities, + getCities, + createCity, + getCity, + updateCity, + deleteCity } = require('../controllers/cities') const { - validateCreateItem, - validateGetItem, - validateUpdateItem, - validateDeleteItem + validateCreateCity, + validateGetCity, + validateUpdateCity, + validateDeleteCity } = require('../controllers/cities/validators') /* @@ -32,7 +32,7 @@ const { /* * Get all items route */ -router.get('/all', getAllItems) +router.get('/all', getAllCities) /* * Get items route @@ -42,7 +42,7 @@ router.get( requireAuth, roleAuthorization(['admin']), trimRequest.all, - getItems + getCities ) /* @@ -53,8 +53,8 @@ router.post( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateCreateItem, - createItem + validateCreateCity, + createCity ) /* @@ -65,8 +65,8 @@ router.get( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateGetItem, - getItem + validateGetCity, + getCity ) /* @@ -77,8 +77,8 @@ router.patch( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateUpdateItem, - updateItem + validateUpdateCity, + updateCity ) /* @@ -89,8 +89,8 @@ router.delete( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateDeleteItem, - deleteItem + validateDeleteCity, + deleteCity ) module.exports = router From d35f25f2cef43ab65e419f87314080adef48d2dd Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 02:05:58 -0400 Subject: [PATCH 12/23] User controller renaming --- .../users/{createItem.js => createUser.js} | 4 +-- .../users/{deleteItem.js => deleteUser.js} | 8 ++--- .../users/{getItem.js => getUser.js} | 8 ++--- .../users/{getItems.js => getUsers.js} | 10 +++--- app/controllers/users/index.js | 20 +++++------ .../users/{updateItem.js => updateUser.js} | 10 +++--- app/controllers/users/validators/index.js | 16 ++++----- ...ateCreateItem.js => validateCreateUser.js} | 4 +-- ...ateDeleteItem.js => validateDeleteUser.js} | 4 +-- ...{validateGetItem.js => validateGetUser.js} | 4 +-- ...ateUpdateItem.js => validateUpdateUser.js} | 4 +-- app/routes/users.js | 36 +++++++++---------- 12 files changed, 64 insertions(+), 64 deletions(-) rename app/controllers/users/{createItem.js => createUser.js} (91%) rename app/controllers/users/{deleteItem.js => deleteUser.js} (69%) rename app/controllers/users/{getItem.js => getUser.js} (71%) rename app/controllers/users/{getItems.js => getUsers.js} (53%) rename app/controllers/users/{updateItem.js => updateUser.js} (71%) rename app/controllers/users/validators/{validateCreateItem.js => validateCreateUser.js} (95%) rename app/controllers/users/validators/{validateDeleteItem.js => validateDeleteUser.js} (82%) rename app/controllers/users/validators/{validateGetItem.js => validateGetUser.js} (83%) rename app/controllers/users/validators/{validateUpdateItem.js => validateUpdateUser.js} (95%) diff --git a/app/controllers/users/createItem.js b/app/controllers/users/createUser.js similarity index 91% rename from app/controllers/users/createItem.js rename to app/controllers/users/createUser.js index 30661cc..0f6c554 100644 --- a/app/controllers/users/createItem.js +++ b/app/controllers/users/createUser.js @@ -11,7 +11,7 @@ const { createItemInDb } = require('./helpers') * @param {Object} req - request object * @param {Object} res - response object */ -const createItem = async (req, res) => { +const createUser = async (req, res) => { try { // Gets locale from header 'Accept-Language' const locale = req.getLocale() @@ -27,4 +27,4 @@ const createItem = async (req, res) => { } } -module.exports = { createItem } +module.exports = { createUser } diff --git a/app/controllers/users/deleteItem.js b/app/controllers/users/deleteUser.js similarity index 69% rename from app/controllers/users/deleteItem.js rename to app/controllers/users/deleteUser.js index a808ccc..4c070c4 100755 --- a/app/controllers/users/deleteItem.js +++ b/app/controllers/users/deleteUser.js @@ -1,21 +1,21 @@ const model = require('../../models/user') const { matchedData } = require('express-validator') const { isIDGood, handleError } = require('../../middleware/utils') -const db = require('../../middleware/db') +const { deleteItem } = require('../../middleware/db') /** * Delete item function called by route * @param {Object} req - request object * @param {Object} res - response object */ -const deleteItem = async (req, res) => { +const deleteUser = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) - res.status(200).json(await db.deleteItem(id, model)) + res.status(200).json(await deleteItem(id, model)) } catch (error) { handleError(res, error) } } -module.exports = { deleteItem } +module.exports = { deleteUser } diff --git a/app/controllers/users/getItem.js b/app/controllers/users/getUser.js similarity index 71% rename from app/controllers/users/getItem.js rename to app/controllers/users/getUser.js index 568f39d..3726775 100644 --- a/app/controllers/users/getItem.js +++ b/app/controllers/users/getUser.js @@ -1,21 +1,21 @@ const User = require('../../models/user') const { matchedData } = require('express-validator') const { isIDGood, handleError } = require('../../middleware/utils') -const db = require('../../middleware/db') +const { getItem } = require('../../middleware/db') /** * Get item function called by route * @param {Object} req - request object * @param {Object} res - response object */ -const getItem = async (req, res) => { +const getUser = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) - res.status(200).json(await db.getItem(id, User)) + res.status(200).json(await getItem(id, User)) } catch (error) { handleError(res, error) } } -module.exports = { getItem } +module.exports = { getUser } diff --git a/app/controllers/users/getItems.js b/app/controllers/users/getUsers.js similarity index 53% rename from app/controllers/users/getItems.js rename to app/controllers/users/getUsers.js index 3c810fd..0f441d6 100644 --- a/app/controllers/users/getItems.js +++ b/app/controllers/users/getUsers.js @@ -1,19 +1,19 @@ const User = require('../../models/user') const { handleError } = require('../../middleware/utils') -const db = require('../../middleware/db') +const { getItems, checkQueryString } = require('../../middleware/db') /** * Get items function called by route * @param {Object} req - request object * @param {Object} res - response object */ -const getItems = async (req, res) => { +const getUsers = async (req, res) => { try { - const query = await db.checkQueryString(req.query) - res.status(200).json(await db.getItems(req, User, query)) + const query = await checkQueryString(req.query) + res.status(200).json(await getItems(req, User, query)) } catch (error) { handleError(res, error) } } -module.exports = { getItems } +module.exports = { getUsers } diff --git a/app/controllers/users/index.js b/app/controllers/users/index.js index 6b963eb..0dd75af 100644 --- a/app/controllers/users/index.js +++ b/app/controllers/users/index.js @@ -1,13 +1,13 @@ -const { createItem } = require('./createItem') -const { deleteItem } = require('./deleteItem') -const { getItem } = require('./getItem') -const { getItems } = require('./getItems') -const { updateItem } = require('./updateItem') +const { createUser } = require('./createUser') +const { deleteUser } = require('./deleteUser') +const { getUser } = require('./getUser') +const { getUsers } = require('./getUsers') +const { updateUser } = require('./updateUser') module.exports = { - createItem, - deleteItem, - getItem, - getItems, - updateItem + createUser, + deleteUser, + getUser, + getUsers, + updateUser } diff --git a/app/controllers/users/updateItem.js b/app/controllers/users/updateUser.js similarity index 71% rename from app/controllers/users/updateItem.js rename to app/controllers/users/updateUser.js index bea8eb2..f24765a 100644 --- a/app/controllers/users/updateItem.js +++ b/app/controllers/users/updateUser.js @@ -1,7 +1,7 @@ -const model = require('../../models/user') +const User = require('../../models/user') const { matchedData } = require('express-validator') const { isIDGood, handleError } = require('../../middleware/utils') -const db = require('../../middleware/db') +const { updateItem } = require('../../middleware/db') const { emailExistsExcludingMyself } = require('../../middleware/emailer') /** @@ -9,17 +9,17 @@ const { emailExistsExcludingMyself } = require('../../middleware/emailer') * @param {Object} req - request object * @param {Object} res - response object */ -const updateItem = async (req, res) => { +const updateUser = async (req, res) => { try { req = matchedData(req) const id = await isIDGood(req.id) const doesEmailExists = await emailExistsExcludingMyself(id, req.email) if (!doesEmailExists) { - res.status(200).json(await db.updateItem(id, model, req)) + res.status(200).json(await updateItem(id, User, req)) } } catch (error) { handleError(res, error) } } -module.exports = { updateItem } +module.exports = { updateUser } diff --git a/app/controllers/users/validators/index.js b/app/controllers/users/validators/index.js index 1578618..42c6a9b 100644 --- a/app/controllers/users/validators/index.js +++ b/app/controllers/users/validators/index.js @@ -1,11 +1,11 @@ -const { validateCreateItem } = require('./validateCreateItem') -const { validateDeleteItem } = require('./validateDeleteItem') -const { validateGetItem } = require('./validateGetItem') -const { validateUpdateItem } = require('./validateUpdateItem') +const { validateCreateUser } = require('./validateCreateUser') +const { validateDeleteUser } = require('./validateDeleteUser') +const { validateGetUser } = require('./validateGetUser') +const { validateUpdateUser } = require('./validateUpdateUser') module.exports = { - validateCreateItem, - validateDeleteItem, - validateGetItem, - validateUpdateItem + validateCreateUser, + validateDeleteUser, + validateGetUser, + validateUpdateUser } diff --git a/app/controllers/users/validators/validateCreateItem.js b/app/controllers/users/validators/validateCreateUser.js similarity index 95% rename from app/controllers/users/validators/validateCreateItem.js rename to app/controllers/users/validators/validateCreateUser.js index 671665f..92b0860 100644 --- a/app/controllers/users/validators/validateCreateItem.js +++ b/app/controllers/users/validators/validateCreateUser.js @@ -5,7 +5,7 @@ const { check } = require('express-validator') /** * Validates create new item request */ -const validateCreateItem = [ +const validateCreateUser = [ check('name') .exists() .withMessage('MISSING') @@ -72,4 +72,4 @@ const validateCreateItem = [ } ] -module.exports = { validateCreateItem } +module.exports = { validateCreateUser } diff --git a/app/controllers/users/validators/validateDeleteItem.js b/app/controllers/users/validators/validateDeleteUser.js similarity index 82% rename from app/controllers/users/validators/validateDeleteItem.js rename to app/controllers/users/validators/validateDeleteUser.js index 4d996f8..14c28b5 100644 --- a/app/controllers/users/validators/validateDeleteItem.js +++ b/app/controllers/users/validators/validateDeleteUser.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates delete item request */ -const validateDeleteItem = [ +const validateDeleteUser = [ check('id') .exists() .withMessage('MISSING') @@ -16,4 +16,4 @@ const validateDeleteItem = [ } ] -module.exports = { validateDeleteItem } +module.exports = { validateDeleteUser } diff --git a/app/controllers/users/validators/validateGetItem.js b/app/controllers/users/validators/validateGetUser.js similarity index 83% rename from app/controllers/users/validators/validateGetItem.js rename to app/controllers/users/validators/validateGetUser.js index 1028ffd..0c23d40 100644 --- a/app/controllers/users/validators/validateGetItem.js +++ b/app/controllers/users/validators/validateGetUser.js @@ -4,7 +4,7 @@ const { check } = require('express-validator') /** * Validates get item request */ -const validateGetItem = [ +const validateGetUser = [ check('id') .exists() .withMessage('MISSING') @@ -16,4 +16,4 @@ const validateGetItem = [ } ] -module.exports = { validateGetItem } +module.exports = { validateGetUser } diff --git a/app/controllers/users/validators/validateUpdateItem.js b/app/controllers/users/validators/validateUpdateUser.js similarity index 95% rename from app/controllers/users/validators/validateUpdateItem.js rename to app/controllers/users/validators/validateUpdateUser.js index 812094c..3445b5f 100644 --- a/app/controllers/users/validators/validateUpdateItem.js +++ b/app/controllers/users/validators/validateUpdateUser.js @@ -5,7 +5,7 @@ const { check } = require('express-validator') /** * Validates update item request */ -const validateUpdateItem = [ +const validateUpdateUser = [ check('name') .exists() .withMessage('MISSING') @@ -64,4 +64,4 @@ const validateUpdateItem = [ } ] -module.exports = { validateUpdateItem } +module.exports = { validateUpdateUser } diff --git a/app/routes/users.js b/app/routes/users.js index 1e12fca..5f03633 100755 --- a/app/routes/users.js +++ b/app/routes/users.js @@ -10,18 +10,18 @@ const trimRequest = require('trim-request') const { roleAuthorization } = require('../controllers/auth') const { - getItems, - createItem, - getItem, - updateItem, - deleteItem + getUsers, + createUser, + getUser, + updateUser, + deleteUser } = require('../controllers/users') const { - validateCreateItem, - validateGetItem, - validateUpdateItem, - validateDeleteItem + validateCreateUser, + validateGetUser, + validateUpdateUser, + validateDeleteUser } = require('../controllers/users/validators') /* @@ -36,7 +36,7 @@ router.get( requireAuth, roleAuthorization(['admin']), trimRequest.all, - getItems + getUsers ) /* @@ -47,8 +47,8 @@ router.post( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateCreateItem, - createItem + validateCreateUser, + createUser ) /* @@ -59,8 +59,8 @@ router.get( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateGetItem, - getItem + validateGetUser, + getUser ) /* @@ -71,8 +71,8 @@ router.patch( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateUpdateItem, - updateItem + validateUpdateUser, + updateUser ) /* @@ -83,8 +83,8 @@ router.delete( requireAuth, roleAuthorization(['admin']), trimRequest.all, - validateDeleteItem, - deleteItem + validateDeleteUser, + deleteUser ) module.exports = router From 37ae84d95432ad307069a37144259cfabccddd13 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 14:45:13 -0400 Subject: [PATCH 13/23] VS code settings for debug in nodemon and jest --- .vscode/launch.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..9b32bfd --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,42 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Launch nodemon in debug", + "type": "node", + "request": "launch", + "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/nodemon", + "program": "${workspaceFolder}/server.js", + "restart": true, + "protocol": "inspector", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "port": 9230 + }, + { + "name": "Launch mocha test in debug", + "request": "launch", + "runtimeArgs": ["run", "mocha", "${relativeFile}"], + "runtimeExecutable": "npm", + "skipFiles": ["/**"], + "type": "node", + "env": { + "PORT": "3111" + } + }, + { + "name": "Launch jest in debug", + "type": "node", + "request": "launch", + "cwd": "${workspaceFolder}", + "runtimeArgs": [ + "--inspect-brk", + "node_modules/.bin/jest", + "--runInBand", + "--config=jest.config.js", + "${file}" + ], + "port": 9231 + } + ] +} From 69c69fc41e2ecf92e4c0bfcaa162bab69538aaaf Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 14:46:19 -0400 Subject: [PATCH 14/23] Fix check password --- app/controllers/profile/changePassword.js | 18 +++++++++--------- app/middleware/auth/checkPassword.js | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/profile/changePassword.js b/app/controllers/profile/changePassword.js index 667ddfa..0288146 100755 --- a/app/controllers/profile/changePassword.js +++ b/app/controllers/profile/changePassword.js @@ -1,11 +1,11 @@ -const { isIDGood, handleError } = require('../../middleware/utils') -const { matchedData } = require('express-validator') -const auth = require('../../middleware/auth') const { - findUser, - passwordsDoNotMatch, - changePasswordInDB -} = require('./helpers') + isIDGood, + handleError, + buildErrObject +} = require('../../middleware/utils') +const { matchedData } = require('express-validator') +const { checkPassword } = require('../../middleware/auth') +const { findUser, changePasswordInDB } = require('./helpers') /** * Change password function called by route @@ -17,9 +17,9 @@ const changePassword = async (req, res) => { const id = await isIDGood(req.user._id) const user = await findUser(id) req = matchedData(req) - const isPasswordMatch = await auth.checkPassword(req.oldPassword, user) + const isPasswordMatch = await checkPassword(req.oldPassword, user) if (!isPasswordMatch) { - handleError(res, await passwordsDoNotMatch()) + return handleError(res, buildErrObject(409, 'WRONG_PASSWORD')) } else { // all ok, proceed to change password res.status(200).json(await changePasswordInDB(id, req)) diff --git a/app/middleware/auth/checkPassword.js b/app/middleware/auth/checkPassword.js index ff56832..44bcc3f 100644 --- a/app/middleware/auth/checkPassword.js +++ b/app/middleware/auth/checkPassword.js @@ -10,7 +10,7 @@ const checkPassword = (password, user) => { return new Promise((resolve, reject) => { user.comparePassword(password, (err, isMatch) => { if (err) { - reject(buildErrObject(422, err.message)) + return reject(buildErrObject(422, err.message)) } if (!isMatch) { resolve(false) From 99174da2158bea376fe64d00f410f29c62080a78 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 14:59:53 -0400 Subject: [PATCH 15/23] Jest setup. 2 Coverage reports: 1 for unit tests, 1 for e2e tests, and 1 final merged with both reports. --- jest.config.js | 18 + package-lock.json | 10580 ++++++++++++++++++++++++++++++++------------ package.json | 46 +- 3 files changed, 7798 insertions(+), 2846 deletions(-) create mode 100644 jest.config.js diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..6e031be --- /dev/null +++ b/jest.config.js @@ -0,0 +1,18 @@ +module.exports = { + verbose: true, + testEnvironment: 'node', + collectCoverage: true, + collectCoverageFrom: [ + '**/*.js', + '!jest.config.js', + '!**/data/**', + '!**/node_modules/**', + '!**/.history/**', + '!**/test/**', + '!**/coverage/**', + '!**/tmp/**' + ], + coverageDirectory: 'coverage/unit', + coverageReporters: ['json', 'text', 'lcov'], + testPathIgnorePatterns: ['.history/'] +} diff --git a/package-lock.json b/package-lock.json index 3553505..0bcdc45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -151,6 +151,12 @@ "@babel/types": "^7.10.3" } }, + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + }, "@babel/helper-replace-supers": { "version": "7.10.1", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", @@ -212,6 +218,105 @@ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz", "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==" }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", + "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, "@babel/template": { "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", @@ -301,6 +406,22 @@ "to-fast-properties": "^2.0.0" } }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "@cnakazawa/watch": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", + "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", + "dev": true, + "requires": { + "exec-sh": "^0.3.2", + "minimist": "^1.2.0" + } + }, "@eslint/eslintrc": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", @@ -375,513 +496,464 @@ "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", "dev": true }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "@types/chai": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.8.tgz", - "integrity": "sha512-U1bQiWbln41Yo6EeHMr+34aUhvrMVyrhn9lYfPSpLTCrZlGxU4Rtn1bocX+0p2Fc/Jkd2FanCEXdw0WNfHHM0w==", - "dev": true - }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - }, - "@types/cookiejar": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz", - "integrity": "sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==", - "dev": true - }, - "@types/eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", - "dev": true - }, - "@types/json-schema": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz", - "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==", - "dev": true - }, - "@types/node": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz", - "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "@types/superagent": { - "version": "3.8.7", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.7.tgz", - "integrity": "sha512-9KhCkyXv268A2nZ1Wvu7rQWM+BmdYUVkycFeNnYrUL5Zwu7o8wPQ3wBfW59dDP+wuoxw0ww8YKgTNv8j/cgscA==", - "dev": true, - "requires": { - "@types/cookiejar": "*", - "@types/node": "*" - } - }, - "@types/unist": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", - "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" - }, - "@typescript-eslint/experimental-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.3.0.tgz", - "integrity": "sha512-d4pGIAbu/tYsrPrdHCQ5xfadJGvlkUxbeBB56nO/VGmEDi/sKmfa5fGty5t5veL1OyJBrUmSiRn1R1qfVDydrg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "3.3.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" - } - }, - "@typescript-eslint/parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.3.0.tgz", - "integrity": "sha512-a7S0Sqn/+RpOOWTcaLw6RD4obsharzxmgMfdK24l364VxuBODXjuJM7ImCkSXEN7oz52aiZbXSbc76+2EsE91w==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.3.0", - "@typescript-eslint/typescript-estree": "3.3.0", - "eslint-visitor-keys": "^1.1.0" - } - }, - "@typescript-eslint/typescript-estree": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.3.0.tgz", - "integrity": "sha512-3SqxylENltEvJsjjMSDCUx/edZNSC7wAqifUU1Ywp//0OWEZwMZJfecJud9XxJ/40rAKEbJMKBOQzeOjrLJFzQ==", + "@jest/console": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz", + "integrity": "sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==", "dev": true, "requires": { - "debug": "^4.1.1", - "eslint-visitor-keys": "^1.1.0", - "glob": "^7.1.6", - "is-glob": "^4.0.1", - "lodash": "^4.17.15", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^26.3.0", + "jest-util": "^26.3.0", + "slash": "^3.0.0" }, "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "ms": "^2.1.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", - "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", - "dev": true - }, - "acorn-jsx": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", - "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", - "dev": true - }, - "agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "@jest/core": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz", + "integrity": "sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==", + "dev": true, "requires": { - "es6-promisify": "^5.0.0" - } - }, - "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ajv": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", - "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "dev": true, - "requires": { - "string-width": "^3.0.0" + "@jest/console": "^26.3.0", + "@jest/reporters": "^26.4.1", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^26.3.0", + "jest-config": "^26.4.2", + "jest-haste-map": "^26.3.0", + "jest-message-util": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-resolve-dependencies": "^26.4.2", + "jest-runner": "^26.4.2", + "jest-runtime": "^26.4.2", + "jest-snapshot": "^26.4.2", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.2", + "jest-watcher": "^26.3.0", + "micromatch": "^4.0.2", + "p-each-series": "^2.1.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "glob": "^7.1.3" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } }, - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "@jest/environment": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz", + "integrity": "sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==", "dev": true, "requires": { - "type-fest": "^0.11.0" - }, - "dependencies": { - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "dev": true - } + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0" } }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "@jest/fake-timers": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz", + "integrity": "sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==", + "dev": true, "requires": { - "color-convert": "^1.9.0" + "@jest/types": "^26.3.0", + "@sinonjs/fake-timers": "^6.0.1", + "@types/node": "*", + "jest-message-util": "^26.3.0", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0" } }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "@jest/globals": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz", + "integrity": "sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==", + "dev": true, "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "@jest/environment": "^26.3.0", + "@jest/types": "^26.3.0", + "expect": "^26.4.2" } }, - "append-transform": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", - "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "@jest/reporters": { + "version": "26.4.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz", + "integrity": "sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==", "dev": true, "requires": { - "default-require-extensions": "^3.0.0" + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "node-notifier": "^8.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^5.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true + "@jest/source-map": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz", + "integrity": "sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.4", + "source-map": "^0.6.0" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } + } }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "@jest/test-result": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz", + "integrity": "sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==", + "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "@jest/console": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" } }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "@jest/test-sequencer": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz", + "integrity": "sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==", + "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "@jest/test-result": "^26.3.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^26.3.0", + "jest-runner": "^26.4.2", + "jest-runtime": "^26.4.2" }, "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true } } }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "array.prototype.map": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", - "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", + "@jest/transform": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz", + "integrity": "sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.4" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "ast-types": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", - "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", - "requires": { - "tslib": "^2.0.1" + "@babel/core": "^7.1.0", + "@jest/types": "^26.3.0", + "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.3.0", + "jest-regex-util": "^26.0.0", + "jest-util": "^26.3.0", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" }, "dependencies": { - "tslib": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" - } - } - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", - "dev": true - }, - "async": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz", - "integrity": "sha1-twnMAoCpw28J9FNr6CPIOKkEniU=", - "requires": { - "lodash": "^4.8.0" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "babel-eslint": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", - "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "eslint-visitor-keys": "^1.0.0", - "resolve": "^1.12.0" - } - }, - "bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", - "dev": true - }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "requires": { - "safe-buffer": "5.1.2" - } - }, - "bcrypt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-4.0.1.tgz", - "integrity": "sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==", - "requires": { - "node-addon-api": "^2.0.0", - "node-pre-gyp": "0.14.0" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, - "bl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", - "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", - "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" - } - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { - "ms": "2.0.0" + "color-name": "~1.1.4" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, - "bowser": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.9.0.tgz", - "integrity": "sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA==" - }, - "boxen": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", - "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", "dev": true, "requires": { - "ansi-align": "^3.0.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "cli-boxes": "^2.2.0", - "string-width": "^4.1.0", - "term-size": "^2.1.0", - "type-fest": "^0.8.1", - "widest-line": "^3.1.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" }, "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -893,9 +965,9 @@ } }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -923,36 +995,10 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -960,348 +1006,343 @@ } } }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, "requires": { - "fill-range": "^7.0.1" + "type-detect": "4.0.8" } }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "bson": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.0.4.tgz", - "integrity": "sha512-Ioi3TD0/1V3aI8+hPfC56TetYmzfq2H07jJa9A1lKTxWsFtHtYdLMGMXjtGEg9v0f72NSM07diRQEUNYhLupIA==", + "@sinonjs/fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", + "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", "dev": true, "requires": { - "buffer": "^5.1.0", - "long": "^4.0.0" + "@sinonjs/commons": "^1.7.0" } }, - "buffer": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", - "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" + "defer-to-connect": "^1.0.1" } }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + "@types/babel__core": { + "version": "7.1.10", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz", + "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + "@types/babel__generator": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz", + "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "@types/babel__template": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz", + "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==", "dev": true, "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true - } + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" } }, - "caching-transform": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", - "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "@types/babel__traverse": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz", + "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==", "dev": true, "requires": { - "hasha": "^5.0.0", - "make-dir": "^3.0.0", - "package-hash": "^4.0.0", - "write-file-atomic": "^3.0.0" + "@babel/types": "^7.3.0" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "@types/chai": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.8.tgz", + "integrity": "sha512-U1bQiWbln41Yo6EeHMr+34aUhvrMVyrhn9lYfPSpLTCrZlGxU4Rtn1bocX+0p2Fc/Jkd2FanCEXdw0WNfHHM0w==", "dev": true }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, - "camelize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", - "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" + "@types/cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==", + "dev": true }, - "ccount": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz", - "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==" + "@types/eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", + "dev": true }, - "chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "@types/graceful-fs": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz", + "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==", "dev": true, "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" + "@types/node": "*" } }, - "chai-http": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.3.0.tgz", - "integrity": "sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==", + "@types/istanbul-lib-coverage": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", "dev": true, "requires": { - "@types/chai": "4", - "@types/superagent": "^3.8.3", - "cookiejar": "^2.1.1", - "is-ip": "^2.0.0", - "methods": "^1.1.2", - "qs": "^6.5.1", - "superagent": "^3.7.0" + "@types/istanbul-lib-coverage": "*" } }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "@types/istanbul-lib-report": "*" } }, - "character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==" - }, - "character-entities-html4": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz", - "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==" - }, - "character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==" - }, - "character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "@types/json-schema": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz", + "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==", "dev": true }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "@types/node": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz", + "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==", "dev": true }, - "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "@types/normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", + "dev": true }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "@types/prettier": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz", + "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==", "dev": true }, - "cli-boxes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", - "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", + "@types/stack-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", + "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "@types/superagent": { + "version": "3.8.7", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.7.tgz", + "integrity": "sha512-9KhCkyXv268A2nZ1Wvu7rQWM+BmdYUVkycFeNnYrUL5Zwu7o8wPQ3wBfW59dDP+wuoxw0ww8YKgTNv8j/cgscA==", "dev": true, "requires": { - "restore-cursor": "^3.1.0" + "@types/cookiejar": "*", + "@types/node": "*" } }, - "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "@types/unist": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", + "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" + }, + "@types/yargs": { + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz", + "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==", "dev": true, "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==", + "dev": true + }, + "@typescript-eslint/experimental-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.3.0.tgz", + "integrity": "sha512-d4pGIAbu/tYsrPrdHCQ5xfadJGvlkUxbeBB56nO/VGmEDi/sKmfa5fGty5t5veL1OyJBrUmSiRn1R1qfVDydrg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/typescript-estree": "3.3.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.3.0.tgz", + "integrity": "sha512-a7S0Sqn/+RpOOWTcaLw6RD4obsharzxmgMfdK24l364VxuBODXjuJM7ImCkSXEN7oz52aiZbXSbc76+2EsE91w==", + "dev": true, + "requires": { + "@types/eslint-visitor-keys": "^1.0.0", + "@typescript-eslint/experimental-utils": "3.3.0", + "@typescript-eslint/typescript-estree": "3.3.0", + "eslint-visitor-keys": "^1.1.0" + } + }, + "@typescript-eslint/typescript-estree": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.3.0.tgz", + "integrity": "sha512-3SqxylENltEvJsjjMSDCUx/edZNSC7wAqifUU1Ywp//0OWEZwMZJfecJud9XxJ/40rAKEbJMKBOQzeOjrLJFzQ==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "eslint-visitor-keys": "^1.1.0", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + }, "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "color-name": "~1.1.4" + "ms": "^2.1.1" } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true - }, - "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } } } }, - "cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", "dev": true }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "acorn": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", + "dev": true + }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "acorn-jsx": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", + "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "dev": true + }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true + }, + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "ajv": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", + "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-align": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", + "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", + "dev": true, + "requires": { + "string-width": "^3.0.0" }, "dependencies": { "ansi-regex": { @@ -1341,765 +1382,950 @@ "requires": { "ansi-regex": "^4.1.0" } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } } } }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } }, - "collapse-white-space": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz", - "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==" - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "requires": { - "color-name": "1.1.3" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "default-require-extensions": "^3.0.0" } }, - "commander": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz", - "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", - "dev": true - }, - "common-tags": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", - "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "compare-versions": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", - "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", - "dev": true + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, - "compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "requires": { - "mime-db": ">= 1.43.0 < 2" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "sprintf-js": "~1.0.2" }, "dependencies": { - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" } } }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, - "concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "array.prototype.map": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", + "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", + "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.4" } }, - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" + "safer-buffer": "~2.1.0" } }, - "console-control-strings": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "assertion-error": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true }, - "consolidate": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", - "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", - "requires": { - "bluebird": "^3.1.1" - } + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true }, - "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "ast-types": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", + "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", "requires": { - "safe-buffer": "5.1.2" + "tslib": "^2.0.1" + }, + "dependencies": { + "tslib": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + } } }, - "content-security-policy-builder": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", - "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, + "async": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz", + "integrity": "sha1-twnMAoCpw28J9FNr6CPIOKkEniU=", "requires": { - "safe-buffer": "~5.1.1" + "lodash": "^4.8.0" } }, - "cookie": { + "asynckit": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, - "cookiejar": { + "atob": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "requires": { - "object-assign": "^4", - "vary": "^1" - } + "aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "dev": true }, - "cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", - "dev": true, + "babel-eslint": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", + "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0", + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" } }, - "cross-env": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz", - "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==", + "babel-jest": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz", + "integrity": "sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==", "dev": true, "requires": { - "cross-spawn": "^7.0.1" + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^26.3.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, - "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", "dev": true, "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" } }, - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true - }, - "dasherize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", - "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg=" - }, - "data-uri-to-buffer": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz", - "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==" - }, - "date-fns": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz", - "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==" - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "babel-plugin-jest-hoist": { + "version": "26.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz", + "integrity": "sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==", + "dev": true, "requires": { - "ms": "^2.1.1" + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "babel-preset-current-node-syntax": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz", + "integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@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" } }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "babel-preset-jest": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz", + "integrity": "sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==", "dev": true, "requires": { - "type-detect": "^4.0.0" + "babel-plugin-jest-hoist": "^26.2.0", + "babel-preset-current-node-syntax": "^0.1.3" } }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "bail": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, - "default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "strip-bom": "^4.0.0" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } } }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", "dev": true }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", "requires": { - "object-keys": "^1.0.12" + "safe-buffer": "5.1.2" } }, - "degenerator": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz", - "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=", + "bcrypt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz", + "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==", "requires": { - "ast-types": "0.x.x", - "escodegen": "1.x.x", - "esprima": "3.x.x" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - } + "node-addon-api": "^3.0.0", + "node-pre-gyp": "0.15.0" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "requires": { + "tweetnacl": "^0.14.3" + } }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" }, - "denque": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", - "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + "bl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" - }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, - "dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", - "dev": true - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", "requires": { - "esutils": "^2.0.2" + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } }, - "dont-sniff-mimetype": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz", - "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==" - }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "boxen": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", + "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", "dev": true, "requires": { - "is-obj": "^2.0.0" + "ansi-align": "^3.0.0", + "camelcase": "^5.3.1", + "chalk": "^3.0.0", + "cli-boxes": "^2.2.0", + "string-width": "^4.1.0", + "term-size": "^2.1.0", + "type-fest": "^0.8.1", + "widest-line": "^3.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, - "dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } }, - "dotenv-safe": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv-safe/-/dotenv-safe-8.2.0.tgz", - "integrity": "sha512-uWwWWdUQkSs5a3mySDB22UtNwyEYi0JtEQu+vDzIqr9OjbDdC2Ip13PnSpi/fctqlYmzkxCeabiyCAOROuAIaA==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "requires": { - "dotenv": "^8.2.0" + "fill-range": "^7.0.1" } }, - "double-ended-queue": { - "version": "2.1.0-0", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", - "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=" + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "node-int64": "^0.4.0" } }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "bson": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.0.4.tgz", + "integrity": "sha512-Ioi3TD0/1V3aI8+hPfC56TetYmzfq2H07jJa9A1lKTxWsFtHtYdLMGMXjtGEg9v0f72NSM07diRQEUNYhLupIA==", + "dev": true, + "requires": { + "buffer": "^5.1.0", + "long": "^4.0.0" + } }, - "ejs": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz", - "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==", + "buffer": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "dev": true, "requires": { - "jake": "^10.6.1" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" } }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "once": "^1.4.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { - "ansi-colors": "^4.1.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "requires": { - "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" + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" }, "dependencies": { - "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.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" + "pump": "^3.0.0" } }, - "object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", - "requires": { - "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-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", - "dev": true - }, - "es-get-iterator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", - "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", - "dev": true, - "requires": { - "es-abstract": "^1.17.4", - "has-symbols": "^1.0.1", - "is-arguments": "^1.0.4", - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true } } }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, - "es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "capture-exit": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz", + "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==", + "dev": true, "requires": { - "es6-promise": "^4.0.3" + "rsvp": "^4.8.4" } }, - "escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "escape-string-regexp": { + "ccount": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz", + "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==" }, - "escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, "requires": { - "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" } }, - "eslint": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", - "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", + "chai-http": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.3.0.tgz", + "integrity": "sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@eslint/eslintrc": "^0.1.3", - "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": "^1.3.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" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "@types/chai": "4", + "@types/superagent": "^3.8.3", + "cookiejar": "^2.1.1", + "is-ip": "^2.0.0", + "methods": "^1.1.2", + "qs": "^6.5.1", + "superagent": "^3.7.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true + }, + "character-entities": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", + "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==" + }, + "character-entities-html4": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz", + "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==" + }, + "character-entities-legacy": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", + "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==" + }, + "character-reference-invalid": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", + "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "chokidar": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", + "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.3.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "is-descriptor": "^0.1.0" } + } + } + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, + "cli-boxes": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", + "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", + "dev": true + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "cli-truncate": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "dev": true, + "requires": { + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2115,1162 +2341,992 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, - "debug": { + "string-width": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "ms": "2.1.2" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "ansi-regex": "^5.0.0" } + } + } + }, + "cli-width": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "dev": true + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } - } + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "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" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", - "dev": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "ansi-regex": "^4.1.0" } }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "prelude-ls": "^1.2.1" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" } } } }, - "eslint-config-formidable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-formidable/-/eslint-config-formidable-4.0.0.tgz", - "integrity": "sha512-q23C58Kf24Ob4dlwZQE5/JwvmrQ1UyxsW1j8+jNJgDKh+KhEySj3DRGkzy3lJ0556AEApGYoU7IC4gvmJ7iiKA==", - "dev": true - }, - "eslint-config-prettier": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz", - "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "get-stdin": "^6.0.0" + "mimic-response": "^1.0.0" } }, - "eslint-plugin-prettier": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz", - "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==", + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "collapse-white-space": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz", + "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==" + }, + "collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "dev": true + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "prettier-linter-helpers": "^1.0.0" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, - "eslint-scope": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", - "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", - "dev": true, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "color-name": "1.1.3" } }, - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { - "eslint-visitor-keys": "^1.1.0" + "delayed-stream": "~1.0.0" } }, - "eslint-visitor-keys": { + "commander": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz", + "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", + "dev": true + }, + "common-tags": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", + "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "compare-versions": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", + "dev": true + }, + "component-emitter": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, - "espree": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", - "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", - "dev": true, + "compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.3.0" + "mime-db": ">= 1.43.0 < 2" + } + }, + "compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "requires": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" }, "dependencies": { - "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", - "dev": true + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "esquery": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", - "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", - "dev": true, + "concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", "requires": { - "estraverse": "^5.1.0" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" }, "dependencies": { - "estraverse": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", - "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==", - "dev": true + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } } } }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", "dev": true, "requires": { - "estraverse": "^4.1.0" - } + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + } }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "consolidate": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", + "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", + "requires": { + "bluebird": "^3.1.1" + } }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } }, - "execa": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", - "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - } + "safe-buffer": "~5.1.1" } }, - "expeditious": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-0.1.0.tgz", - "integrity": "sha1-vm9vkSJQbW3ME3ZYx2hGQJtG/zQ=", + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "cookiejar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "requires": { - "safejson": "^1.0.1", - "verror": "^1.6.1" + "object-assign": "^4", + "vary": "^1" } }, - "expeditious-engine-memory": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/expeditious-engine-memory/-/expeditious-engine-memory-0.2.1.tgz", - "integrity": "sha1-zh2cvfLfmn25HNkZE8KLpTeWXRE=", + "cosmiconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "dev": true, "requires": { - "expeditious": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "expeditious": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-1.0.1.tgz", - "integrity": "sha1-mVt6x2dBpmApiRRJ1YZ7zMM4sw8=", - "requires": { - "debug": "~2.6.9", - "safejson": "~1.0.1", - "verror": "~1.6.1" - } - }, - "extsprintf": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "verror": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.1.tgz", - "integrity": "sha1-I2QCBgZIwhnRFiwkUdHDQaDhyc4=", - "requires": { - "core-util-is": "1.0.2", - "extsprintf": "1.2.0" - } - } + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" } }, - "expeditious-engine-redis": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expeditious-engine-redis/-/expeditious-engine-redis-0.1.2.tgz", - "integrity": "sha512-qYC3PZ+6oSQbgGXCUOg5D4mbqQrLoxfMR90HAicDtCwTm27Dc+9yVuxWeKqVUpNjpTHyNWw+Z7E+/enIDjuOfQ==", + "cross-env": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz", + "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==", + "dev": true, "requires": { - "async": "~2.0.0", - "expeditious": "~0.1.0", - "redis": "~2.6.2", - "verror": "~1.9.0" + "cross-spawn": "^7.0.1" } }, - "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "dev": true, "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true + }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "requires": { + "cssom": "~0.3.6" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true } } }, - "express-expeditious": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/express-expeditious/-/express-expeditious-5.1.1.tgz", - "integrity": "sha512-4akMwHm8TVRYzm/HQ520fJxqT1NIEb0J+CNzJ18l1kXt0GSnIHsRt2WpoI+8jdD/g3tf/Ggz+vbW6rwronJdvA==", + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, "requires": { - "debug": "~4.1.0", - "expeditious": "~1.0.1", - "expeditious-engine-memory": "~0.2.0", - "on-finished": "~2.3.0", - "timestring": "~5.0.0", - "verror": "~1.10.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "expeditious": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-1.0.1.tgz", - "integrity": "sha1-mVt6x2dBpmApiRRJ1YZ7zMM4sw8=", - "requires": { - "debug": "~2.6.9", - "safejson": "~1.0.1", - "verror": "~1.6.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "verror": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.1.tgz", - "integrity": "sha1-I2QCBgZIwhnRFiwkUdHDQaDhyc4=", - "requires": { - "core-util-is": "1.0.2", - "extsprintf": "1.2.0" - } - } - } - }, - "extsprintf": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk=" - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - } + "assert-plus": "^1.0.0" } }, - "express-validator": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.6.1.tgz", - "integrity": "sha512-+MrZKJ3eGYXkNF9p9Zf7MS7NkPJFg9MDYATU5c80Cf4F62JdLBIjWxy6481tRC0y1NnC9cgOw8FuN364bWaGhA==", + "data-uri-to-buffer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz", + "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==" + }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, "requires": { - "lodash": "^4.17.19", - "validator": "^13.1.1" + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "date-fns": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz", + "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==" }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" + "ms": "^2.1.1" } }, - "extsprintf": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", - "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" - }, - "faker": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz", - "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=", + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, - "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "decimal.js": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", + "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==", "dev": true }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true }, - "fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, "requires": { - "format": "^0.2.0" + "type-detect": "^4.0.0" } }, - "feature-policy": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz", - "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==" + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" }, - "figgy-pudding": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", - "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, - "figures": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", - "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", - "requires": { - "escape-string-regexp": "^1.0.5" - } + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", "dev": true, "requires": { - "flat-cache": "^2.0.1" + "strip-bom": "^4.0.0" } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" - }, - "filelist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz", - "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==", - "requires": { - "minimatch": "^3.0.4" - } + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "requires": { - "to-regex-range": "^5.0.1" + "object-keys": "^1.0.12" } }, - "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "requires": { - "ms": "2.0.0" + "kind-of": "^6.0.0" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } } } }, - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, + "degenerator": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz", + "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=", "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "ast-types": "0.x.x", + "escodegen": "1.x.x", + "esprima": "3.x.x" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + } } }, - "find-versions": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", - "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", - "dev": true, - "requires": { - "semver-regex": "^2.0.0" - } + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "denque": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", + "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, + "diff-sequences": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz", + "integrity": "sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==", + "dev": true + }, + "dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "is-buffer": "~2.0.3" + "esutils": "^2.0.2" } }, - "flat-cache": { + "domexception": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" + "webidl-conversions": "^5.0.0" }, "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true } } }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", - "dev": true - }, - "foreground-child": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dot-prop": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "dev": true, "requires": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" + "is-obj": "^2.0.0" } }, - "form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + }, + "dotenv-safe": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv-safe/-/dotenv-safe-8.2.0.tgz", + "integrity": "sha512-uWwWWdUQkSs5a3mySDB22UtNwyEYi0JtEQu+vDzIqr9OjbDdC2Ip13PnSpi/fctqlYmzkxCeabiyCAOROuAIaA==", "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "dotenv": "^8.2.0" } }, - "format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=" + "double-ended-queue": { + "version": "2.1.0-0", + "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", + "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=" }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, - "forwarded": { + "ecc-jsbn": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" - }, - "fromentries": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", - "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==", - "dev": true - }, - "fs-minipass": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", - "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, "requires": { - "minipass": "^2.6.0" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "optional": true - }, - "ftp": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", - "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=", + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", "requires": { - "readable-stream": "1.1.x", - "xregexp": "2.0.0" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - } + "safe-buffer": "^5.0.1" } }, - "function-bind": { + "ee-first": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "ejs": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz", + "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==", "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "jake": "^10.6.1" } }, - "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "emittery": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz", + "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==", "dev": true }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "get-own-enumerable-property-symbols": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", - "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, - "get-stdin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", - "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", - "dev": true + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "requires": { + "once": "^1.4.0" + } }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "requires": { - "pump": "^3.0.0" + "ansi-colors": "^4.1.1" } }, - "get-uri": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.4.tgz", - "integrity": "sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==", + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { - "data-uri-to-buffer": "1", - "debug": "2", - "extend": "~3.0.2", - "file-uri-to-path": "1", - "ftp": "~0.3.10", - "readable-stream": "2" + "is-arrayish": "^0.2.1" + } + }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "requires": { + "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" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "requires": { - "ms": "2.0.0" + "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" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "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" + } + } + } } } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "requires": { - "is-glob": "^4.0.1" - } + "es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true }, - "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "es-get-iterator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", + "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", "dev": true, "requires": { - "ini": "^1.3.5" + "es-abstract": "^1.17.4", + "has-symbols": "^1.0.1", + "is-arguments": "^1.0.4", + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-string": "^1.0.5", + "isarray": "^2.0.5" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + } } }, - "globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", - "dev": true, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "requires": { - "type-fest": "^0.8.1" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" + "es6-promise": "^4.0.3" } }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "escape-goat": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", + "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", "dev": true }, - "has": { + "escape-html": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "requires": { - "function-bind": "^1.1.1" + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" - }, - "has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true - }, - "hasha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", - "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "eslint": { + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", + "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", "dev": true, "requires": { - "is-stream": "^2.0.0", - "type-fest": "^0.8.0" + "@babel/code-frame": "^7.0.0", + "@eslint/eslintrc": "^0.1.3", + "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": "^1.3.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" }, "dependencies": { - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true - } - } - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "helmet": { - "version": "3.23.3", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.23.3.tgz", - "integrity": "sha512-U3MeYdzPJQhtvqAVBPntVgAvNSOJyagwZwyKsFdyRa8TV3pOKVFljalPOCxbw5Wwf2kncGhmP0qHjyazIdNdSA==", - "requires": { - "depd": "2.0.0", - "dont-sniff-mimetype": "1.1.0", - "feature-policy": "0.3.0", - "helmet-crossdomain": "0.4.0", - "helmet-csp": "2.10.0", - "hide-powered-by": "1.1.0", - "hpkp": "2.0.0", - "hsts": "2.2.0", - "nocache": "2.1.0", - "referrer-policy": "1.2.0", - "x-xss-protection": "1.3.0" - }, - "dependencies": { - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - } - } - }, - "helmet-crossdomain": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz", - "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" - }, - "helmet-csp": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.10.0.tgz", - "integrity": "sha512-Rz953ZNEFk8sT2XvewXkYN0Ho4GEZdjAZy4stjiEQV3eN7GDxg1QKmYggH7otDyIA7uGA6XnUMVSgeJwbR5X+w==", - "requires": { - "bowser": "2.9.0", - "camelize": "1.0.0", - "content-security-policy-builder": "2.1.0", - "dasherize": "2.0.0" - } - }, - "hide-powered-by": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz", - "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==" - }, - "hpkp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz", - "integrity": "sha1-EOFCJk52IVpdMMROxD3mTe5tFnI=" - }, - "hsts": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.2.0.tgz", - "integrity": "sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==", - "requires": { - "depd": "2.0.0" - }, - "dependencies": { - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - } - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "http-proxy-agent": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", - "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", - "requires": { - "agent-base": "4", - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "https-proxy-agent": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", - "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", - "requires": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - } - }, - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - }, - "husky": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz", - "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "ci-info": "^2.0.0", - "compare-versions": "^3.6.0", - "cosmiconfig": "^7.0.0", - "find-versions": "^3.2.0", - "opencollective-postinstall": "^2.0.2", - "pkg-dir": "^4.2.0", - "please-upgrade-node": "^3.2.0", - "slash": "^3.0.0", - "which-pm-runs": "^1.0.0" - }, - "dependencies": { "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -3306,215 +3362,101 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "i18n": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.10.0.tgz", - "integrity": "sha512-lCSpIm/ZLUCQMAv+UAjSEYzPq96KG7fIx6o1mNQ0MuTBzXpPgd31t4WLzbPG10nKTLJzj9176dgOG7C0wUquSA==", - "requires": { - "debug": "*", - "make-plural": "^6.2.1", - "math-interval-parser": "^2.0.1", - "messageformat": "^2.3.0", - "mustache": "^4.0.1", - "sprintf-js": "^1.1.2" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", - "dev": true - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, - "ignore-walk": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", - "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", - "requires": { - "minimatch": "^3.0.4" - } - }, - "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } - } - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "inflection": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz", - "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" - }, - "inquirer": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz", - "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "ms": "2.1.2" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "color-name": "~1.1.4" + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "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" } }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, + "regexpp": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -3524,362 +3466,3788 @@ "ansi-regex": "^5.0.0" } }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } } } }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" - }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "eslint-config-formidable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-formidable/-/eslint-config-formidable-4.0.0.tgz", + "integrity": "sha512-q23C58Kf24Ob4dlwZQE5/JwvmrQ1UyxsW1j8+jNJgDKh+KhEySj3DRGkzy3lJ0556AEApGYoU7IC4gvmJ7iiKA==", "dev": true }, - "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" + "eslint-config-prettier": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz", + "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", + "dev": true, + "requires": { + "get-stdin": "^6.0.0" + } }, - "is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==" - }, - "is-alphanumeric": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz", - "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=" - }, - "is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "eslint-plugin-prettier": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz", + "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==", + "dev": true, "requires": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" + "prettier-linter-helpers": "^1.0.0" } }, - "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "eslint-scope": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", + "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "dev": true, "requires": { - "binary-extensions": "^2.0.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, - "is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { - "ci-info": "^2.0.0" + "eslint-visitor-keys": "^1.1.0" } }, - "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" - }, - "is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" - }, - "is-empty": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz", - "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "espree": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", + "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "acorn": "^7.4.0", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true + } } }, - "is-glob": { + "esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, - "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "esquery": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", + "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==", + "dev": true + } } }, - "is-ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz", - "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=", + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "ip-regex": "^2.0.0" + "estraverse": "^4.1.0" } }, - "is-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", - "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", - "dev": true - }, - "is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" - }, - "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, - "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", - "dev": true + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "exec-sh": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz", + "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==", "dev": true }, - "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "execa": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "dev": true, "requires": { - "has-symbols": "^1.0.1" + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "dependencies": { + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + } } }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", - "dev": true - }, - "is-set": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", - "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", - "dev": true - }, - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true - }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, - "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, "requires": { - "has-symbols": "^1.0.1" - } - }, + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "expect": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz", + "integrity": "sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-matcher-utils": "^26.4.2", + "jest-message-util": "^26.3.0", + "jest-regex-util": "^26.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, + "expeditious": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-0.1.0.tgz", + "integrity": "sha1-vm9vkSJQbW3ME3ZYx2hGQJtG/zQ=", + "requires": { + "safejson": "^1.0.1", + "verror": "^1.6.1" + } + }, + "expeditious-engine-memory": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/expeditious-engine-memory/-/expeditious-engine-memory-0.2.1.tgz", + "integrity": "sha1-zh2cvfLfmn25HNkZE8KLpTeWXRE=", + "requires": { + "expeditious": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "expeditious": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-1.0.1.tgz", + "integrity": "sha1-mVt6x2dBpmApiRRJ1YZ7zMM4sw8=", + "requires": { + "debug": "~2.6.9", + "safejson": "~1.0.1", + "verror": "~1.6.1" + } + }, + "extsprintf": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", + "integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "verror": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.1.tgz", + "integrity": "sha1-I2QCBgZIwhnRFiwkUdHDQaDhyc4=", + "requires": { + "core-util-is": "1.0.2", + "extsprintf": "1.2.0" + } + } + } + }, + "expeditious-engine-redis": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/expeditious-engine-redis/-/expeditious-engine-redis-0.1.2.tgz", + "integrity": "sha512-qYC3PZ+6oSQbgGXCUOg5D4mbqQrLoxfMR90HAicDtCwTm27Dc+9yVuxWeKqVUpNjpTHyNWw+Z7E+/enIDjuOfQ==", + "requires": { + "async": "~2.0.0", + "expeditious": "~0.1.0", + "redis": "~2.6.2", + "verror": "~1.9.0" + } + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "express-expeditious": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/express-expeditious/-/express-expeditious-5.1.1.tgz", + "integrity": "sha512-4akMwHm8TVRYzm/HQ520fJxqT1NIEb0J+CNzJ18l1kXt0GSnIHsRt2WpoI+8jdD/g3tf/Ggz+vbW6rwronJdvA==", + "requires": { + "debug": "~4.1.0", + "expeditious": "~1.0.1", + "expeditious-engine-memory": "~0.2.0", + "on-finished": "~2.3.0", + "timestring": "~5.0.0", + "verror": "~1.10.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "expeditious": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/expeditious/-/expeditious-1.0.1.tgz", + "integrity": "sha1-mVt6x2dBpmApiRRJ1YZ7zMM4sw8=", + "requires": { + "debug": "~2.6.9", + "safejson": "~1.0.1", + "verror": "~1.6.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "verror": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.1.tgz", + "integrity": "sha1-I2QCBgZIwhnRFiwkUdHDQaDhyc4=", + "requires": { + "core-util-is": "1.0.2", + "extsprintf": "1.2.0" + } + } + } + }, + "extsprintf": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", + "integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk=" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + } + } + }, + "express-validator": { + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.6.1.tgz", + "integrity": "sha512-+MrZKJ3eGYXkNF9p9Zf7MS7NkPJFg9MDYATU5c80Cf4F62JdLBIjWxy6481tRC0y1NnC9cgOw8FuN364bWaGhA==", + "requires": { + "lodash": "^4.17.19", + "validator": "^13.1.1" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "extsprintf": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", + "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" + }, + "faker": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz", + "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "dev": true + }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "fault": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", + "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "requires": { + "format": "^0.2.0" + } + }, + "fb-watchman": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, + "figgy-pudding": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" + }, + "figures": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, + "filelist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz", + "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "find-versions": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", + "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", + "dev": true, + "requires": { + "semver-regex": "^2.0.0" + } + }, + "flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "dev": true, + "requires": { + "is-buffer": "~2.0.3" + } + }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "format": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", + "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=" + }, + "formidable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", + "dev": true + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, + "requires": { + "map-cache": "^0.2.2" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "fromentries": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", + "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==", + "dev": true + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "optional": true + }, + "ftp": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", + "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=", + "requires": { + "readable-stream": "1.1.x", + "xregexp": "2.0.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } + } + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "get-own-enumerable-property-symbols": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", + "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", + "dev": true + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "get-uri": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.4.tgz", + "integrity": "sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==", + "requires": { + "data-uri-to-buffer": "1", + "debug": "2", + "extend": "~3.0.2", + "file-uri-to-path": "1", + "ftp": "~0.3.10", + "readable-stream": "2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "global-dirs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", + "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "dev": true, + "requires": { + "ini": "^1.3.5" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, + "requires": { + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + } + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, + "growly": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", + "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", + "dev": true, + "optional": true + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "dev": true, + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + } + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "has-yarn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", + "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", + "dev": true + }, + "hasha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", + "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "dev": true, + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + } + } + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "helmet": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.1.1.tgz", + "integrity": "sha512-Avg4XxSBrehD94mkRwEljnO+6RZx7AGfk8Wa6K1nxaU+hbXlFOhlOIMgPfFqOYQB/dBCsTpootTGuiOG+CHiQA==", + "dev": true + }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "dev": true + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "dev": true + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "http-proxy-agent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", + "requires": { + "agent-base": "4", + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "https-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", + "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + } + }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true + }, + "husky": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz", + "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "ci-info": "^2.0.0", + "compare-versions": "^3.6.0", + "cosmiconfig": "^7.0.0", + "find-versions": "^3.2.0", + "opencollective-postinstall": "^2.0.2", + "pkg-dir": "^4.2.0", + "please-upgrade-node": "^3.2.0", + "slash": "^3.0.0", + "which-pm-runs": "^1.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "i18n": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.13.2.tgz", + "integrity": "sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "make-plural": "^6.2.2", + "math-interval-parser": "^2.0.1", + "messageformat": "^2.3.0", + "mustache": "^4.0.1", + "sprintf-js": "^1.1.2" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", + "dev": true + }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "dev": true + }, + "import-local": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", + "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, + "inflection": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz", + "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "inquirer": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz", + "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true + }, + "ip": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true + }, + "ipaddr.js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-alphabetical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", + "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==" + }, + "is-alphanumeric": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz", + "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=" + }, + "is-alphanumerical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", + "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "requires": { + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0" + } + }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "requires": { + "ci-info": "^2.0.0" + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" + }, + "is-decimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", + "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "is-docker": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", + "dev": true, + "optional": true + }, + "is-empty": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz", + "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s=" + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-hexadecimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", + "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" + }, + "is-installed-globally": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", + "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "dev": true, + "requires": { + "global-dirs": "^2.0.1", + "is-path-inside": "^3.0.1" + } + }, + "is-ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz", + "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=", + "dev": true, + "requires": { + "ip-regex": "^2.0.0" + } + }, + "is-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", + "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", + "dev": true + }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" + }, + "is-npm": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", + "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true + }, + "is-path-inside": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", + "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "requires": { + "isobject": "^3.0.1" + } + }, + "is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", + "dev": true + }, + "is-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", + "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "requires": { + "has-symbols": "^1.0.1" + } + }, "is-typedarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-whitespace-character": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz", + "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==" + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + }, + "is-word-character": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz", + "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==" + }, + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "optional": true, + "requires": { + "is-docker": "^2.0.0" + } + }, + "is-yarn-global": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", + "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", + "dev": true + }, + "is_js": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz", + "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "dev": true, + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "istanbul-merge": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-merge/-/istanbul-merge-1.1.1.tgz", + "integrity": "sha1-db5kNDbU3nI+A6lNHKX1+ZSwvXI=", + "dev": true, + "requires": { + "foreach": "^2.0.5", + "glob": "^7.0.5", + "istanbul-lib-coverage": "^1.0.0", + "mkdirp": "^0.5.1", + "yargs": "^4.8.1" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz", + "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "dev": true, + "requires": { + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" + } + }, + "yargs-parser": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", + "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", + "dev": true, + "requires": { + "camelcase": "^3.0.0", + "lodash.assign": "^4.0.6" + } + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "iterate-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", + "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", + "dev": true + }, + "iterate-value": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", + "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", + "dev": true, + "requires": { + "es-get-iterator": "^1.0.2", + "iterate-iterator": "^1.0.1" + } + }, + "jake": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", + "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "requires": { + "async": "0.9.x", + "chalk": "^2.4.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + } + } + }, + "jest": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz", + "integrity": "sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==", + "dev": true, + "requires": { + "@jest/core": "^26.4.2", + "import-local": "^3.0.2", + "jest-cli": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "jest-cli": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz", + "integrity": "sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==", + "dev": true, + "requires": { + "@jest/core": "^26.4.2", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "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.4.2", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.2", + "prompts": "^2.0.1", + "yargs": "^15.3.1" + } + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "jest-changed-files": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz", + "integrity": "sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "execa": "^4.0.0", + "throat": "^5.0.0" + } + }, + "jest-config": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz", + "integrity": "sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^26.4.2", + "@jest/types": "^26.3.0", + "babel-jest": "^26.3.0", + "chalk": "^4.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^26.3.0", + "jest-environment-node": "^26.3.0", + "jest-get-type": "^26.3.0", + "jest-jasmine2": "^26.4.2", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.2", + "micromatch": "^4.0.2", + "pretty-format": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-diff": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz", + "integrity": "sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^26.3.0", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-docblock": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz", + "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz", + "integrity": "sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-util": "^26.3.0", + "pretty-format": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-environment-jsdom": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz", + "integrity": "sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==", + "dev": true, + "requires": { + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0", + "jsdom": "^16.2.2" + } + }, + "jest-environment-node": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz", + "integrity": "sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==", + "dev": true, + "requires": { + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0" + } + }, + "jest-get-type": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", "dev": true }, - "is-whitespace-character": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz", - "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==" + "jest-haste-map": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz", + "integrity": "sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.4", + "jest-regex-util": "^26.0.0", + "jest-serializer": "^26.3.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "micromatch": "^4.0.2", + "sane": "^4.0.3", + "walker": "^1.0.7" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } + } + }, + "jest-jasmine2": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz", + "integrity": "sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==", + "dev": true, + "requires": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^26.3.0", + "@jest/source-map": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^26.4.2", + "is-generator-fn": "^2.0.0", + "jest-each": "^26.4.2", + "jest-matcher-utils": "^26.4.2", + "jest-message-util": "^26.3.0", + "jest-runtime": "^26.4.2", + "jest-snapshot": "^26.4.2", + "jest-util": "^26.3.0", + "pretty-format": "^26.4.2", + "throat": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-leak-detector": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz", + "integrity": "sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==", + "dev": true, + "requires": { + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + } + } + }, + "jest-matcher-utils": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz", + "integrity": "sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^26.4.2", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-message-util": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz", + "integrity": "sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^26.3.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.2", + "slash": "^3.0.0", + "stack-utils": "^2.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true + "jest-mock": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz", + "integrity": "sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@types/node": "*" + } }, - "is-word-character": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz", - "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==" + "jest-pnp-resolver": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", + "dev": true }, - "is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", + "jest-regex-util": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz", + "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==", "dev": true }, - "is_js": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz", - "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=" + "jest-resolve": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz", + "integrity": "sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^26.3.0", + "read-pkg-up": "^7.0.1", + "resolve": "^1.17.0", + "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "requires": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "requires": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "jest-resolve-dependencies": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz", + "integrity": "sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-snapshot": "^26.4.2" + } }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "jest-runner": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz", + "integrity": "sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/environment": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.7.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-config": "^26.4.2", + "jest-docblock": "^26.0.0", + "jest-haste-map": "^26.3.0", + "jest-leak-detector": "^26.4.2", + "jest-message-util": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-runtime": "^26.4.2", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true + "jest-runtime": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz", + "integrity": "sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/globals": "^26.4.2", + "@jest/source-map": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.4", + "jest-config": "^26.4.2", + "jest-haste-map": "^26.3.0", + "jest-message-util": "^26.3.0", + "jest-mock": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-snapshot": "^26.4.2", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.2", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.3.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } }, - "istanbul-lib-hook": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", - "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "jest-serializer": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz", + "integrity": "sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==", "dev": true, "requires": { - "append-transform": "^2.0.0" + "@types/node": "*", + "graceful-fs": "^4.2.4" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } } }, - "istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "jest-snapshot": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz", + "integrity": "sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==", "dev": true, "requires": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" + "@babel/types": "^7.0.0", + "@jest/types": "^26.3.0", + "@types/prettier": "^2.0.0", + "chalk": "^4.0.0", + "expect": "^26.4.2", + "graceful-fs": "^4.2.4", + "jest-diff": "^26.4.2", + "jest-get-type": "^26.3.0", + "jest-haste-map": "^26.3.0", + "jest-matcher-utils": "^26.4.2", + "jest-message-util": "^26.3.0", + "jest-resolve": "^26.4.0", + "natural-compare": "^1.4.0", + "pretty-format": "^26.4.2", + "semver": "^7.3.2" }, "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-util": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz", + "integrity": "sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^2.0.0", + "micromatch": "^4.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, - "istanbul-lib-processinfo": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", - "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "jest-validate": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz", + "integrity": "sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==", "dev": true, "requires": { - "archy": "^1.0.0", - "cross-spawn": "^7.0.0", - "istanbul-lib-coverage": "^3.0.0-alpha.1", - "make-dir": "^3.0.0", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "uuid": "^3.3.3" + "@jest/types": "^26.3.0", + "camelcase": "^6.0.0", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "leven": "^3.1.0", + "pretty-format": "^26.4.2" }, "dependencies": { - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "glob": "^7.1.3" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "camelcase": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz", + "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==", "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "dependencies": { + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "pretty-format": { + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz", + "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -3887,69 +7255,98 @@ } } }, - "istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "jest-watcher": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz", + "integrity": "sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==", "dev": true, "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^26.3.0", + "string-length": "^4.0.1" }, "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "ms": "^2.1.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } }, - "istanbul-reports": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", - "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "iterate-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", - "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", - "dev": true - }, - "iterate-value": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", - "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", + "jest-worker": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", + "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { - "es-get-iterator": "^1.0.2", - "iterate-iterator": "^1.0.1" - } - }, - "jake": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", - "requires": { - "async": "0.9.x", - "chalk": "^2.4.2", - "filelist": "^1.0.1", - "minimatch": "^3.0.4" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" }, "dependencies": { - "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -3974,6 +7371,46 @@ } } }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "jsdom": { + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "dev": true, + "requires": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + } + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -3990,6 +7427,12 @@ "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -4002,6 +7445,12 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, "json5": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", @@ -4027,6 +7476,37 @@ "semver": "^5.6.0" } }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + } + } + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -4060,6 +7540,18 @@ "json-buffer": "3.0.0" } }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, "latest-version": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", @@ -4069,6 +7561,21 @@ "package-json": "^6.3.0" } }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "^1.0.0" + } + }, + "leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -4304,6 +7811,39 @@ } } }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "^0.2.0" + } + } + } + }, "load-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz", @@ -4334,6 +7874,12 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", + "dev": true + }, "lodash.flattendeep": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", @@ -4381,6 +7927,12 @@ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, "log-symbols": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", @@ -4629,9 +8181,34 @@ } }, "make-plural": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.2.1.tgz", - "integrity": "sha512-AmkruwJ9EjvyTv6AM8MBMK3TAeOJvhgTv5YQXzF0EP2qawhpvMjDpHvsdOIIT0Vn+BB0+IogmYZ1z+Ulm/m0Fg==" + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.2.2.tgz", + "integrity": "sha512-8iTuFioatnTTmb/YJjywkVIHLjcwkFD9Ms0JpxjEm9Mo8eQYkh1z+55dwv4yc1jQ8ftVBxWQbihvZL1DfzGGWA==", + "dev": true + }, + "makeerror": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", + "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "dev": true, + "requires": { + "tmpl": "1.0.x" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, + "requires": { + "object-visit": "^1.0.0" + } }, "markdown-escapes": { "version": "1.0.4", @@ -4654,7 +8231,8 @@ "math-interval-parser": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz", - "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==" + "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==", + "dev": true }, "mdast-util-compact": { "version": "2.0.1", @@ -4690,6 +8268,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-2.3.0.tgz", "integrity": "sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==", + "dev": true, "requires": { "make-plural": "^4.3.0", "messageformat-formatters": "^2.0.1", @@ -4700,6 +8279,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-4.3.0.tgz", "integrity": "sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==", + "dev": true, "requires": { "minimist": "^1.2.0" } @@ -4709,12 +8289,14 @@ "messageformat-formatters": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz", - "integrity": "sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==" + "integrity": "sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==", + "dev": true }, "messageformat-parser": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.3.tgz", - "integrity": "sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==" + "integrity": "sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==", + "dev": true }, "methods": { "version": "1.1.2", @@ -4791,6 +8373,27 @@ "minipass": "^2.9.0" } }, + "mixin-deep": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -5109,7 +8712,8 @@ "mustache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz", - "integrity": "sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==" + "integrity": "sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==", + "dev": true }, "mute-stream": { "version": "0.0.8", @@ -5117,6 +8721,25 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -5124,9 +8747,9 @@ "dev": true }, "needle": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz", - "integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", + "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -5149,24 +8772,55 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "nocache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz", - "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" - }, "node-addon-api": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.1.tgz", - "integrity": "sha512-2WVfwRfIr1AVn3dRq4yRc2Hn35ND+mPJH6inC6bjpYCZVrpXPB4j3T6i//OGVfqVsR1t/X/axRulDsheq4F0LQ==" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz", + "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==" + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", + "dev": true + }, + "node-modules-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", + "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=", + "dev": true + }, + "node-notifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz", + "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==", + "dev": true, + "optional": true, + "requires": { + "growly": "^1.3.0", + "is-wsl": "^2.2.0", + "semver": "^7.3.2", + "shellwords": "^0.1.1", + "uuid": "^8.3.0", + "which": "^2.0.2" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "optional": true + } + } }, "node-pre-gyp": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", - "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz", + "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==", "requires": { "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", + "mkdirp": "^0.5.3", + "needle": "^2.5.0", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", @@ -5226,6 +8880,18 @@ "osenv": "^0.1.4" } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -5285,6 +8951,12 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, "nyc": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", @@ -5445,11 +9117,54 @@ } } }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "object-inspect": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", @@ -5460,6 +9175,15 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, + "requires": { + "isobject": "^3.0.0" + } + }, "object.assign": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", @@ -5472,6 +9196,15 @@ "object-keys": "^1.0.11" } }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, + "requires": { + "isobject": "^3.0.1" + } + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -5526,6 +9259,15 @@ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "^1.0.0" + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -5546,6 +9288,18 @@ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", "dev": true }, + "p-each-series": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", + "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==", + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, "p-limit": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", @@ -5679,11 +9433,23 @@ "lines-and-columns": "^1.1.6" } }, + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "dev": true + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true + }, "passport": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz", @@ -5766,11 +9532,47 @@ "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=" }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, "picomatch": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "^2.0.0" + } + }, + "pirates": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", + "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", + "dev": true, + "requires": { + "node-modules-regexp": "^1.0.0" + } + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -5789,6 +9591,12 @@ "semver-compare": "^1.0.0" } }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -6054,6 +9862,16 @@ "with-callback": "^1.0.2" } }, + "prompts": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz", + "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.4" + } + }, "proxy-addr": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", @@ -6093,6 +9911,12 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -6172,6 +9996,67 @@ } } }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + }, + "dependencies": { + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + } + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + } + } + }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -6214,10 +10099,15 @@ "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz", "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=" }, - "referrer-policy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz", - "integrity": "sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA==" + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, + "requires": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + } }, "regexp-clone": { "version": "1.0.0", @@ -6321,16 +10211,91 @@ "xtend": "^4.0.1" } }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "replace-ext": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", - "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" - }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "repeat-element": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } + } + }, "request-ip": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/request-ip/-/request-ip-2.1.3.tgz", @@ -6339,6 +10304,38 @@ "is_js": "^0.9.0" } }, + "request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "requires": { + "lodash": "^4.17.19" + } + }, + "request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "dev": true, + "requires": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -6374,11 +10371,34 @@ "path-parse": "^1.0.6" } }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } + } + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "dev": true + }, "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -6398,6 +10418,12 @@ "signal-exit": "^3.0.2" } }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -6406,6 +10432,12 @@ "glob": "^7.1.3" } }, + "rsvp": { + "version": "4.8.5", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", + "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", + "dev": true + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -6426,6 +10458,15 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "~0.1.10" + } + }, "safejson": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/safejson/-/safejson-1.0.1.tgz", @@ -6436,6 +10477,226 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "sane": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz", + "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==", + "dev": true, + "requires": { + "@cnakazawa/watch": "^1.0.3", + "anymatch": "^2.0.0", + "capture-exit": "^2.0.0", + "exec-sh": "^0.3.2", + "execa": "^1.0.0", + "fb-watchman": "^2.0.0", + "micromatch": "^3.1.4", + "minimist": "^1.1.1", + "walker": "~1.0.5" + }, + "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "saslprep": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", @@ -6450,6 +10711,15 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "requires": { + "xmlchars": "^2.2.0" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -6551,6 +10821,29 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, + "set-value": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -6571,6 +10864,13 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shellwords": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "dev": true, + "optional": true + }, "sift": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", @@ -6581,6 +10881,12 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -6616,6 +10922,140 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==" }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, + "requires": { + "kind-of": "^3.2.0" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "socks": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz", @@ -6649,6 +11089,35 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, + "requires": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "dev": true + }, "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -6683,27 +11152,157 @@ } } }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz", + "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==", + "dev": true + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, + "requires": { + "extend-shallow": "^3.0.0" + } + }, "sprintf-js": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "stack-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz", + "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==", + "dev": true, + "requires": { + "escape-string-regexp": "^2.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + } + } }, "state-toggle": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz", "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==" }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true + }, "string-argv": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", "dev": true }, + "string-length": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz", + "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==", + "dev": true, + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -6785,6 +11384,12 @@ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -6822,6 +11427,39 @@ "has-flag": "^3.0.0" } }, + "supports-hyperlinks": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", + "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", + "dev": true, + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, "table": { "version": "5.4.6", "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", @@ -6894,6 +11532,16 @@ "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==", "dev": true }, + "terminal-link": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", + "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + } + }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -6910,6 +11558,12 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, + "throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", + "dev": true + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -6935,17 +11589,61 @@ "os-tmpdir": "~1.0.2" } }, + "tmpl": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", + "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "dev": true + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", "dev": true }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6988,6 +11686,26 @@ } } }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, "trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", @@ -7028,6 +11746,21 @@ "tslib": "^1.8.1" } }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -7237,6 +11970,18 @@ } } }, + "union-value": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" + } + }, "unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -7299,6 +12044,46 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true + } + } + }, "update-notifier": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz", @@ -7381,6 +12166,12 @@ "punycode": "^2.1.0" } }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true + }, "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -7390,6 +12181,12 @@ "prepend-http": "^2.0.0" } }, + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7411,6 +12208,35 @@ "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", "dev": true }, + "v8-to-istanbul": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz", + "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "validator": { "version": "13.1.17", "resolved": "https://registry.npmjs.org/validator/-/validator-13.1.17.tgz", @@ -7554,6 +12380,65 @@ } } }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dev": true, + "requires": { + "browser-process-hrtime": "^1.0.0" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "walker": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", + "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "dev": true, + "requires": { + "makeerror": "1.0.x" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "whatwg-url": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz", + "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -7626,6 +12511,12 @@ } } }, + "window-size": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", + "dev": true + }, "with-callback": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/with-callback/-/with-callback-1.0.2.tgz", @@ -7738,10 +12629,11 @@ "typedarray-to-buffer": "^3.1.5" } }, - "x-xss-protection": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz", - "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg==" + "ws": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", + "dev": true }, "xdg-basedir": { "version": "4.0.0", @@ -7749,6 +12641,18 @@ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, "xregexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", diff --git a/package.json b/package.json index 0b89cd4..513addf 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,42 @@ "scripts": { "start": "cross-env NODE_ENV=production pm2 start server.js", "mocha": "nyc mocha --timeout=5000 --exit", - "test": "npm run fresh && npm run mocha", - "dev": "cross-env NODE_ENV=development nodemon server.js", + "test": "npm run coverage:clean && npm run test:unit && npm run test:e2e && npm run coverage", + "test:unit": "NODE_ENV=test jest --coverage", + "test:e2e": "NODE_ENV=test npm run fresh && npm run mocha", + "dev": "cross-env NODE_ENV=development nodemon --inspect=9230 server.js", "fresh": "npm run clean && npm run seed", "clean": "node clean.js", "seed": "node seed.js", - "format": "prettier --write --config .prettierrc.json \"**/*.js\"", + "prettier": "prettier --write --config .prettierrc.json \"**/*.js\"", "lint": "eslint --fix --config .eslintrc.json \"**/*.js\"", - "remark": "remark . -o" + "remark": "remark . -o", + "coverage": "npm run coverage:merge && npm run coverage:merge-report", + "coverage:clean": "rm -rf .nyc_output && rm -rf coverage", + "coverage:merge": "istanbul-merge --out coverage/merged/coverage-final.json ./coverage/unit/coverage-final.json ./coverage/e2e/coverage-final.json", + "coverage:merge-report": "nyc report --reporter=lcov --reporter=text --reporter=json --temp-dir=./coverage/merged --report-dir=./coverage/merged" + }, + "nyc": { + "reporter": [ + "json", + "text", + "lcov" + ], + "report-dir": "coverage/e2e", + "include": [ + "**/*.js" + ], + "exclude": [ + "**/*.test.js", + "jest.config.js", + "**/data/**", + "**/node_modules/**", + "**/.history/**", + "**/test/**", + "**/coverage/**", + "**/tmp/**" + ], + "all": true }, "husky": { "hooks": { @@ -33,7 +61,7 @@ }, "dependencies": { "babel-eslint": "^10.1.0", - "bcrypt": "^4.0.1", + "bcrypt": "^5.0.0", "body-parser": "^1.19.0", "compression": "^1.7.4", "cors": "^2.8.5", @@ -44,8 +72,6 @@ "express": "^4.17.1", "express-expeditious": "^5.1.1", "express-validator": "^6.6.1", - "helmet": "^3.23.3", - "i18n": "^0.10.0", "jsonwebtoken": "^8.5.1", "mongoose": "^5.10.7", "mongoose-paginate-v2": "^1.3.9", @@ -68,8 +94,12 @@ "eslint-config-formidable": "^4.0.0", "eslint-config-prettier": "^6.12.0", "eslint-plugin-prettier": "^3.1.4", - "faker": "^4.1.0", + "faker": "^5.1.0", + "helmet": "^4.1.1", "husky": "^4.3.0", + "i18n": "^0.13.2", + "istanbul-merge": "^1.1.1", + "jest": "^26.4.2", "lint-staged": "^10.4.0", "mocha": "^8.1.3", "mongo-seeding": "^3.4.1", From fde5693b8c260ffbd67c9c60bc93b3935e134853 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 15:00:19 -0400 Subject: [PATCH 16/23] First unit test --- app/middleware/utils/handleError.test.js | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app/middleware/utils/handleError.test.js diff --git a/app/middleware/utils/handleError.test.js b/app/middleware/utils/handleError.test.js new file mode 100644 index 0000000..be2f939 --- /dev/null +++ b/app/middleware/utils/handleError.test.js @@ -0,0 +1,38 @@ +const { handleError } = require('./handleError') + +const mockResponse = () => { + const res = {} + res.status = jest.fn().mockReturnValueOnce(res) + res.json = jest.fn().mockReturnValueOnce(res) + return res +} + +const err = { + message: 'error', + code: 123 +} + +describe('handleError()', () => { + it('should send the error object with the code and message provided and print the error code, message in development mode', async () => { + process.env.NODE_ENV = 'development' + + const res = mockResponse() + + console.log = jest.fn() + + await handleError(res, err) + + expect(console.log).toHaveBeenCalledWith({ + code: 123, + message: 'error' + }) + + expect(res.status).toHaveBeenCalledWith(123) + + expect(res.json).toHaveBeenCalledWith({ + errors: { + msg: 'error' + } + }) + }) +}) From f40d71b9683b783fad60c29262ec748ad1fee650 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 15:17:37 -0400 Subject: [PATCH 17/23] Added defaulting on helpers --- .../auth/helpers/blockIsExpired.js | 4 +- app/controllers/auth/helpers/blockUser.js | 2 +- .../checkLoginAttemptsAndBlockExpires.js | 2 +- .../auth/helpers/checkPermissions.js | 6 +-- .../auth/helpers/findForgotPassword.js | 2 +- app/controllers/auth/helpers/findUser.js | 2 +- app/controllers/auth/helpers/findUserById.js | 2 +- .../auth/helpers/findUserToResetPassword.js | 2 +- .../auth/helpers/forgotPasswordResponse.js | 6 +-- app/controllers/auth/helpers/generateToken.js | 2 +- .../auth/helpers/getUserIdFromToken.js | 2 +- .../auth/helpers/markResetPasswordAsUsed.js | 2 +- .../auth/helpers/passwordsDoNotMatch.js | 2 +- app/controllers/auth/helpers/registerUser.js | 2 +- .../auth/helpers/returnRegisterToken.js | 9 ++-- .../auth/helpers/saveForgotPassword.js | 2 +- .../auth/helpers/saveLoginAttemptsToDB.js | 2 +- .../helpers/saveUserAccessAndReturnToken.js | 2 +- app/controllers/auth/helpers/setUserInfo.js | 2 +- .../auth/helpers/updatePassword.js | 2 +- app/controllers/auth/helpers/userIsBlocked.js | 2 +- .../auth/helpers/verificationExists.js | 2 +- app/controllers/auth/helpers/verifyUser.js | 2 +- app/controllers/cities/helpers/cityExists.js | 2 +- .../helpers/cityExistsExcludingItself.js | 2 +- .../profile/helpers/changePasswordInDB.js | 2 +- app/controllers/profile/helpers/findUser.js | 4 +- .../profile/helpers/getProfileFromDB.js | 2 +- .../profile/helpers/updateProfileInDB.js | 2 +- .../users/helpers/createItemInDb.js | 43 +++++++++++-------- 30 files changed, 64 insertions(+), 56 deletions(-) diff --git a/app/controllers/auth/helpers/blockIsExpired.js b/app/controllers/auth/helpers/blockIsExpired.js index 5dd88cc..89435c9 100644 --- a/app/controllers/auth/helpers/blockIsExpired.js +++ b/app/controllers/auth/helpers/blockIsExpired.js @@ -4,7 +4,7 @@ const LOGIN_ATTEMPTS = 5 * Checks that login attempts are greater than specified in constant and also that blockexpires is less than now * @param {Object} user - user object */ -const blockIsExpired = (user) => - user.loginAttempts > LOGIN_ATTEMPTS && user.blockExpires <= new Date() +const blockIsExpired = ({ loginAttempts = 0, blockExpires = '' }) => + loginAttempts > LOGIN_ATTEMPTS && blockExpires <= new Date() module.exports = { blockIsExpired } diff --git a/app/controllers/auth/helpers/blockUser.js b/app/controllers/auth/helpers/blockUser.js index 0341015..217f7d7 100644 --- a/app/controllers/auth/helpers/blockUser.js +++ b/app/controllers/auth/helpers/blockUser.js @@ -7,7 +7,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK * @param {Object} user - user object */ -const blockUser = (user) => { +const blockUser = (user = {}) => { return new Promise((resolve, reject) => { user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK) user.save((err, result) => { diff --git a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js index 2390fd9..6b4cb99 100644 --- a/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js +++ b/app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js @@ -5,7 +5,7 @@ const { buildErrObject } = require('../../../middleware/utils') * * @param {Object} user - user object. */ -const checkLoginAttemptsAndBlockExpires = (user) => { +const checkLoginAttemptsAndBlockExpires = (user = {}) => { return new Promise((resolve, reject) => { // Let user try to login again after blockexpires, resets user loginAttempts if (blockIsExpired(user)) { diff --git a/app/controllers/auth/helpers/checkPermissions.js b/app/controllers/auth/helpers/checkPermissions.js index 82ca6c2..691a7a9 100644 --- a/app/controllers/auth/helpers/checkPermissions.js +++ b/app/controllers/auth/helpers/checkPermissions.js @@ -6,11 +6,11 @@ const { itemNotFound, buildErrObject } = require('../../../middleware/utils') * @param {Object} data - data object * @param {*} next - next callback */ -const checkPermissions = (data, next) => { +const checkPermissions = ({ id = '', roles = [] }, next) => { return new Promise((resolve, reject) => { - User.findById(data.id, (err, result) => { + User.findById(id, (err, result) => { itemNotFound(err, result, 'NOT_FOUND') - if (data.roles.indexOf(result.role) > -1) { + if (roles.indexOf(result.role) > -1) { return resolve(next()) } return reject(buildErrObject(401, 'UNAUTHORIZED')) diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js index 5c10d82..302bb28 100644 --- a/app/controllers/auth/helpers/findForgotPassword.js +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Checks if a forgot password verification exists * @param {string} id - verification id */ -const findForgotPassword = (id) => { +const findForgotPassword = (id = '') => { return new Promise((resolve) => { ForgotPassword.findOne( { diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js index 9c95f24..993e7d1 100644 --- a/app/controllers/auth/helpers/findUser.js +++ b/app/controllers/auth/helpers/findUser.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Finds user by email * @param {string} email - user´s email */ -const findUser = (email) => { +const findUser = (email = '') => { return new Promise((resolve) => { User.findOne( { diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js index 1c9aead..3e79af4 100644 --- a/app/controllers/auth/helpers/findUserById.js +++ b/app/controllers/auth/helpers/findUserById.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Finds user by ID * @param {string} id - user´s id */ -const findUserById = (userId) => { +const findUserById = (userId = '') => { return new Promise((resolve) => { User.findById(userId, (err, item) => { itemNotFound(err, item, 'USER_DOES_NOT_EXIST') diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js index ce9331c..f57fd43 100644 --- a/app/controllers/auth/helpers/findUserToResetPassword.js +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Finds user by email to reset password * @param {string} email - user email */ -const findUserToResetPassword = (email) => { +const findUserToResetPassword = (email = '') => { return new Promise((resolve) => { User.findOne( { diff --git a/app/controllers/auth/helpers/forgotPasswordResponse.js b/app/controllers/auth/helpers/forgotPasswordResponse.js index 52736b0..a5d8390 100644 --- a/app/controllers/auth/helpers/forgotPasswordResponse.js +++ b/app/controllers/auth/helpers/forgotPasswordResponse.js @@ -2,15 +2,15 @@ * Builds an object with created forgot password object, if env is development or testing exposes the verification * @param {Object} item - created forgot password object */ -const forgotPasswordResponse = (item) => { +const forgotPasswordResponse = ({ email = '', verification = '' }) => { let data = { msg: 'RESET_EMAIL_SENT', - email: item.email + email } if (process.env.NODE_ENV !== 'production') { data = { ...data, - verification: item.verification + verification } } return data diff --git a/app/controllers/auth/helpers/generateToken.js b/app/controllers/auth/helpers/generateToken.js index c7f1d77..45a72ef 100644 --- a/app/controllers/auth/helpers/generateToken.js +++ b/app/controllers/auth/helpers/generateToken.js @@ -5,7 +5,7 @@ const { encrypt } = require('../../../middleware/auth') * Generates a token * @param {Object} user - user object */ -const generateToken = (user) => { +const generateToken = (user = '') => { // Gets expiration time const expiration = Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES diff --git a/app/controllers/auth/helpers/getUserIdFromToken.js b/app/controllers/auth/helpers/getUserIdFromToken.js index 57f20b9..55521f3 100644 --- a/app/controllers/auth/helpers/getUserIdFromToken.js +++ b/app/controllers/auth/helpers/getUserIdFromToken.js @@ -6,7 +6,7 @@ const { decrypt } = require('../../../middleware/auth') * Gets user id from token * @param {string} token - Encrypted and encoded token */ -const getUserIdFromToken = (token) => { +const getUserIdFromToken = (token = '') => { return new Promise((resolve, reject) => { // Decrypts, verifies and decode token jwt.verify(decrypt(token), process.env.JWT_SECRET, (err, decoded) => { diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js index a6fbd4d..4c63603 100644 --- a/app/controllers/auth/helpers/markResetPasswordAsUsed.js +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -11,7 +11,7 @@ const { * @param {Object} req - request object * @param {Object} forgot - forgot object */ -const markResetPasswordAsUsed = (req, forgot) => { +const markResetPasswordAsUsed = (req = {}, forgot = {}) => { return new Promise((resolve) => { forgot.used = true forgot.ipChanged = getIP(req) diff --git a/app/controllers/auth/helpers/passwordsDoNotMatch.js b/app/controllers/auth/helpers/passwordsDoNotMatch.js index 81c71da..a5e56cc 100644 --- a/app/controllers/auth/helpers/passwordsDoNotMatch.js +++ b/app/controllers/auth/helpers/passwordsDoNotMatch.js @@ -7,7 +7,7 @@ const LOGIN_ATTEMPTS = 5 * Adds one attempt to loginAttempts, then compares loginAttempts with the constant LOGIN_ATTEMPTS, if is less returns wrong password, else returns blockUser function * @param {Object} user - user object */ -const passwordsDoNotMatch = async (user) => { +const passwordsDoNotMatch = async (user = {}) => { return new Promise(async (resolve, reject) => { try { user.loginAttempts += 1 diff --git a/app/controllers/auth/helpers/registerUser.js b/app/controllers/auth/helpers/registerUser.js index 02fb5ae..7b48144 100644 --- a/app/controllers/auth/helpers/registerUser.js +++ b/app/controllers/auth/helpers/registerUser.js @@ -6,7 +6,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Registers a new user in database * @param {Object} req - request object */ -const registerUser = (req) => { +const registerUser = (req = {}) => { return new Promise((resolve, reject) => { const user = new User({ name: req.name, diff --git a/app/controllers/auth/helpers/returnRegisterToken.js b/app/controllers/auth/helpers/returnRegisterToken.js index 95bf874..eb6299e 100644 --- a/app/controllers/auth/helpers/returnRegisterToken.js +++ b/app/controllers/auth/helpers/returnRegisterToken.js @@ -5,13 +5,16 @@ const { generateToken } = require('./generateToken') * @param {Object} item - user object that contains created id * @param {Object} userInfo - user object */ -const returnRegisterToken = (item, userInfo) => { +const returnRegisterToken = ( + { _id = '', verification = '' }, + userInfo = {} +) => { return new Promise((resolve) => { if (process.env.NODE_ENV !== 'production') { - userInfo.verification = item.verification + userInfo.verification = verification } const data = { - token: generateToken(item._id), + token: generateToken(_id), user: userInfo } resolve(data) diff --git a/app/controllers/auth/helpers/saveForgotPassword.js b/app/controllers/auth/helpers/saveForgotPassword.js index 7cd5230..ef0efef 100644 --- a/app/controllers/auth/helpers/saveForgotPassword.js +++ b/app/controllers/auth/helpers/saveForgotPassword.js @@ -11,7 +11,7 @@ const { * Creates a new password forgot * @param {Object} req - request object */ -const saveForgotPassword = (req) => { +const saveForgotPassword = (req = {}) => { return new Promise((resolve, reject) => { const forgot = new ForgotPassword({ email: req.body.email, diff --git a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js index 75f26e3..ce3148c 100644 --- a/app/controllers/auth/helpers/saveLoginAttemptsToDB.js +++ b/app/controllers/auth/helpers/saveLoginAttemptsToDB.js @@ -4,7 +4,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Saves login attempts to dabatabse * @param {Object} user - user object */ -const saveLoginAttemptsToDB = (user) => { +const saveLoginAttemptsToDB = (user = {}) => { return new Promise((resolve, reject) => { user.save((err, result) => { if (err) { diff --git a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js index 85982b4..a07349c 100644 --- a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js +++ b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js @@ -13,7 +13,7 @@ const { * @param {Object} req - request object * @param {Object} user - user object */ -const saveUserAccessAndReturnToken = (req, user) => { +const saveUserAccessAndReturnToken = (req = {}, user = {}) => { return new Promise((resolve, reject) => { const userAccess = new UserAccess({ email: user.email, diff --git a/app/controllers/auth/helpers/setUserInfo.js b/app/controllers/auth/helpers/setUserInfo.js index ba5c256..0408b00 100644 --- a/app/controllers/auth/helpers/setUserInfo.js +++ b/app/controllers/auth/helpers/setUserInfo.js @@ -2,7 +2,7 @@ * Creates an object with user info * @param {Object} req - request object */ -const setUserInfo = (req) => { +const setUserInfo = (req = {}) => { return new Promise((resolve) => { let user = { _id: req._id, diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js index 8fc8cad..65aacb7 100644 --- a/app/controllers/auth/helpers/updatePassword.js +++ b/app/controllers/auth/helpers/updatePassword.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * @param {string} password - new password * @param {Object} user - user object */ -const updatePassword = (password, user) => { +const updatePassword = (password = '', user = {}) => { return new Promise((resolve) => { user.password = password user.save((err, item) => { diff --git a/app/controllers/auth/helpers/userIsBlocked.js b/app/controllers/auth/helpers/userIsBlocked.js index 2df7bf6..21b2de4 100644 --- a/app/controllers/auth/helpers/userIsBlocked.js +++ b/app/controllers/auth/helpers/userIsBlocked.js @@ -4,7 +4,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Checks if blockExpires from user is greater than now * @param {Object} user - user object */ -const userIsBlocked = (user) => { +const userIsBlocked = (user = {}) => { return new Promise((resolve, reject) => { if (user.blockExpires > new Date()) { return reject(buildErrObject(409, 'BLOCKED_USER')) diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js index e93876e..fef5980 100644 --- a/app/controllers/auth/helpers/verificationExists.js +++ b/app/controllers/auth/helpers/verificationExists.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Checks if verification id exists for user * @param {string} id - verification id */ -const verificationExists = (id) => { +const verificationExists = (id = '') => { return new Promise((resolve) => { User.findOne( { diff --git a/app/controllers/auth/helpers/verifyUser.js b/app/controllers/auth/helpers/verifyUser.js index a042307..7622060 100644 --- a/app/controllers/auth/helpers/verifyUser.js +++ b/app/controllers/auth/helpers/verifyUser.js @@ -4,7 +4,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Verifies an user * @param {Object} user - user object */ -const verifyUser = (user) => { +const verifyUser = (user = {}) => { return new Promise((resolve, reject) => { user.verified = true user.save((err, item) => { diff --git a/app/controllers/cities/helpers/cityExists.js b/app/controllers/cities/helpers/cityExists.js index 51fa5a4..59e7981 100644 --- a/app/controllers/cities/helpers/cityExists.js +++ b/app/controllers/cities/helpers/cityExists.js @@ -5,7 +5,7 @@ const { buildErrObject } = require('../../../middleware/utils') * Checks if a city already exists in database * @param {string} name - name of item */ -const cityExists = (name) => { +const cityExists = (name = '') => { return new Promise((resolve, reject) => { City.findOne( { diff --git a/app/controllers/cities/helpers/cityExistsExcludingItself.js b/app/controllers/cities/helpers/cityExistsExcludingItself.js index d157aa7..abfb828 100644 --- a/app/controllers/cities/helpers/cityExistsExcludingItself.js +++ b/app/controllers/cities/helpers/cityExistsExcludingItself.js @@ -6,7 +6,7 @@ const { buildErrObject } = require('../../../middleware/utils') * @param {string} id - id of item * @param {string} name - name of item */ -const cityExistsExcludingItself = (id, name) => { +const cityExistsExcludingItself = (id = '', name = '') => { return new Promise((resolve, reject) => { City.findOne( { diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js index e1f1f7b..3011087 100644 --- a/app/controllers/profile/helpers/changePasswordInDB.js +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -10,7 +10,7 @@ const { * @param {string} id - user id * @param {Object} req - request object */ -const changePasswordInDB = (id, req) => { +const changePasswordInDB = (id = '', req = {}) => { return new Promise((resolve, reject) => { User.findById(id, '+password', (err, user) => { itemNotFound(err, user, 'NOT_FOUND') diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js index 566b190..211a87e 100644 --- a/app/controllers/profile/helpers/findUser.js +++ b/app/controllers/profile/helpers/findUser.js @@ -3,9 +3,9 @@ const { itemNotFound } = require('../../../middleware/utils') /** * Finds user by id - * @param {string} email - user id + * @param {string} id - user id */ -const findUser = (id) => { +const findUser = (id = '') => { return new Promise((resolve) => { User.findById(id, 'password email', (err, user) => { itemNotFound(err, user, 'USER_DOES_NOT_EXIST') diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js index a044da9..efb4786 100644 --- a/app/controllers/profile/helpers/getProfileFromDB.js +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../../middleware/utils') * Gets profile from database by id * @param {string} id - user id */ -const getProfileFromDB = (id) => { +const getProfileFromDB = (id = '') => { return new Promise((resolve) => { User.findById(id, '-_id -updatedAt -createdAt', (err, user) => { itemNotFound(err, user, 'NOT_FOUND') diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js index aa6205f..f79fc00 100644 --- a/app/controllers/profile/helpers/updateProfileInDB.js +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -6,7 +6,7 @@ const { itemNotFound } = require('../../../middleware/utils') * @param {Object} req - request object * @param {string} id - user id */ -const updateProfileInDB = (req, id) => { +const updateProfileInDB = (req = {}, id = '') => { return new Promise((resolve) => { User.findByIdAndUpdate( id, diff --git a/app/controllers/users/helpers/createItemInDb.js b/app/controllers/users/helpers/createItemInDb.js index 7f54a89..3d75a43 100644 --- a/app/controllers/users/helpers/createItemInDb.js +++ b/app/controllers/users/helpers/createItemInDb.js @@ -6,33 +6,38 @@ const { buildErrObject } = require('../../../middleware/utils') * Creates a new item in database * @param {Object} req - request object */ -const createItemInDb = (req) => { +const createItemInDb = ({ + name = '', + email = '', + password = '', + role = '', + phone = '', + city = '', + country = '' +}) => { return new Promise((resolve, reject) => { const user = new User({ - name: req.name, - email: req.email, - password: req.password, - role: req.role, - phone: req.phone, - city: req.city, - country: req.country, + name, + email, + password, + role, + phone, + city, + country, verification: uuid.v4() }) user.save((err, item) => { if (err) { reject(buildErrObject(422, err.message)) } - // Removes properties with rest operator - const removeProperties = ({ - // eslint-disable-next-line no-unused-vars - password, - // eslint-disable-next-line no-unused-vars - blockExpires, - // eslint-disable-next-line no-unused-vars - loginAttempts, - ...rest - }) => rest - resolve(removeProperties(item.toObject())) + + item = JSON.parse(JSON.stringify(item)) + + delete item.password + delete item.blockExpires + delete item.loginAttempts + + resolve(item) }) }) } From 8e0c2f1148c058ed8b19c72d980bf9e016ec244a Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 15:37:30 -0400 Subject: [PATCH 18/23] Missing try/catches --- .../auth/helpers/checkPermissions.js | 14 ++++++---- .../auth/helpers/findForgotPassword.js | 11 +++++--- app/controllers/auth/helpers/findUser.js | 11 +++++--- app/controllers/auth/helpers/findUserById.js | 11 +++++--- .../auth/helpers/findUserToResetPassword.js | 11 +++++--- .../auth/helpers/markResetPasswordAsUsed.js | 11 +++++--- .../auth/helpers/updatePassword.js | 11 +++++--- .../auth/helpers/verificationExists.js | 11 +++++--- .../profile/helpers/changePasswordInDB.js | 26 +++++++++++-------- app/controllers/profile/helpers/findUser.js | 11 +++++--- .../profile/helpers/getProfileFromDB.js | 11 +++++--- .../profile/helpers/updateProfileInDB.js | 11 +++++--- app/middleware/auth/checkPassword.js | 2 +- app/middleware/auth/decrypt.js | 2 +- app/middleware/auth/encrypt.js | 2 +- app/middleware/db/buildSort.js | 2 +- app/middleware/db/checkQueryString.js | 2 +- app/middleware/db/cleanPaginationID.js | 2 +- app/middleware/db/createItem.js | 2 +- app/middleware/db/deleteItem.js | 13 +++++++--- app/middleware/db/getItem.js | 12 ++++++--- app/middleware/db/getItems.js | 2 +- app/middleware/db/listInitOptions.js | 2 +- app/middleware/db/updateItem.js | 12 ++++++--- app/middleware/emailer/emailExists.js | 2 +- .../emailer/emailExistsExcludingMyself.js | 2 +- app/middleware/emailer/prepareToSendEmail.js | 2 +- app/middleware/emailer/sendEmail.js | 2 +- .../emailer/sendRegistrationEmailMessage.js | 2 +- .../emailer/sendResetPasswordEmailMessage.js | 2 +- app/middleware/utils/buildErrObject.js | 2 +- app/middleware/utils/buildSuccObject.js | 2 +- app/middleware/utils/getBrowserInfo.js | 2 +- app/middleware/utils/getCountry.js | 4 +-- app/middleware/utils/handleError.js | 2 +- app/middleware/utils/isIDGood.js | 2 +- app/middleware/utils/itemNotFound.js | 3 +-- 37 files changed, 152 insertions(+), 82 deletions(-) diff --git a/app/controllers/auth/helpers/checkPermissions.js b/app/controllers/auth/helpers/checkPermissions.js index 691a7a9..d448241 100644 --- a/app/controllers/auth/helpers/checkPermissions.js +++ b/app/controllers/auth/helpers/checkPermissions.js @@ -8,12 +8,16 @@ const { itemNotFound, buildErrObject } = require('../../../middleware/utils') */ const checkPermissions = ({ id = '', roles = [] }, next) => { return new Promise((resolve, reject) => { - User.findById(id, (err, result) => { - itemNotFound(err, result, 'NOT_FOUND') - if (roles.indexOf(result.role) > -1) { - return resolve(next()) + User.findById(id, async (err, result) => { + try { + await itemNotFound(err, result, 'USER_NOT_FOUND') + if (roles.indexOf(result.role) > -1) { + return resolve(next()) + } + reject(buildErrObject(401, 'UNAUTHORIZED')) + } catch (error) { + reject(error) } - return reject(buildErrObject(401, 'UNAUTHORIZED')) }) }) } diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js index 302bb28..f130159 100644 --- a/app/controllers/auth/helpers/findForgotPassword.js +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -1,5 +1,6 @@ const ForgotPassword = require('../../../models/forgotPassword') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Checks if a forgot password verification exists @@ -12,9 +13,13 @@ const findForgotPassword = (id = '') => { verification: id, used: false }, - (err, item) => { - itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED') - resolve(item) + async (err, item) => { + try { + await itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED') + resolve(item) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js index 993e7d1..791ccd7 100644 --- a/app/controllers/auth/helpers/findUser.js +++ b/app/controllers/auth/helpers/findUser.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Finds user by email @@ -12,9 +13,13 @@ const findUser = (email = '') => { email }, 'password loginAttempts blockExpires name email role verified verification', - (err, item) => { - itemNotFound(err, item, 'USER_DOES_NOT_EXIST') - resolve(item) + async (err, item) => { + try { + await itemNotFound(err, item, 'USER_DOES_NOT_EXIST') + resolve(item) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js index 3e79af4..7a3da12 100644 --- a/app/controllers/auth/helpers/findUserById.js +++ b/app/controllers/auth/helpers/findUserById.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Finds user by ID @@ -7,9 +8,13 @@ const { itemNotFound } = require('../../../middleware/utils') */ const findUserById = (userId = '') => { return new Promise((resolve) => { - User.findById(userId, (err, item) => { - itemNotFound(err, item, 'USER_DOES_NOT_EXIST') - resolve(item) + User.findById(userId, async (err, item) => { + try { + await itemNotFound(err, item, 'USER_DOES_NOT_EXIST') + resolve(item) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js index f57fd43..8b6e568 100644 --- a/app/controllers/auth/helpers/findUserToResetPassword.js +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Finds user by email to reset password @@ -11,9 +12,13 @@ const findUserToResetPassword = (email = '') => { { email }, - (err, user) => { - itemNotFound(err, user, 'NOT_FOUND') - resolve(user) + async (err, user) => { + try { + await itemNotFound(err, user, 'NOT_FOUND') + resolve(user) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js index 4c63603..205924f 100644 --- a/app/controllers/auth/helpers/markResetPasswordAsUsed.js +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -1,3 +1,4 @@ +const { reject } = require('bcrypt/promises') const { getIP, getBrowserInfo, @@ -17,9 +18,13 @@ const markResetPasswordAsUsed = (req = {}, forgot = {}) => { forgot.ipChanged = getIP(req) forgot.browserChanged = getBrowserInfo(req) forgot.countryChanged = getCountry(req) - forgot.save((err, item) => { - itemNotFound(err, item, 'NOT_FOUND') - resolve(buildSuccObject('PASSWORD_CHANGED')) + forgot.save(async (err, item) => { + try { + await itemNotFound(err, item, 'NOT_FOUND') + resolve(buildSuccObject('PASSWORD_CHANGED')) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js index 65aacb7..89bf677 100644 --- a/app/controllers/auth/helpers/updatePassword.js +++ b/app/controllers/auth/helpers/updatePassword.js @@ -1,3 +1,4 @@ +const { reject } = require('bcrypt/promises') const { itemNotFound } = require('../../../middleware/utils') /** @@ -8,9 +9,13 @@ const { itemNotFound } = require('../../../middleware/utils') const updatePassword = (password = '', user = {}) => { return new Promise((resolve) => { user.password = password - user.save((err, item) => { - itemNotFound(err, item, 'NOT_FOUND') - resolve(item) + user.save(async (err, item) => { + try { + await itemNotFound(err, item, 'NOT_FOUND') + resolve(item) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js index fef5980..a9adc97 100644 --- a/app/controllers/auth/helpers/verificationExists.js +++ b/app/controllers/auth/helpers/verificationExists.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Checks if verification id exists for user @@ -12,9 +13,13 @@ const verificationExists = (id = '') => { verification: id, verified: false }, - (err, user) => { - itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED') - resolve(user) + async (err, user) => { + try { + await itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED') + resolve(user) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/controllers/profile/helpers/changePasswordInDB.js b/app/controllers/profile/helpers/changePasswordInDB.js index 3011087..5dd12c0 100644 --- a/app/controllers/profile/helpers/changePasswordInDB.js +++ b/app/controllers/profile/helpers/changePasswordInDB.js @@ -12,19 +12,23 @@ const { */ const changePasswordInDB = (id = '', req = {}) => { return new Promise((resolve, reject) => { - User.findById(id, '+password', (err, user) => { - itemNotFound(err, user, 'NOT_FOUND') + User.findById(id, '+password', async (err, user) => { + try { + await itemNotFound(err, user, 'NOT_FOUND') - // Assigns new password to user - user.password = req.newPassword + // Assigns new password to user + user.password = req.newPassword - // Saves in DB - user.save((error) => { - if (err) { - return reject(buildErrObject(422, error.message)) - } - resolve(buildSuccObject('PASSWORD_CHANGED')) - }) + // Saves in DB + user.save((error) => { + if (err) { + return reject(buildErrObject(422, error.message)) + } + resolve(buildSuccObject('PASSWORD_CHANGED')) + }) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js index 211a87e..b9ac635 100644 --- a/app/controllers/profile/helpers/findUser.js +++ b/app/controllers/profile/helpers/findUser.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Finds user by id @@ -7,9 +8,13 @@ const { itemNotFound } = require('../../../middleware/utils') */ const findUser = (id = '') => { return new Promise((resolve) => { - User.findById(id, 'password email', (err, user) => { - itemNotFound(err, user, 'USER_DOES_NOT_EXIST') - resolve(user) + User.findById(id, 'password email', async (err, user) => { + try { + await itemNotFound(err, user, 'USER_DOES_NOT_EXIST') + resolve(user) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js index efb4786..cf0cdbb 100644 --- a/app/controllers/profile/helpers/getProfileFromDB.js +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Gets profile from database by id @@ -7,9 +8,13 @@ const { itemNotFound } = require('../../../middleware/utils') */ const getProfileFromDB = (id = '') => { return new Promise((resolve) => { - User.findById(id, '-_id -updatedAt -createdAt', (err, user) => { - itemNotFound(err, user, 'NOT_FOUND') - resolve(user) + User.findById(id, '-_id -updatedAt -createdAt', async (err, user) => { + try { + await itemNotFound(err, user, 'NOT_FOUND') + resolve(user) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js index f79fc00..f566393 100644 --- a/app/controllers/profile/helpers/updateProfileInDB.js +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -1,5 +1,6 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') +const { reject } = require('bcrypt/promises') /** * Updates profile in database @@ -16,9 +17,13 @@ const updateProfileInDB = (req = {}, id = '') => { runValidators: true, select: '-role -_id -updatedAt -createdAt' }, - (err, user) => { - itemNotFound(err, user, 'NOT_FOUND') - resolve(user) + async (err, user) => { + try { + await itemNotFound(err, user, 'NOT_FOUND') + resolve(user) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/middleware/auth/checkPassword.js b/app/middleware/auth/checkPassword.js index 44bcc3f..2fd02ef 100644 --- a/app/middleware/auth/checkPassword.js +++ b/app/middleware/auth/checkPassword.js @@ -6,7 +6,7 @@ const { buildErrObject } = require('../../middleware/utils') * @param {Object} user - user object * @returns {boolean} */ -const checkPassword = (password, user) => { +const checkPassword = (password = '', user = {}) => { return new Promise((resolve, reject) => { user.comparePassword(password, (err, isMatch) => { if (err) { diff --git a/app/middleware/auth/decrypt.js b/app/middleware/auth/decrypt.js index bd9b3af..9ae7353 100644 --- a/app/middleware/auth/decrypt.js +++ b/app/middleware/auth/decrypt.js @@ -11,7 +11,7 @@ const iv = Buffer.alloc(16, 0) // Initialization crypto vector * Decrypts text * @param {string} text - text to decrypt */ -const decrypt = (text) => { +const decrypt = (text = '') => { const decipher = crypto.createDecipheriv(algorithm, key, iv) try { diff --git a/app/middleware/auth/encrypt.js b/app/middleware/auth/encrypt.js index 0057f38..c201e15 100644 --- a/app/middleware/auth/encrypt.js +++ b/app/middleware/auth/encrypt.js @@ -11,7 +11,7 @@ const iv = Buffer.alloc(16, 0) // Initialization crypto vector * Encrypts text * @param {string} text - text to encrypt */ -const encrypt = (text) => { +const encrypt = (text = '') => { const cipher = crypto.createCipheriv(algorithm, key, iv) let encrypted = cipher.update(text, 'utf8', 'hex') diff --git a/app/middleware/db/buildSort.js b/app/middleware/db/buildSort.js index af55ca1..b491ca6 100644 --- a/app/middleware/db/buildSort.js +++ b/app/middleware/db/buildSort.js @@ -3,7 +3,7 @@ * @param {string} sort - field to sort from * @param {number} order - order for query (1,-1) */ -const buildSort = (sort, order) => { +const buildSort = (sort = '', order = 1) => { const sortBy = {} sortBy[sort] = order return sortBy diff --git a/app/middleware/db/checkQueryString.js b/app/middleware/db/checkQueryString.js index 74d2424..62605c4 100644 --- a/app/middleware/db/checkQueryString.js +++ b/app/middleware/db/checkQueryString.js @@ -6,7 +6,7 @@ const { buildErrObject } = require('../../middleware/utils') * query.fields should be the fields to search into (array) * @param {Object} query - query object */ -const checkQueryString = (query) => { +const checkQueryString = (query = {}) => { return new Promise((resolve, reject) => { try { if ( diff --git a/app/middleware/db/cleanPaginationID.js b/app/middleware/db/cleanPaginationID.js index d824f3c..78c0dc1 100644 --- a/app/middleware/db/cleanPaginationID.js +++ b/app/middleware/db/cleanPaginationID.js @@ -2,7 +2,7 @@ * Hack for mongoose-paginate, removes 'id' from results * @param {Object} result - result object */ -const cleanPaginationID = (result) => { +const cleanPaginationID = (result = {}) => { result.docs.map((element) => delete element.id) return result } diff --git a/app/middleware/db/createItem.js b/app/middleware/db/createItem.js index 6079ad6..e1f82fd 100644 --- a/app/middleware/db/createItem.js +++ b/app/middleware/db/createItem.js @@ -4,7 +4,7 @@ const { buildErrObject } = require('../../middleware/utils') * Creates a new item in database * @param {Object} req - request object */ -const createItem = (req, model) => { +const createItem = (req = {}, model = {}) => { return new Promise((resolve, reject) => { model.create(req, (err, item) => { if (err) { diff --git a/app/middleware/db/deleteItem.js b/app/middleware/db/deleteItem.js index 36eb507..85c20ca 100644 --- a/app/middleware/db/deleteItem.js +++ b/app/middleware/db/deleteItem.js @@ -1,14 +1,19 @@ +const { reject } = require('bcrypt/promises') const { buildSuccObject, itemNotFound } = require('../../middleware/utils') /** * Deletes an item from database by id * @param {string} id - id of item */ -const deleteItem = (id, model) => { +const deleteItem = (id = '', model = {}) => { return new Promise((resolve) => { - model.findByIdAndRemove(id, (err, item) => { - itemNotFound(err, item, 'NOT_FOUND') - resolve(buildSuccObject('DELETED')) + model.findByIdAndRemove(id, async (err, item) => { + try { + await itemNotFound(err, item, 'NOT_FOUND') + resolve(buildSuccObject('DELETED')) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/middleware/db/getItem.js b/app/middleware/db/getItem.js index e67477d..e0d5ac4 100644 --- a/app/middleware/db/getItem.js +++ b/app/middleware/db/getItem.js @@ -4,11 +4,15 @@ const { itemNotFound } = require('../../middleware/utils') * Gets item from database by id * @param {string} id - item id */ -const getItem = (id, model) => { +const getItem = (id = '', model = {}) => { return new Promise((resolve, reject) => { - model.findById(id, (err, item) => { - itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(item) + model.findById(id, async (err, item) => { + try { + await itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(item) + } catch (error) { + reject(error) + } }) }) } diff --git a/app/middleware/db/getItems.js b/app/middleware/db/getItems.js index 1ba9ca0..17b564d 100644 --- a/app/middleware/db/getItems.js +++ b/app/middleware/db/getItems.js @@ -8,7 +8,7 @@ const { cleanPaginationID } = require('./cleanPaginationID') * @param {Object} req - request object * @param {Object} query - query object */ -const getItems = async (req, model, query) => { +const getItems = async (req = {}, model = {}, query = {}) => { const options = await listInitOptions(req) return new Promise((resolve, reject) => { model.paginate(query, options, (err, items) => { diff --git a/app/middleware/db/listInitOptions.js b/app/middleware/db/listInitOptions.js index 5e2da3c..20e7a4a 100644 --- a/app/middleware/db/listInitOptions.js +++ b/app/middleware/db/listInitOptions.js @@ -5,7 +5,7 @@ const { buildSort } = require('./buildSort') * Builds initial options for query * @param {Object} query - query object */ -const listInitOptions = (req) => { +const listInitOptions = (req = {}) => { return new Promise(async (resolve, reject) => { try { const order = req.query.order || -1 diff --git a/app/middleware/db/updateItem.js b/app/middleware/db/updateItem.js index 2a2cacf..f7c54ba 100644 --- a/app/middleware/db/updateItem.js +++ b/app/middleware/db/updateItem.js @@ -5,7 +5,7 @@ const { itemNotFound } = require('../../middleware/utils') * @param {string} id - item id * @param {Object} req - request object */ -const updateItem = (id, model, req) => { +const updateItem = (id = '', model = {}, req = {}) => { return new Promise((resolve, reject) => { model.findByIdAndUpdate( id, @@ -14,9 +14,13 @@ const updateItem = (id, model, req) => { new: true, runValidators: true }, - (err, item) => { - itemNotFound(err, item, reject, 'NOT_FOUND') - resolve(item) + async (err, item) => { + try { + await itemNotFound(err, item, reject, 'NOT_FOUND') + resolve(item) + } catch (error) { + reject(error) + } } ) }) diff --git a/app/middleware/emailer/emailExists.js b/app/middleware/emailer/emailExists.js index c8d7263..1b6f0fc 100644 --- a/app/middleware/emailer/emailExists.js +++ b/app/middleware/emailer/emailExists.js @@ -5,7 +5,7 @@ const { buildErrObject } = require('../../middleware/utils') * Checks User model if user with an specific email exists * @param {string} email - user email */ -const emailExists = (email) => { +const emailExists = (email = '') => { return new Promise((resolve, reject) => { User.findOne( { diff --git a/app/middleware/emailer/emailExistsExcludingMyself.js b/app/middleware/emailer/emailExistsExcludingMyself.js index c0af124..bc02272 100644 --- a/app/middleware/emailer/emailExistsExcludingMyself.js +++ b/app/middleware/emailer/emailExistsExcludingMyself.js @@ -6,7 +6,7 @@ const { buildErrObject } = require('../../middleware/utils') * @param {string} id - user id * @param {string} email - user email */ -const emailExistsExcludingMyself = (id, email) => { +const emailExistsExcludingMyself = (id = '', email = '') => { return new Promise((resolve, reject) => { User.findOne( { diff --git a/app/middleware/emailer/prepareToSendEmail.js b/app/middleware/emailer/prepareToSendEmail.js index 1b77efc..8be9f61 100644 --- a/app/middleware/emailer/prepareToSendEmail.js +++ b/app/middleware/emailer/prepareToSendEmail.js @@ -6,7 +6,7 @@ const { sendEmail } = require('./sendEmail') * @param {string} subject - subject * @param {string} htmlMessage - html message */ -const prepareToSendEmail = (user, subject, htmlMessage) => { +const prepareToSendEmail = (user = {}, subject = '', htmlMessage = '') => { user = { name: user.name, email: user.email, diff --git a/app/middleware/emailer/sendEmail.js b/app/middleware/emailer/sendEmail.js index d83b56c..661faa3 100644 --- a/app/middleware/emailer/sendEmail.js +++ b/app/middleware/emailer/sendEmail.js @@ -6,7 +6,7 @@ const mg = require('nodemailer-mailgun-transport') * @param {Object} data - data * @param {boolean} callback - callback */ -const sendEmail = async (data, callback) => { +const sendEmail = async (data = {}, callback) => { const auth = { auth: { // eslint-disable-next-line camelcase diff --git a/app/middleware/emailer/sendRegistrationEmailMessage.js b/app/middleware/emailer/sendRegistrationEmailMessage.js index 2ce591d..8918eaf 100644 --- a/app/middleware/emailer/sendRegistrationEmailMessage.js +++ b/app/middleware/emailer/sendRegistrationEmailMessage.js @@ -6,7 +6,7 @@ const { prepareToSendEmail } = require('./prepareToSendEmail') * @param {string} locale - locale * @param {Object} user - user object */ -const sendRegistrationEmailMessage = (locale, user) => { +const sendRegistrationEmailMessage = (locale = '', user = {}) => { i18n.setLocale(locale) const subject = i18n.__('registration.SUBJECT') const htmlMessage = i18n.__( diff --git a/app/middleware/emailer/sendResetPasswordEmailMessage.js b/app/middleware/emailer/sendResetPasswordEmailMessage.js index 818b5aa..edb6b57 100644 --- a/app/middleware/emailer/sendResetPasswordEmailMessage.js +++ b/app/middleware/emailer/sendResetPasswordEmailMessage.js @@ -6,7 +6,7 @@ const { prepareToSendEmail } = require('./prepareToSendEmail') * @param {string} locale - locale * @param {Object} user - user object */ -const sendResetPasswordEmailMessage = (locale, user) => { +const sendResetPasswordEmailMessage = (locale = '', user = {}) => { i18n.setLocale(locale) const subject = i18n.__('forgotPassword.SUBJECT') const htmlMessage = i18n.__( diff --git a/app/middleware/utils/buildErrObject.js b/app/middleware/utils/buildErrObject.js index 9a65bf7..3b82689 100644 --- a/app/middleware/utils/buildErrObject.js +++ b/app/middleware/utils/buildErrObject.js @@ -3,7 +3,7 @@ * @param {number} code - error code * @param {string} message - error text */ -const buildErrObject = (code, message) => { +const buildErrObject = (code = '', message = '') => { return { code, message diff --git a/app/middleware/utils/buildSuccObject.js b/app/middleware/utils/buildSuccObject.js index 9fe9761..c55c1f7 100644 --- a/app/middleware/utils/buildSuccObject.js +++ b/app/middleware/utils/buildSuccObject.js @@ -2,7 +2,7 @@ * Builds success object * @param {string} message - success text */ -const buildSuccObject = (message) => { +const buildSuccObject = (message = '') => { return { msg: message } diff --git a/app/middleware/utils/getBrowserInfo.js b/app/middleware/utils/getBrowserInfo.js index 6a6529b..90406e3 100644 --- a/app/middleware/utils/getBrowserInfo.js +++ b/app/middleware/utils/getBrowserInfo.js @@ -2,6 +2,6 @@ * Gets browser info from user * @param {*} req - request object */ -const getBrowserInfo = (req) => req.headers['user-agent'] +const getBrowserInfo = ({ headers }) => headers['user-agent'] module.exports = { getBrowserInfo } diff --git a/app/middleware/utils/getCountry.js b/app/middleware/utils/getCountry.js index 785fc6e..3e7ac82 100644 --- a/app/middleware/utils/getCountry.js +++ b/app/middleware/utils/getCountry.js @@ -2,7 +2,7 @@ * Gets country from user using CloudFlare header 'cf-ipcountry' * @param {*} req - request object */ -const getCountry = (req) => - req.headers['cf-ipcountry'] ? req.headers['cf-ipcountry'] : 'XX' +const getCountry = ({ headers }) => + headers['cf-ipcountry'] ? headers['cf-ipcountry'] : 'XX' module.exports = { getCountry } diff --git a/app/middleware/utils/handleError.js b/app/middleware/utils/handleError.js index c88b9d3..0a1ba77 100644 --- a/app/middleware/utils/handleError.js +++ b/app/middleware/utils/handleError.js @@ -3,7 +3,7 @@ * @param {Object} res - response object * @param {Object} err - error object */ -const handleError = (res, err) => { +const handleError = (res = {}, err = {}) => { // Prints error in console if (process.env.NODE_ENV === 'development') { console.log(err) diff --git a/app/middleware/utils/isIDGood.js b/app/middleware/utils/isIDGood.js index 8159f9c..246855f 100644 --- a/app/middleware/utils/isIDGood.js +++ b/app/middleware/utils/isIDGood.js @@ -5,7 +5,7 @@ const { buildErrObject } = require('./buildErrObject') * Checks if given ID is good for MongoDB * @param {string} id - id to check */ -const isIDGood = async (id) => { +const isIDGood = async (id = '') => { return new Promise((resolve, reject) => { const goodID = mongoose.Types.ObjectId.isValid(id) return goodID ? resolve(id) : reject(buildErrObject(422, 'ID_MALFORMED')) diff --git a/app/middleware/utils/itemNotFound.js b/app/middleware/utils/itemNotFound.js index f63c4af..987606a 100644 --- a/app/middleware/utils/itemNotFound.js +++ b/app/middleware/utils/itemNotFound.js @@ -4,10 +4,9 @@ const { buildErrObject } = require('./buildErrObject') * Item not found * @param {Object} err - error object * @param {Object} item - item result object - * @param {Object} reject - reject object * @param {string} message - message */ -const itemNotFound = (err, item, message) => { +const itemNotFound = (err = {}, item = {}, message = 'NOT_FOUND') => { return new Promise((resolve, reject) => { if (err) { return reject(buildErrObject(422, err.message)) From 08df999496020fccd2457e05c981efdb69ab09bf Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 15:46:50 -0400 Subject: [PATCH 19/23] Remove VS code auto added code --- app/controllers/auth/helpers/findForgotPassword.js | 3 +-- app/controllers/auth/helpers/findUser.js | 3 +-- app/controllers/auth/helpers/findUserById.js | 3 +-- app/controllers/auth/helpers/findUserToResetPassword.js | 3 +-- app/controllers/auth/helpers/markResetPasswordAsUsed.js | 3 +-- app/controllers/auth/helpers/updatePassword.js | 3 +-- app/controllers/auth/helpers/verificationExists.js | 3 +-- app/controllers/profile/helpers/findUser.js | 3 +-- app/controllers/profile/helpers/getProfileFromDB.js | 3 +-- app/controllers/profile/helpers/updateProfileInDB.js | 3 +-- app/middleware/db/deleteItem.js | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/controllers/auth/helpers/findForgotPassword.js b/app/controllers/auth/helpers/findForgotPassword.js index f130159..e07f6e2 100644 --- a/app/controllers/auth/helpers/findForgotPassword.js +++ b/app/controllers/auth/helpers/findForgotPassword.js @@ -1,13 +1,12 @@ const ForgotPassword = require('../../../models/forgotPassword') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Checks if a forgot password verification exists * @param {string} id - verification id */ const findForgotPassword = (id = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { ForgotPassword.findOne( { verification: id, diff --git a/app/controllers/auth/helpers/findUser.js b/app/controllers/auth/helpers/findUser.js index 791ccd7..c861509 100644 --- a/app/controllers/auth/helpers/findUser.js +++ b/app/controllers/auth/helpers/findUser.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Finds user by email * @param {string} email - user´s email */ const findUser = (email = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findOne( { email diff --git a/app/controllers/auth/helpers/findUserById.js b/app/controllers/auth/helpers/findUserById.js index 7a3da12..7bd9ba3 100644 --- a/app/controllers/auth/helpers/findUserById.js +++ b/app/controllers/auth/helpers/findUserById.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Finds user by ID * @param {string} id - user´s id */ const findUserById = (userId = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findById(userId, async (err, item) => { try { await itemNotFound(err, item, 'USER_DOES_NOT_EXIST') diff --git a/app/controllers/auth/helpers/findUserToResetPassword.js b/app/controllers/auth/helpers/findUserToResetPassword.js index 8b6e568..b87f580 100644 --- a/app/controllers/auth/helpers/findUserToResetPassword.js +++ b/app/controllers/auth/helpers/findUserToResetPassword.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Finds user by email to reset password * @param {string} email - user email */ const findUserToResetPassword = (email = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findOne( { email diff --git a/app/controllers/auth/helpers/markResetPasswordAsUsed.js b/app/controllers/auth/helpers/markResetPasswordAsUsed.js index 205924f..289634e 100644 --- a/app/controllers/auth/helpers/markResetPasswordAsUsed.js +++ b/app/controllers/auth/helpers/markResetPasswordAsUsed.js @@ -1,4 +1,3 @@ -const { reject } = require('bcrypt/promises') const { getIP, getBrowserInfo, @@ -13,7 +12,7 @@ const { * @param {Object} forgot - forgot object */ const markResetPasswordAsUsed = (req = {}, forgot = {}) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { forgot.used = true forgot.ipChanged = getIP(req) forgot.browserChanged = getBrowserInfo(req) diff --git a/app/controllers/auth/helpers/updatePassword.js b/app/controllers/auth/helpers/updatePassword.js index 89bf677..f421a4d 100644 --- a/app/controllers/auth/helpers/updatePassword.js +++ b/app/controllers/auth/helpers/updatePassword.js @@ -1,4 +1,3 @@ -const { reject } = require('bcrypt/promises') const { itemNotFound } = require('../../../middleware/utils') /** @@ -7,7 +6,7 @@ const { itemNotFound } = require('../../../middleware/utils') * @param {Object} user - user object */ const updatePassword = (password = '', user = {}) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { user.password = password user.save(async (err, item) => { try { diff --git a/app/controllers/auth/helpers/verificationExists.js b/app/controllers/auth/helpers/verificationExists.js index a9adc97..260c328 100644 --- a/app/controllers/auth/helpers/verificationExists.js +++ b/app/controllers/auth/helpers/verificationExists.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Checks if verification id exists for user * @param {string} id - verification id */ const verificationExists = (id = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findOne( { verification: id, diff --git a/app/controllers/profile/helpers/findUser.js b/app/controllers/profile/helpers/findUser.js index b9ac635..2e14474 100644 --- a/app/controllers/profile/helpers/findUser.js +++ b/app/controllers/profile/helpers/findUser.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Finds user by id * @param {string} id - user id */ const findUser = (id = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findById(id, 'password email', async (err, user) => { try { await itemNotFound(err, user, 'USER_DOES_NOT_EXIST') diff --git a/app/controllers/profile/helpers/getProfileFromDB.js b/app/controllers/profile/helpers/getProfileFromDB.js index cf0cdbb..d830e0d 100644 --- a/app/controllers/profile/helpers/getProfileFromDB.js +++ b/app/controllers/profile/helpers/getProfileFromDB.js @@ -1,13 +1,12 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Gets profile from database by id * @param {string} id - user id */ const getProfileFromDB = (id = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findById(id, '-_id -updatedAt -createdAt', async (err, user) => { try { await itemNotFound(err, user, 'NOT_FOUND') diff --git a/app/controllers/profile/helpers/updateProfileInDB.js b/app/controllers/profile/helpers/updateProfileInDB.js index f566393..e7875dc 100644 --- a/app/controllers/profile/helpers/updateProfileInDB.js +++ b/app/controllers/profile/helpers/updateProfileInDB.js @@ -1,6 +1,5 @@ const User = require('../../../models/user') const { itemNotFound } = require('../../../middleware/utils') -const { reject } = require('bcrypt/promises') /** * Updates profile in database @@ -8,7 +7,7 @@ const { reject } = require('bcrypt/promises') * @param {string} id - user id */ const updateProfileInDB = (req = {}, id = '') => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { User.findByIdAndUpdate( id, req, diff --git a/app/middleware/db/deleteItem.js b/app/middleware/db/deleteItem.js index 85c20ca..add87e8 100644 --- a/app/middleware/db/deleteItem.js +++ b/app/middleware/db/deleteItem.js @@ -1,4 +1,3 @@ -const { reject } = require('bcrypt/promises') const { buildSuccObject, itemNotFound } = require('../../middleware/utils') /** @@ -6,7 +5,7 @@ const { buildSuccObject, itemNotFound } = require('../../middleware/utils') * @param {string} id - id of item */ const deleteItem = (id = '', model = {}) => { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { model.findByIdAndRemove(id, async (err, item) => { try { await itemNotFound(err, item, 'NOT_FOUND') From 4ff1573aa21cefc6b8dbb5705bca0932b2515485 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 16:29:08 -0400 Subject: [PATCH 20/23] regen package.lock --- package-lock.json | 875 +++++++++++++++++++++++----------------------- 1 file changed, 441 insertions(+), 434 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bcdc45..dbc580e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2387,65 +2387,14 @@ "dev": true }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - } + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone-response": { @@ -2924,13 +2873,6 @@ "ast-types": "0.x.x", "escodegen": "1.x.x", "esprima": "3.x.x" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - } } }, "delayed-stream": { @@ -3147,7 +3089,6 @@ "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", @@ -3162,30 +3103,8 @@ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", "has-symbols": "^1.0.1", "object-keys": "^1.1.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", - "requires": { - "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" - } - } } } } @@ -3274,6 +3193,13 @@ "esutils": "^2.0.2", "optionator": "^0.8.1", "source-map": "~0.6.1" + }, + "dependencies": { + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + } } }, "eslint": { @@ -3560,9 +3486,9 @@ } }, "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" }, "esquery": { "version": "1.3.1", @@ -3612,29 +3538,61 @@ "dev": true }, "execa": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", - "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "pump": "^3.0.0" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -5335,11 +5293,6 @@ "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", "dev": true }, - "is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" - }, "is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -5405,10 +5358,9 @@ "dev": true }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-string": { "version": "1.0.5", @@ -5626,94 +5578,11 @@ "yargs": "^4.8.1" }, "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, "istanbul-lib-coverage": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz", "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==", "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yargs": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", - "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", - "dev": true, - "requires": { - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "lodash.assign": "^4.0.3", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.1", - "which-module": "^1.0.0", - "window-size": "^0.2.0", - "y18n": "^3.2.1", - "yargs-parser": "^2.4.1" - } - }, - "yargs-parser": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", - "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", - "dev": true, - "requires": { - "camelcase": "^3.0.0", - "lodash.assign": "^4.0.6" - } } } }, @@ -5892,6 +5761,17 @@ "has-flag": "^4.0.0" } }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", @@ -5932,6 +5812,49 @@ "@jest/types": "^26.3.0", "execa": "^4.0.0", "throat": "^5.0.0" + }, + "dependencies": { + "execa": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + } } }, "jest-config": { @@ -6939,6 +6862,17 @@ "has-flag": "^4.0.0" } }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", @@ -7699,20 +7633,61 @@ "ms": "2.1.2" } }, + "execa": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -8006,6 +7981,12 @@ "wrap-ansi": "^6.2.0" }, "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -8053,6 +8034,37 @@ "astral-regex": "^2.0.0", "is-fullwidth-code-point": "^3.0.0" } + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } } } }, @@ -8155,11 +8167,6 @@ "requires": { "ms": "2.1.2" } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" } } }, @@ -8435,6 +8442,12 @@ "yargs-unparser": "1.6.1" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, "chokidar": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", @@ -8451,6 +8464,17 @@ "readdirp": "~3.4.0" } }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -8460,12 +8484,24 @@ "ms": "^2.1.1" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -8482,6 +8518,12 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "js-yaml": { "version": "3.14.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", @@ -8528,6 +8570,26 @@ "picomatch": "^2.2.1" } }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -8542,6 +8604,90 @@ "requires": { "has-flag": "^4.0.0" } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -8927,12 +9073,20 @@ } }, "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^3.0.0" + "path-key": "^2.0.0" + }, + "dependencies": { + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + } } }, "npmlog": { @@ -10533,34 +10687,6 @@ } } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -10610,12 +10736,6 @@ } } }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -10646,36 +10766,6 @@ "remove-trailing-separator": "^1.0.1" } }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", @@ -10685,15 +10775,6 @@ "is-number": "^3.0.0", "repeat-string": "^1.6.1" } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } } } }, @@ -12534,73 +12615,13 @@ "dev": true }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -12681,105 +12702,69 @@ "dev": true }, "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", + "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } } } }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", + "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "^3.0.0", + "lodash.assign": "^4.0.6" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + } } }, "yargs-unparser": { @@ -12801,6 +12786,17 @@ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -12867,6 +12863,17 @@ "ansi-regex": "^4.1.0" } }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, "yargs": { "version": "14.2.3", "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", From 9c47e6f5e7e265d58684153cd4282c2161c89dbc Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 16:55:59 -0400 Subject: [PATCH 21/23] README updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2368993..db17e0c 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,7 @@ If you need to add more routes to the project just create a new file in `/app/ro ### Creating new controllers -When you create a new controller file, try to also create another file with validations. Ex. `countries.js` and `countries.validate.js`. An example of this is included in the repository. +When you create a new controller, try to also create another folder with validations and helpers. Ex. `/countries`, `/countries/validators` and `/countries/helpers`. An example of this is included in the repository. ## Bugs or improvements From 029690c42b8df7fe92ccb34619a92a3236ed2d04 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 17:17:04 -0400 Subject: [PATCH 22/23] Added try/catches --- app/controllers/auth/helpers/generateToken.js | 30 +++++++++++-------- .../helpers/saveUserAccessAndReturnToken.js | 22 ++++++++------ 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/app/controllers/auth/helpers/generateToken.js b/app/controllers/auth/helpers/generateToken.js index 45a72ef..674f437 100644 --- a/app/controllers/auth/helpers/generateToken.js +++ b/app/controllers/auth/helpers/generateToken.js @@ -6,22 +6,26 @@ const { encrypt } = require('../../../middleware/auth') * @param {Object} user - user object */ const generateToken = (user = '') => { - // Gets expiration time - const expiration = - Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES + try { + // Gets expiration time + const expiration = + Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES - // returns signed and encrypted token - return encrypt( - jwt.sign( - { - data: { - _id: user + // returns signed and encrypted token + return encrypt( + jwt.sign( + { + data: { + _id: user + }, + exp: expiration }, - exp: expiration - }, - process.env.JWT_SECRET + process.env.JWT_SECRET + ) ) - ) + } catch (error) { + throw error + } } module.exports = { generateToken } diff --git a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js index a07349c..96ac146 100644 --- a/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js +++ b/app/controllers/auth/helpers/saveUserAccessAndReturnToken.js @@ -21,16 +21,20 @@ const saveUserAccessAndReturnToken = (req = {}, user = {}) => { browser: getBrowserInfo(req), country: getCountry(req) }) - userAccess.save((err) => { - if (err) { - return reject(buildErrObject(422, err.message)) + userAccess.save(async (err) => { + try { + if (err) { + return reject(buildErrObject(422, err.message)) + } + const userInfo = await setUserInfo(user) + // Returns data with access token + resolve({ + token: generateToken(user._id), + user: userInfo + }) + } catch (error) { + reject(error) } - const userInfo = setUserInfo(user) - // Returns data with access token - resolve({ - token: generateToken(user._id), - user: userInfo - }) }) }) } From c8956e04b52de30af7b0b4a3c217de9171ba08e1 Mon Sep 17 00:00:00 2001 From: Daniel Avellaneda Date: Sat, 3 Oct 2020 17:21:56 -0400 Subject: [PATCH 23/23] Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 176c2d1..e5a8da1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## v9.0.0 (October 3, 2020) + +- Major breaking changes, now controllers and middleware is split in single files for more scalability and testability +- Added Jest setup +- Added first Jest test +- Added VS Code setup for debugging Jest and nodemon +- Added more reports for coverage, now there are three: 1 for Jest tests, 1 for mocha tests (end to end) and a 3rd that merges the previous 2. +- NPM updated + ## v8.1.5 (July 30, 2020) - NPM updated