From 3c744e96788cff72a0f64c1a89304cfd2c4091c8 Mon Sep 17 00:00:00 2001 From: Taha Date: Mon, 15 Feb 2021 13:42:18 -0600 Subject: [PATCH 001/100] Adding sec/spread (optional) parameter and better logs --- .../algo/algo_orders/RegisterDorman.cpp | 2 + .../orders/algo/algo_orders/SniperAlgo.cpp | 17 ++++--- .../algo/algo_orders/SniperAlgoCommon.h | 48 ++++++++++++++++--- 3 files changed, 54 insertions(+), 13 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 1e8441bcb..2fbaed126 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -260,6 +260,8 @@ extern "C" void init_sniper_plugin(bts::SparkServices &srv) { *sniper.add_param_desc() = param_bool("Include Future Polygons"); *sniper.add_param_desc() = param_uint32("Min Days To Exp"); *sniper.add_param_desc() = param_uint32("Max Days To Exp"); + *sniper.add_param_desc() = param_string("Futures"); + *sniper.add_param_desc() = param_string("Spreads"); // shots *sniper.add_param_desc() = param_bool("Shoot Real Orders"); *sniper.add_param_desc() = param_bool("Shut Down After Fire"); diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp index b0ad666b7..92a0ec95b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp @@ -423,11 +423,13 @@ bool SniperAlgo::_onetime_setup(IBeforeLaunchAlgoServices &serv, } if (resolved && passed_filter) resolved_polygons.push_back(p); - else - LOG(OrderMan, Info, - "SniperAlgo::_onetime_setup ok:{} ignoring polygon:{} " - "resolved:{} passes_filter:{}", - me->order_key, p.p_name, resolved, passed_filter); + else{ + if(!resolved) + LOG(OrderMan, Info, + "SniperAlgo::_onetime_setup ok:{} ignoring polygon:{} " + "resolved:{} passes_filter:{}", + me->order_key, p.p_name, resolved, passed_filter); + } } for (const auto &p : resolved_polygons) { const auto &sniper_polygon = add_polygon(p); @@ -611,8 +613,9 @@ void SniperAlgo::_fire_polygon_order(SniperPolygon& p, const auto& pq = p.curr_cross_value.get(p_side); uint32_t p_q = std::min(pq.q.value(), me->algo_params.max_shot_qty); // all constraints have been checked - LOG(OrderMan, Info, "Firing Polygon pid:{} f_imp:{} corid:{}", - p.pid, static_cast(f_imp), + LOG(OrderMan, Info, + "Firing Polygon pid:{} side:{} p:{} avl_q:{} corid:{}", + p.pid, p_side, pq.p, pq.q, me->algo_services->get_correlation_id().sn); for (auto &l : p.legs) { const auto& l_pq = l.cross_value.get(p_side); diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h index 2d226bc22..ba4aeaf6b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h @@ -20,6 +20,7 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" #include +#include #include #include @@ -39,9 +40,13 @@ struct SniperAlgoParams { // contracts // all legs of a polygon have to be present in this list std::set product_list; + // optional filter for futures, empty list is dont care + std::set futures; + // anologous to spread list + std::set spreads; bool include_future_polygons; uint32_t min_days_to_exp; - uint32_t max_days_to_exp; + uint32_t max_days_to_exp; // shots bool shoot_real_orders; bool shut_down_after_fire; @@ -314,7 +319,15 @@ void read_polygons(const std::string &file_n, std::vector &out_v, bool convert_params(const api::orderman::CustomOrderDefinition &cod, SniperAlgoParams &out_p) { - + auto tokenize = [](std::string txt, std::set& out_v){ + boost::algorithm::trim(txt); + if(txt.size()>0){ + std::vector toks; + boost::split(toks, txt, boost::is_any_of(",")); + for (auto &p : toks) + out_v.insert(p); + } + }; const api::orderman::DynamicOrderDefinition &def = cod.dynamic(); const auto ¶ms = def.order_params(); @@ -322,6 +335,8 @@ bool convert_params(const api::orderman::CustomOrderDefinition &cod, // contracts auto products = get_if(params, "Products"); auto include_future_polygons = get_if(params, "Include Future Polygons"); + auto futures = get_if(params, "Futures"); + auto spreads = get_if(params, "Spreads"); auto min_days_to_exp = get_if(params, "Min Days To Exp"); auto max_days_to_exp = get_if(params, "Max Days To Exp"); // shots @@ -357,7 +372,13 @@ bool convert_params(const api::orderman::CustomOrderDefinition &cod, boost::split(toks, products_str, boost::is_any_of(",")); for (auto &p : toks) out_p.product_list.insert(p); - out_p.include_future_polygons = include_future_polygons.value(); + out_p.include_future_polygons = include_future_polygons.value(); + + if(futures.has_value()) + tokenize(futures.value(), out_p.futures); + if(spreads.has_value()) + tokenize(spreads.value(), out_p.spreads); + out_p.min_days_to_exp = min_days_to_exp.value(); out_p.max_days_to_exp = max_days_to_exp.value(); @@ -463,6 +484,10 @@ long long usecs_since(const bts::datetime::PTime& ts){ return bts::datetime::usecs_since(ts); } +std::string sec_desc(const api::Security& sec){ + return sec.glbx().security_desc(); +} + void print_exp(const bts::api::Security& leg_sec){ auto print_fut_exp = [](const bts::api::Security& f_sec){ bts_assert(f_sec.has_future()); @@ -516,10 +541,21 @@ bool passes_filter(const bts::api::Security& leg_sec, const SniperAlgoParams& params){ const auto &prods = params.product_list; if(prods.find(leg_sec.symbol()) == prods.end()) - return false; - if(!params.include_future_polygons) - if(leg_sec.has_future()) + return false; + // future constraints + if(leg_sec.has_future()){ + if(!params.include_future_polygons) return false; + if(params.futures.size() > 0 && + params.futures.find(sec_desc(leg_sec)) == params.futures.end()) + return false; + } + if(leg_sec.has_spread()){ + if(params.spreads.size() > 0 && + params.spreads.find(sec_desc(leg_sec)) == params.spreads.end()) + return false; + } + // exp range constraints auto[min,max] = get_exp_range(leg_sec); if(min <= static_cast(params.min_days_to_exp) || max >= static_cast(params.max_days_to_exp)) From d23baec6d9cbbcb0729c916931a638b5f59cf3fd Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 10 Sep 2021 09:13:59 -0500 Subject: [PATCH 002/100] comments and los --- src/lib/md/MDProducer.cpp | 8 ++++---- src/lib/md/MDProducer.h | 11 +++++++---- src/lib/md/SecurityIndex.h | 18 +++++++++++------- src/lib/md/UserSymbol.h | 3 +++ src/lib/md/relay/QueryServer.h | 6 ++++-- .../actors/GLBXiLink3ExecutionGateway.cpp | 15 +++++++++++++++ 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/lib/md/MDProducer.cpp b/src/lib/md/MDProducer.cpp index 27998978d..5d482f2d8 100644 --- a/src/lib/md/MDProducer.cpp +++ b/src/lib/md/MDProducer.cpp @@ -50,8 +50,8 @@ class MDProducerImpl { // bytes"); } - MDProducerHandle - add_security(const FixedSecurity &security, SecurityMapper &smapper) { + MDProducerHandle add_security( + const FixedSecurity &security, SecurityMapper &smapper) { void *h_entry = nullptr; if (has_depth()) { h_entry = new (_hot.add(sizeof(HotDepthEntry))) HotDepthEntry(); @@ -184,8 +184,8 @@ MDProducerHandle MDProducer::add_security(const FixedSecurity &security) { return result; } -MDProducerChannel -MDProducer::get_channel(const char *symbol, SecurityType type, Venue exchange) { +MDProducerChannel MDProducer::get_channel( + const char *symbol, SecurityType type, Venue exchange) { std::lock_guard lock(*_mutex); return MDProducerChannel(get_producer(symbol, type, exchange)); } diff --git a/src/lib/md/MDProducer.h b/src/lib/md/MDProducer.h index 614391acc..99b3bb23b 100644 --- a/src/lib/md/MDProducer.h +++ b/src/lib/md/MDProducer.h @@ -37,6 +37,9 @@ constexpr bool operator&(const MDProducerFlags a, const MDProducerFlags b) { constexpr MDProducerFlags DefaultMDProducerFlags = MDProducerFlags::Shared + MDProducerFlags::SecurityMapper; +// All updates to a single security go through here. Assumes a single writer +// thread. MDP3Main constructs it and passes it to MDPListener (and subsquently +// the same for he other venue)) class BTS_EXPORT MDProducer { public: MDProducer( @@ -54,8 +57,8 @@ class BTS_EXPORT MDProducer { MDProducerHandle add_security(const FixedSecurity &security); // A Producer Channel holds data shared between the - MDProducerChannel - get_channel(const char *symbol, SecurityType type, Venue exchange); + MDProducerChannel get_channel( + const char *symbol, SecurityType type, Venue exchange); // Heartbeat all channels void heartbeat(); @@ -63,8 +66,8 @@ class BTS_EXPORT MDProducer { private: BTS_NO_COPY(MDProducer); - MDProducerImpl & - get_producer(const char *symbol, SecurityType type, Venue exchange); + MDProducerImpl &get_producer( + const char *symbol, SecurityType type, Venue exchange); std::unique_ptr _mutex; std::vector> _producers; diff --git a/src/lib/md/SecurityIndex.h b/src/lib/md/SecurityIndex.h index 231ff8c85..2e087fecf 100644 --- a/src/lib/md/SecurityIndex.h +++ b/src/lib/md/SecurityIndex.h @@ -19,7 +19,9 @@ namespace md { * Allows fast mapping of exchange id => SecurityData template type */ -template class SimpleSecurityIndex { +// unused +template +class SimpleSecurityIndex { public: SimpleSecurityIndex() : _map() {} ~SimpleSecurityIndex() {} @@ -46,7 +48,8 @@ template class SimpleSecurityIndex { return invalid_security_key; } - template void walk_security_list(CB cb) const { + template + void walk_security_list(CB cb) const { tbb::queuing_rw_mutex::scoped_lock lock(_mutex, false); for (const auto &pair : _map) { cb(*pair.second); @@ -54,8 +57,8 @@ template class SimpleSecurityIndex { } // Transfer ownership of the data to the index - SecurityData * - add_security(ExchangeKey key, std::unique_ptr entry) { + SecurityData *add_security( + ExchangeKey key, std::unique_ptr entry) { tbb::queuing_rw_mutex::scoped_lock lock(_mutex, true); // result is pair auto result = @@ -111,15 +114,16 @@ class ConcurrentSecurityIndex { return invalid_security_key; } - template void walk_security_list(CB cb) const { + template + void walk_security_list(CB cb) const { for (auto iter = _map.begin(); iter != _map.end(); ++iter) { cb(*iter->second); } } // Transfer ownership of the data to the index - SecurityData * - add_security(ExchangeKey key, std::unique_ptr entry) { + SecurityData *add_security( + ExchangeKey key, std::unique_ptr entry) { typename MapType::accessor accessor; if (_map.insert(accessor, key)) { // There is no delete security and concurrent_has_map does not yet diff --git a/src/lib/md/UserSymbol.h b/src/lib/md/UserSymbol.h index e384e3544..dc8e8c6aa 100644 --- a/src/lib/md/UserSymbol.h +++ b/src/lib/md/UserSymbol.h @@ -4,6 +4,9 @@ namespace bts { namespace md { +// Combines a symbol, exchange and type has utilities like comparisons, streams +// etc around it + struct UserSymbol { UserSymbol() : _symbol(), _exchange(), _type() {} UserSymbol(const std::string &s, api::Venue e, SecurityType t) diff --git a/src/lib/md/relay/QueryServer.h b/src/lib/md/relay/QueryServer.h index ca2e6f092..41b0ff874 100644 --- a/src/lib/md/relay/QueryServer.h +++ b/src/lib/md/relay/QueryServer.h @@ -21,6 +21,8 @@ namespace md { class MDClient; typedef boost::container::flat_set Entitlements; +// provides a polling interface on top of market data + struct IQueryServer { virtual ~IQueryServer() {} virtual void query( @@ -29,8 +31,8 @@ struct IQueryServer { const Entitlements *, bool) const = 0; }; -std::unique_ptr -create_query_server(MDClient &, metrics::MetricsContainer &); +std::unique_ptr create_query_server( + MDClient &, metrics::MetricsContainer &); struct QueryServer; typedef std::shared_ptr QueryServerPtr; diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp index fdf044ad1..dc55cdbe1 100644 --- a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp @@ -12,11 +12,18 @@ #include "lib/orderman/actors/ilink3/SessionStore.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" +#include namespace bts { namespace orderman { namespace ilink3 { +struct OrderStats { + size_t n_new_orders = 0; + size_t n_cxl_replaces = 0; + size_t n_cxls = 0; +}; + enum class GLBXiLink3ExecutionGateway::State { WAITING_FOR_SECURITIES, @@ -63,6 +70,7 @@ struct GLBXiLink3ExecutionGateway::PImpl { // to other threads std::vector replay_messages; bool has_replayed; + OrderStats order_stats = {}; }; GLBXiLink3ExecutionGateway::GLBXiLink3ExecutionGateway( @@ -245,6 +253,7 @@ void GLBXiLink3ExecutionGateway::send_msgs( auto create_ptr = std::get_if(&m); if (create_ptr) { me->gw->send_order(*create_ptr, corid); + me->order_stats.n_new_orders++; continue; } // CancelReplace @@ -255,16 +264,22 @@ void GLBXiLink3ExecutionGateway::send_msgs( cancel_replace_ptr->exchange_order_id); me->gw->send_cancel_replace(*cancel_replace_ptr, corid); + me->order_stats.n_cxl_replaces++; continue; } // Cancel auto cancel_ptr = std::get_if(&m); if (cancel_ptr) { me->gw->send_cancel(*cancel_ptr, corid); + me->order_stats.n_cxls++; continue; } } me->gw->flush(); + LOG(OrderMan, Info, + "Order Stats n_new_orders:{} n_cxl_replaces:{} n_cxls:{}", + me->order_stats.n_new_orders, me->order_stats.n_cxl_replaces, + me->order_stats.n_cxls); } } From 43c3584dd2d0d7f04caca1824836915ff28e857c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 21 Sep 2021 13:18:46 -0500 Subject: [PATCH 003/100] unified market data interface on which we will connect to crypto exchanges --- src/lib/md/emumba/IMarketDataListener.h | 32 +++ src/lib/md/emumba/MarketDataCommon.h | 222 ++++++++++++++++++ src/lib/md/emumba/MarketDataGateway.h | 34 +++ .../spreader_orders/tests/spreader_tests.cpp | 3 + 4 files changed, 291 insertions(+) create mode 100644 src/lib/md/emumba/IMarketDataListener.h create mode 100644 src/lib/md/emumba/MarketDataCommon.h create mode 100644 src/lib/md/emumba/MarketDataGateway.h diff --git a/src/lib/md/emumba/IMarketDataListener.h b/src/lib/md/emumba/IMarketDataListener.h new file mode 100644 index 000000000..86a01c508 --- /dev/null +++ b/src/lib/md/emumba/IMarketDataListener.h @@ -0,0 +1,32 @@ +#pragma once +#include + +namespace EMumbaMarketData { + +class Security; +class SecurityState; +class SecurityMarketDataStatistics; +class Book; +class TradeRecord; +class MarketDataError; +struct RFQ; + +// The is the interface that registers itself to IMarketDataGateway and receives +// all market data via callbacks. These callbacks are always on the same thread. +class IMarketDataListener { + // complete list of all securities. as securities are added subsequent calls + // on this callback are made. IMarketDataGateway guarantees that a security + // is seen via on_securities first, before any other data callbacks on that + // security are made. + virtual void on_securities( + const std::vector &complete_security_list) = 0; + virtual void on_security_state(const SecurityState &security_state); + virtual void on_security_statistics( + const SecurityMarketDataStatistics &security_stats); + virtual void on_book(const Book &book) = 0; + virtual void on_trades(const std::vector &trades) = 0; + virtual void on_rfqs(const std::vector &rfqs) = 0; + virtual void on_error(const MarketDataError &error) = 0; +}; + +} // namespace EMumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h new file mode 100644 index 000000000..29290ec03 --- /dev/null +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -0,0 +1,222 @@ +#pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace EMumbaMarketData { + +// placed a bunch of common types here. Need to be exctracted out to their own +// classes/files + +// wrapper around primitive types, so that SecurityID, OrderID, Quantity etc +// are types instead of size_t, uint32_t etc +template +class ValueWrapper { + public: + constexpr ValueWrapper() = default; + ~ValueWrapper() = default; + constexpr explicit ValueWrapper(ValueT const &v) : _v(v) {} + constexpr explicit ValueWrapper(ValueT &&v) : _v(std::move(v)) {} + + constexpr ValueWrapper(ValueWrapper const &v) = default; + constexpr ValueWrapper(ValueWrapper &&v) noexcept = default; + ValueWrapper &operator=(ValueWrapper const &v) = default; + ValueWrapper &operator=(ValueWrapper &&v) noexcept = default; + + constexpr bool operator==(ValueWrapper const &v) const { return _v == v._v; } + constexpr bool operator!=(ValueWrapper const &v) const { return _v != v._v; } + constexpr bool operator<(ValueWrapper const &v) const { return _v < v._v; } + constexpr bool operator<=(ValueWrapper const &v) const { return _v <= v._v; } + constexpr bool operator>(ValueWrapper const &v) const { return _v > v._v; } + constexpr bool operator>=(ValueWrapper const &v) const { return _v >= v._v; } + constexpr ValueT const &value() const { return _v; } + constexpr ValueT &value() { return _v; } + + private: + ValueT _v; +}; + +using Quantity = ValueWrapper; +using SecurityID = ValueWrapper; +using MarketDataListenerID = + ValueWrapper; + +// more types will be needed there like spots etc +enum class SecurityType { FUTURE, SPREAD, OPTION }; + +// Usually exchanges give price's as mantissa and exponent. The fastest way is +// to keep it like that and do the math in integers vs doubles (I can give you a +// complete implementation of this - this is just a placeholder for now) +class Price { + public: + constexpr Price() = default; + constexpr Price(std::int64_t mantissa) noexcept : _mantissa(mantissa) {} + constexpr Price(Price const &) = default; + constexpr bool is_nan() const { + return _mantissa == std::numeric_limits::min(); + } + inline constexpr double to_double() const noexcept { + return is_nan() ? std::numeric_limits::quiet_NaN() + : _mantissa * pow10(); + } + inline constexpr double pow10() const noexcept { + return std::pow(10.0, exp); + } + // all math operators should be overloaded here (I can send the whole thing) + constexpr bool operator==(const Price &o) const noexcept { + return _mantissa == o._mantissa; + } + constexpr bool operator<(const Price &o) const noexcept { + return _mantissa < o._mantissa; + } + constexpr Price &operator+=(const Price &o) noexcept { + _mantissa += o._mantissa; + return *this; + } + + private: + // 9 decimal places is the max we have seen. cryptos might be different + const std::int8_t exp{-9}; + std::int64_t _mantissa{0}; +}; + +enum class Venue { Glbx = 0, Deribit = 1, Huobi = 2, Binance = 3, FTX }; + +// subscription parameters, ex: this is what we have for glbx +// feed_handler { +// name: "360" # COMEX Globex Futures +// incremental_a { group: "224.0.31.192" port: 14360} +// incremental_b { group: "224.0.32.192" port: 15360} +// instrument { group: "224.0.31.212" port: 14360} +// snapshot_mbo { group: "233.72.75.21" port: 23360} +// interface_a: "172.17.248.30" +// interface_b: "172.17.249.30" +// process_mbo: false +// process_trades: false +// } +// (I can give a complete implementation of GlbxMarketDataSubscription) +struct GlbxMarketDataSubscription {}; + +struct DeribitMarketDataSubscription {}; + +struct MarketDataGatewaySubscription { + const Venue venue; + const std::variant + subscription = {DeribitMarketDataSubscription{}}; +}; + +// I can send this whole class later but its a nice wrapper around the linux +// posix time +struct TimeStamp { + private: + // posix time + uint64_t _v{}; +}; + +enum class Side { BUY, SIDE }; + +// All the security common params, ie regardless of Future, Spot, Spread etc +class SecurityCommon { + public: + Venue venue; + SecurityID _security_id{}; + SecurityType security_type; + double display_factor{}; + double cash_per_point{}; + std::string symbol; + std::string security_group; + std::string asset; + Price min_price_increment{}; + double min_price_increment_ammount = 0; + bool implied_matching = false; + std::string cme_security_type; +}; + +class FutureSecurity { + public: + SecurityCommon security_definition; + TimeStamp expiration; +}; + +struct LegDefinition { + SecurityID security_id; + Quantity leg_mult; + Side side; +}; + +class SpreadSecurity { + public: + SecurityCommon security_definition; + std::vector legs; +}; + +struct Security { + SecurityCommon security_common; + std::variant security; + SecurityType security_type() const { + if (std::holds_alternative(security)) { + return SecurityType::FUTURE; + } else { + return SecurityType::SPREAD; + } + } +}; + +struct BookLevel { + const Price price = {}; + const Quantity total_qty = {}; + const Quantity direct_qty = {}; + size_t n_orders = {}; + Quantity implied_qty() const { return Quantity{}; } +}; + +struct BookSide { + // compile time size for speed + std::array blevel; +}; + +struct Book { + BookSide bids; + BookSide asks; +}; + +enum class AggressorSide { Buy = 0, Sell = 1, None = 2 }; + +struct TradeRecord { + SecurityID sec_id = {}; + TimeStamp time_stamp = {}; + AggressorSide agg_side = {}; + Quantity trade_quantity; + Price trade_price; +}; + +struct SecurityState { + public: + enum class State { PREOPEN, OPEN }; + State state = State::OPEN; +}; + +struct SecurityMarketDataStatistics { + SecurityID security_id; + Price low; + Price high; + Price open; + Price settle; + Quantity volume; +}; + +struct MarketDataError { + enum class ErrorType { DISCONNECTION }; + ErrorType error_type = ErrorType::DISCONNECTION; + std::string error_text = {}; +}; + +struct RFQ {}; + +} // namespace EMumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataGateway.h b/src/lib/md/emumba/MarketDataGateway.h new file mode 100644 index 000000000..65960b7c6 --- /dev/null +++ b/src/lib/md/emumba/MarketDataGateway.h @@ -0,0 +1,34 @@ +#pragma once + +#include "MarketDataCommon.h" +#include +#include +#include +class IMarketDataListener; + +namespace EMumbaMarketData { + +struct MarketDataRegistration { + struct RegstrationError { + enum class RegstrationErrorType { NO_ERROR = 0, NETWORK_ERROR = 1 }; + RegstrationErrorType error_type{RegstrationErrorType::NO_ERROR}; + std::string error_text{}; + }; + // will have a value when there is no error + std::optional listener_id; + RegstrationError error = {}; +}; + +class MarketDataGateway { + public: + // The first call to the Gateway is to register the listener. The + // listener is assigned an ID if the registration is successful. Subsequent + // subscription of securities and unregister_listener is is via this id. + MarketDataRegistration register_listener( + const MarketDataGatewaySubscription &, IMarketDataListener *) noexcept; + void subscribe( + MarketDataListenerID id, const std::vector &securities); + void unregister_listener(MarketDataListenerID id); +}; + +} // namespace EMumbaMarketData \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 815af87fb..cc97147ac 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,3 +1,6 @@ +#include "lib/md/emumba/IMarketDataListener.h" +#include "lib/md/emumba/MarketDataCommon.h" +#include "lib/md/emumba/MarketDataGateway.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From 930357d11cf2f7f2fb761ff57923fd3c876fe572 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 27 Sep 2021 11:52:57 -0500 Subject: [PATCH 004/100] WebsocketClient --- src/lib/md/emumba/MarketDataCommon.h | 5 +- src/lib/md/websockets/WebsocketClient.cpp | 1 + src/lib/md/websockets/WebsocketClient.h | 104 ++++++++++++++++++ .../spreader_orders/tests/spreader_tests.cpp | 1 + 4 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 src/lib/md/websockets/WebsocketClient.cpp create mode 100644 src/lib/md/websockets/WebsocketClient.h diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index 29290ec03..e4b48ad72 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -48,7 +48,9 @@ using MarketDataListenerID = ValueWrapper; // more types will be needed there like spots etc -enum class SecurityType { FUTURE, SPREAD, OPTION }; +enum class SecurityType { INDEX, FUTURE, SPREAD, OPTION }; + +enum class Currency { BTC, EH, USD }; // Usually exchanges give price's as mantissa and exponent. The fastest way is // to keep it like that and do the math in integers vs doubles (I can give you a @@ -127,6 +129,7 @@ class SecurityCommon { Venue venue; SecurityID _security_id{}; SecurityType security_type; + Currency currency; double display_factor{}; double cash_per_point{}; std::string symbol; diff --git a/src/lib/md/websockets/WebsocketClient.cpp b/src/lib/md/websockets/WebsocketClient.cpp new file mode 100644 index 000000000..a716ac3a1 --- /dev/null +++ b/src/lib/md/websockets/WebsocketClient.cpp @@ -0,0 +1 @@ +#include "WebsocketClient.h" \ No newline at end of file diff --git a/src/lib/md/websockets/WebsocketClient.h b/src/lib/md/websockets/WebsocketClient.h new file mode 100644 index 000000000..df5c5e6d3 --- /dev/null +++ b/src/lib/md/websockets/WebsocketClient.h @@ -0,0 +1,104 @@ +#pragma once + +// #include +// #include +// #include +#include +#include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// namespace beast = boost::beast; // from +// namespace http = beast::http; // from +// namespace websocket = beast::websocket; // from +// namespace net = boost::asio; // from +// using tcp = boost::asio::ip::tcp; // from + +namespace bts { +namespace md { + +// This lightweight wrapper type is used to exchange messages between the +// WebsocketClient it's user. Since it has a const* access to the data, it does +// NOT manage data's memory. +struct WebsocketMessage { + // The generators of the message controls the unique message_id + const std::uint64_t message_id; + // The actual data. This lifecycle of the memory is controlled by the + // generator of this message. The only assumption is that the memory is valid + // while this object is passed from the caller to the callee + char const *data; + const size_t data_size; +}; + +// All errors for now are irrecoverable. In case of an error the physical +// connection is destroyed, resources are collected and a new connection is +// attempted +struct WebsocketError { + enum class ErrorType { SETUP = 0, DISCONNECT, WRITE_FAILED, READ_FAILED }; + ErrorType error_type; + std::string message; +}; + +// This interface is passed to the WebsocketClient. +class IWebsocketListener { + public: + // This is called after a successful resoloution, connection and handshake. + // The first batch of data can be sent on this callback + virtual void on_connection_established() = 0; + // Called when an irrecoverable error happens. The WebsocketClient tries to + // reconnect after this. Any attempts to send_message are ignored until the + // connection is re-established + virtual void on_error(const WebsocketError &error) = 0; + virtual void on_write_complete(size_t message_id) = 0; + virtual void on_data(WebsocketMessage &msg) = 0; +}; + +struct WebsocketClientConfiguration { + const size_t msecs_bw_connection_tries = 5000; +}; + +// This is the main class the market data components (client to the exchange +// websockets) will use. The ip, port, other configurations, listener +// registration is done at construction time, followed by a blocking call to +// start. +class WebsocketClient : public IWebsocketListener { + public: + explicit WebsocketClient( + const std::string &ip, + const std::string &port, + WebsocketClientConfiguration conf, + IWebsocketListener *listener); + // this is a blocking call, that is called only once. + void start(); + // can be called on any IWebsocketListener callback + void send_message(const std::vector &msgs); +}; + +} // namespace md +} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index cc97147ac..da55ef6f8 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,6 +1,7 @@ #include "lib/md/emumba/IMarketDataListener.h" #include "lib/md/emumba/MarketDataCommon.h" #include "lib/md/emumba/MarketDataGateway.h" +#include "lib/md/websockets/WebsocketClient.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From ce98e862c308cbf2ef2a7864454c3fa10542c79f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 28 Sep 2021 12:16:02 -0400 Subject: [PATCH 005/100] Upgraded boost --- .gitignore | 2 + externals | 2 +- src/lib/config/tests/HTTPServer.h | 1 + src/lib/plugin/plugin.cpp | 4 +- src/lib/quickbus/network/QBConnection.cpp | 9 +- .../quickbus/network/QBConnectionManager.h | 6 +- src/lib/utils/Dispatcher.cpp | 4 +- src/lib/utils/Dispatcher.h | 7 +- src/lib/utils/datetime.cpp | 12 +- src/server/sparkd/cmds/Run.cpp | 2 +- src/server/sparkd/cmds/Web.cpp | 128 +-- src/server/sparkd/http/WebServer.cpp | 770 +++++++++--------- src/server/sparkd/main.cpp | 2 +- 13 files changed, 475 insertions(+), 474 deletions(-) diff --git a/.gitignore b/.gitignore index f60a73705..e990e3f83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ nohup.out build/ cmake-build-debug/ +.cache/ +.ipynb_checkpoints/ .idea/ .dir-locals.el *.pyc diff --git a/externals b/externals index 10da2cde6..6b71f4149 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 10da2cde64499ba382446f4ee88e31300b822091 +Subproject commit 6b71f4149cd4f28632d7f9e80a4926a5698b10e4 diff --git a/src/lib/config/tests/HTTPServer.h b/src/lib/config/tests/HTTPServer.h index 88d1c0aac..90dd98368 100644 --- a/src/lib/config/tests/HTTPServer.h +++ b/src/lib/config/tests/HTTPServer.h @@ -8,6 +8,7 @@ #include #include #include +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include diff --git a/src/lib/plugin/plugin.cpp b/src/lib/plugin/plugin.cpp index cf2977f81..1cefa5748 100644 --- a/src/lib/plugin/plugin.cpp +++ b/src/lib/plugin/plugin.cpp @@ -18,7 +18,7 @@ using namespace bts::orderman; void init_plugins(SparkServices &services) { - static std::vector( + static std::vector( boost::filesystem::path(), ""))> keep_alive; @@ -54,7 +54,7 @@ void init_plugins(SparkServices &services) { LOG(Plugin, Info, "Attempting to initialize plugin {}", pl); try { - auto init_plugin = boost::dll::import( + auto init_plugin = boost::dll::import_symbol( f.path(), "init_spark_plugin"); init_plugin(services); keep_alive.push_back(init_plugin); diff --git a/src/lib/quickbus/network/QBConnection.cpp b/src/lib/quickbus/network/QBConnection.cpp index 426b01d2c..ec8ae99fd 100644 --- a/src/lib/quickbus/network/QBConnection.cpp +++ b/src/lib/quickbus/network/QBConnection.cpp @@ -22,6 +22,13 @@ namespace qbus { using boost::asio::ip::tcp; using namespace boost; +#if BOOST_VERSION >= 107000 +#define GET_IO_SERVICE(s) \ + ((boost::asio::io_context &)(s).get_executor().context()) +#else +#define GET_IO_SERVICE(s) ((s).get_io_service()) +#endif + struct QBConnection::PImpl { PImpl(tcp::socket &s, Router &router, config::QuickbusNodeCfg const &cfg) : socket(std::move(s)), router(router), pending_send(), write_buffer(), @@ -30,7 +37,7 @@ struct QBConnection::PImpl { my_desc(local_endpoint_description(socket)), remote_desc(remote_endpoint_description(socket)), cfg(cfg), last_received_ts(datetime::now()), last_sent_ts(datetime::now()), - hb_timer(socket.get_io_service()) { + hb_timer(GET_IO_SERVICE(socket)) { write_buffer.reserve(100 * 1024); read_buffer.reserve(100 * 1024); } diff --git a/src/lib/quickbus/network/QBConnectionManager.h b/src/lib/quickbus/network/QBConnectionManager.h index 67aeffe06..784974ad4 100644 --- a/src/lib/quickbus/network/QBConnectionManager.h +++ b/src/lib/quickbus/network/QBConnectionManager.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -13,11 +14,6 @@ namespace config { class QuickbusNodeCfg; } } // namespace bts -namespace boost { -namespace asio { -class io_service; -} -} // namespace boost // end fwds namespace bts { diff --git a/src/lib/utils/Dispatcher.cpp b/src/lib/utils/Dispatcher.cpp index 07f279b93..b6e791362 100644 --- a/src/lib/utils/Dispatcher.cpp +++ b/src/lib/utils/Dispatcher.cpp @@ -152,8 +152,8 @@ Dispatcher &Dispatcher::create_new(const char *name) { } }); t.detach(); - auto result = - c.wait_for(lock, chrono::seconds(5)); // releases the lock temporarily + auto result = c.wait_for( + lock, boost::asio::chrono::seconds(5)); // releases the lock temporarily bts_assert_msg( result == cv_status::no_timeout, "Dispatcher failed to start."); bts_assert(new_dispatcher); // Could happen to to spurious wake diff --git a/src/lib/utils/Dispatcher.h b/src/lib/utils/Dispatcher.h index 82124094a..483418459 100644 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib/utils/Dispatcher.h @@ -4,6 +4,7 @@ #include "lib/utils/bts_export.h" #include "lib/utils/bts_no_copy.h" +#include #include #include #include @@ -53,12 +54,6 @@ * */ -namespace boost { -namespace asio { -class io_service; -} -} // namespace boost - namespace bts { namespace utils { diff --git a/src/lib/utils/datetime.cpp b/src/lib/utils/datetime.cpp index 706f3b93c..3951b4a23 100644 --- a/src/lib/utils/datetime.cpp +++ b/src/lib/utils/datetime.cpp @@ -49,8 +49,8 @@ long unix_now() { (long)1E6; } -std::chrono::system_clock::time_point -utc_ll_to_timepoint(unsigned long long ll) { +std::chrono::system_clock::time_point utc_ll_to_timepoint( + unsigned long long ll) { auto us_since_epoch = ((ll & ticks_mask) - anchor_ticks) / ticks_per_micro; return std::chrono::system_clock::time_point( std::chrono::microseconds(us_since_epoch)); @@ -149,8 +149,8 @@ PTime ll_to_ptime(LLDateTime ll) { boost::posix_time::microseconds(ticks_part / ticks_per_micro))); } -extern "C" BTS_EXPORT int -ll_to_cstr(LLDateTime ll, char *buffer, int buffer_sz) { +extern "C" BTS_EXPORT int ll_to_cstr( + LLDateTime ll, char *buffer, int buffer_sz) { const int str_sz = sizeof("20121204-14:44:02.000"); bts_assert(buffer_sz >= str_sz); auto str = FIX_timestamp(ll_to_ptime(ll)); @@ -218,8 +218,8 @@ std::string FIX_date_time_string(PTime const &t) { sprintf( &result[0], "%d%02d%02d-%02d:%02d:%02d", (unsigned short)t.date().year(), t.date().month().as_number(), t.date().day().as_number(), - t.time_of_day().hours(), t.time_of_day().minutes(), - t.time_of_day().seconds()); + (int)t.time_of_day().hours(), (int)t.time_of_day().minutes(), + (int)t.time_of_day().seconds()); return result; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 28a00fd7e..e3368b145 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -59,7 +59,7 @@ static void execute() { trace::PerfLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + // http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::AuthServiceServer login_server(sc); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 8deb5b400..9003c715c 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -1,74 +1,74 @@ -#include "Web.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MarketDataService.pb.h" -#include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/MarketData.pb.h" -#include "lib/config/protos/Ports.pb.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/MDClient.h" -#include "lib/md/SyntheticSecurityService.h" -#include "lib/md/relay/QueryServer.h" -#include "lib/metrics/metrics.h" -#include "lib/metrics/system_metrics.h" -#include "lib/quickbus/quickbus.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/thread_manager.h" -#include "md/cmds/Cleanup.h" -#include "md/cmds/Run.h" -#include "server/sparkd/exchange_sim/ExchangeSim.h" -#include "server/sparkd/http/WebServer.h" -#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" -#include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/AuthServiceServer.h" -#include -#include -#include +// #include "Web.h" +// #include "lib/api/public/ServiceContext.h" +// #include "lib/api/services/MarketDataService.pb.h" +// #include "lib/api/services/SyntheticSecurityService.pb.h" +// #include "lib/config/config.h" +// #include "lib/config/protos/MarketData.pb.h" +// #include "lib/config/protos/Ports.pb.h" +// #include "lib/config/protos/quickbus_cfg.pb.h" +// #include "lib/md/MBOProcessor.h" +// #include "lib/md/MDClient.h" +// #include "lib/md/SyntheticSecurityService.h" +// #include "lib/md/relay/QueryServer.h" +// #include "lib/metrics/metrics.h" +// #include "lib/metrics/system_metrics.h" +// #include "lib/quickbus/quickbus.h" +// #include "lib/tracing/PerfLog.h" +// #include "lib/utils/Dispatcher.h" +// #include "lib/utils/thread_manager.h" +// #include "md/cmds/Cleanup.h" +// #include "md/cmds/Run.h" +// #include "server/sparkd/exchange_sim/ExchangeSim.h" +// #include "server/sparkd/http/WebServer.h" +// #include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" +// #include "server/sparkd/user/AdminServiceServer.h" +// #include "server/sparkd/user/AuthServiceServer.h" +// #include +// #include +// #include -namespace bts::cmds { +// namespace bts::cmds { -struct Web::Args { - bool md; -}; +// struct Web::Args { +// bool md; +// }; -Web::Web() - : CLI::App( - "Run only the services required for the web admin. This cannot be " - "run concurrently with 'sparkd run.'", - "web"), - _args(new Web::Args()) { - add_flag("--md", _args->md, "Start market data"); - callback([&] { - config::QuickbusNodeCfg qb_cfg; - auto &ports = config::get(); - qb_cfg.set_my_port(ports.qbus_port()); - qbus::Quickbus quickbus(qb_cfg); - bts::api::ServiceContext sc(&quickbus); +// Web::Web() +// : CLI::App( +// "Run only the services required for the web admin. This cannot be " +// "run concurrently with 'sparkd run.'", +// "web"), +// _args(new Web::Args()) { +// add_flag("--md", _args->md, "Start market data"); +// callback([&] { +// config::QuickbusNodeCfg qb_cfg; +// auto &ports = config::get(); +// qb_cfg.set_my_port(ports.qbus_port()); +// qbus::Quickbus quickbus(qb_cfg); +// bts::api::ServiceContext sc(&quickbus); - bts::metrics::MetricsContainer stats; - metrics::publish_system_metrics(stats); - trace::PerfLog perf_log; - http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); +// bts::metrics::MetricsContainer stats; +// metrics::publish_system_metrics(stats); +// trace::PerfLog perf_log; +// http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); - user::AuthServiceServer login_server(sc); - if (_args->md) - md::cmds::Run::run( - nullptr, nullptr, md::cmds::Run::MDType::Configured, true, true); +// user::AuthServiceServer login_server(sc); +// if (_args->md) +// md::cmds::Run::run( +// nullptr, nullptr, md::cmds::Run::MDType::Configured, true, true); - bts::api::synthetic::SyntheticSecurityService synthetic_service(sc); - bts::admin::AdminServiceServer admin_service(sc); - bts::md::MDClient mdclient( - &bts::utils::Dispatcher::current(), &synthetic_service); +// bts::api::synthetic::SyntheticSecurityService synthetic_service(sc); +// bts::admin::AdminServiceServer admin_service(sc); +// bts::md::MDClient mdclient( +// &bts::utils::Dispatcher::current(), &synthetic_service); - bts::md::QueryServerPtr md_query_server( - bts::md::run_query_server(sc, mdclient, stats)); +// bts::md::QueryServerPtr md_query_server( +// bts::md::run_query_server(sc, mdclient, stats)); - bts::utils::Dispatcher::current().run(); - }); -} +// bts::utils::Dispatcher::current().run(); +// }); +// } -Web::~Web() {} +// Web::~Web() {} -} // namespace bts::cmds +// } // namespace bts::cmds diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 901122afb..e5b83a05a 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -1,421 +1,421 @@ -#include "WebServer.h" -#include "ApiGateway.h" -#include "MultipartFormDecoder.h" -#include "lib/api/apigateway.pb.h" -#include "lib/api/core/ApiClientInterop.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" +// #include "WebServer.h" +// #include "ApiGateway.h" +// #include "MultipartFormDecoder.h" +// #include "lib/api/apigateway.pb.h" +// #include "lib/api/core/ApiClientInterop.h" +// #include "lib/logging/logging.h" +// #include "lib/os/os.h" +// #include "lib/tracing/PerfLog.h" +// #include "lib/utils/Dispatcher.h" +// #include "lib/utils/TimeStamp.h" -#include -#include +// #include +// #include -#include -#include -#include +// #include +// #include +// #include -#include -#include -#include -#include -#include -#include -#include -#include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include -typedef websocketpp::server WsServer; -typedef WsServer::endpoint::connection_ptr connection_ptr; -using websocketpp::connection_hdl; -using websocketpp::lib::bind; -using websocketpp::lib::placeholders::_1; -using websocketpp::lib::placeholders::_2; +// typedef websocketpp::server WsServer; +// typedef WsServer::endpoint::connection_ptr connection_ptr; +// using websocketpp::connection_hdl; +// using websocketpp::lib::bind; +// using websocketpp::lib::placeholders::_1; +// using websocketpp::lib::placeholders::_2; -using namespace bts::api::gateway; +// using namespace bts::api::gateway; -std::string read_file(const std::string &path) { - std::ifstream f{path}; - auto sz = boost::filesystem::file_size(path); - std::string contents(sz, ' '); - f.read(&contents[0], sz); - return contents; -} +// std::string read_file(const std::string &path) { +// std::ifstream f{path}; +// auto sz = boost::filesystem::file_size(path); +// std::string contents(sz, ' '); +// f.read(&contents[0], sz); +// return contents; +// } -namespace bts { -namespace http { +// namespace bts { +// namespace http { -struct ServerState { - std::mutex _m; - utils::Dispatcher &_dispatcher; - std::map> - _session; - WsServer _server; - int _port; - std::string _www; - std::string _conf; - const api::ServiceContext &_ctx; - metrics::MetricsContainer &_metrics; - std::shared_ptr> _mtimer; - trace::PerfLog &_perf_log; +// struct ServerState { +// std::mutex _m; +// utils::Dispatcher &_dispatcher; +// std::map> +// _session; +// WsServer _server; +// int _port; +// std::string _www; +// std::string _conf; +// const api::ServiceContext &_ctx; +// metrics::MetricsContainer &_metrics; +// std::shared_ptr> _mtimer; +// trace::PerfLog &_perf_log; - ServerState( - const api::ServiceContext &ctx, - metrics::MetricsContainer &metrics, - trace::PerfLog &l, - int port) - : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), - _session(), _server(), _port(port), _www(), _ctx(ctx), - _metrics(metrics), - _mtimer(std::make_shared>( - "spark_metrics_query_duration_ms", - std::array({0.5, 1.0, 5.0, 10.0}))), - _perf_log(l) { - _www = os::sparkdata_path("www"); - _conf = os::sparkdata_path("conf"); +// ServerState( +// const api::ServiceContext &ctx, +// metrics::MetricsContainer &metrics, +// trace::PerfLog &l, +// int port) +// : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), +// _session(), _server(), _port(port), _www(), _ctx(ctx), +// _metrics(metrics), +// _mtimer(std::make_shared>( +// "spark_metrics_query_duration_ms", +// std::array({0.5, 1.0, 5.0, 10.0}))), +// _perf_log(l) { +// _www = os::sparkdata_path("www"); +// _conf = os::sparkdata_path("conf"); - _metrics.publish(_mtimer); +// _metrics.publish(_mtimer); - _server.init_asio(_dispatcher.io_service()); - _server.set_open_handler(bind(&ServerState::on_open, this, ::_1)); - _server.set_close_handler(bind(&ServerState::on_close, this, ::_1)); - _server.set_message_handler( - bind(&ServerState::on_message, this, ::_1, ::_2)); - _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); - // Turn off logging - _server.clear_access_channels(websocketpp::log::alevel::all); - _server.clear_error_channels(websocketpp::log::alevel::all); - _server.set_open_handshake_timeout(0); - run(); - } +// _server.init_asio(_dispatcher.io_service()); +// _server.set_open_handler(bind(&ServerState::on_open, this, ::_1)); +// _server.set_close_handler(bind(&ServerState::on_close, this, ::_1)); +// _server.set_message_handler( +// bind(&ServerState::on_message, this, ::_1, ::_2)); +// _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); +// // Turn off logging +// _server.clear_access_channels(websocketpp::log::alevel::all); +// _server.clear_error_channels(websocketpp::log::alevel::all); +// _server.set_open_handshake_timeout(0); +// run(); +// } - // starts listening - void run() { - _server.set_reuse_addr(true); - _server.listen(_port); - _server.start_accept(); - } +// // starts listening +// void run() { +// _server.set_reuse_addr(true); +// _server.listen(_port); +// _server.start_accept(); +// } - void on_open(connection_hdl hdl) { - auto con = _server.get_con_from_hdl(hdl); - if (con) { - LOG(Http, Info, "Web client connection from {}", - con->get_remote_endpoint()); - std::lock_guard lock(_m); - _session[hdl] = ApiGatewaySession(_ctx); - } - } +// void on_open(connection_hdl hdl) { +// auto con = _server.get_con_from_hdl(hdl); +// if (con) { +// LOG(Http, Info, "Web client connection from {}", +// con->get_remote_endpoint()); +// std::lock_guard lock(_m); +// _session[hdl] = ApiGatewaySession(_ctx); +// } +// } - void on_close(connection_hdl hdl) { - auto con = _server.get_con_from_hdl(hdl); - if (con) { - LOG(Http, Info, "Web client disconnected: {}", - con->get_remote_endpoint()); - std::lock_guard lock(_m); - _session.erase(hdl); - } - } +// void on_close(connection_hdl hdl) { +// auto con = _server.get_con_from_hdl(hdl); +// if (con) { +// LOG(Http, Info, "Web client disconnected: {}", +// con->get_remote_endpoint()); +// std::lock_guard lock(_m); +// _session.erase(hdl); +// } +// } - void on_message(connection_hdl hdl, WsServer::message_ptr msg) { - std::lock_guard lock(_m); - auto iter = _session.find(hdl); - if (iter != _session.end()) { - GatewayRequest request; - if (request.ParseFromString(msg->get_payload())) { - iter->second.handle( - request, [this, hdl](const GatewayResponse &response) { - websocketpp::lib::error_code ec; - _server.send( - hdl, response.SerializeAsString(), - websocketpp::frame::opcode::binary, ec); - if (ec) { - LOG(Http, Warn, "Error sending from websocket: '{}'", - ec.message()); - } - }); - } else { - LOG(Http, Info, "Could not parse request as GatewayRequest: {}", - msg->get_payload()); - } - } - } +// void on_message(connection_hdl hdl, WsServer::message_ptr msg) { +// std::lock_guard lock(_m); +// auto iter = _session.find(hdl); +// if (iter != _session.end()) { +// GatewayRequest request; +// if (request.ParseFromString(msg->get_payload())) { +// iter->second.handle( +// request, [this, hdl](const GatewayResponse &response) { +// websocketpp::lib::error_code ec; +// _server.send( +// hdl, response.SerializeAsString(), +// websocketpp::frame::opcode::binary, ec); +// if (ec) { +// LOG(Http, Warn, "Error sending from websocket: '{}'", +// ec.message()); +// } +// }); +// } else { +// LOG(Http, Info, "Could not parse request as GatewayRequest: {}", +// msg->get_payload()); +// } +// } +// } - void return_dotall(connection_ptr &con) { - std::vector files; - auto iter = boost::filesystem::directory_iterator(_conf); - auto end = boost::filesystem::directory_iterator(); - // Collect all .conf file - for (; iter != end; ++iter) { - auto ext = iter->path().filename().string().substr( - iter->path().filename().stem().size()); - if (boost::iequals(ext, ".conf")) { - files.push_back(iter->path()); - } - } - // Sort them so we at least it's stable - std::sort(files.begin(), files.end()); - // Concatanate - std::string body; - for (const auto &p : files) { - body += "##########################\n"; - body += "## " + p.filename().string(); - body += "\n##########################\n"; - body += read_file(p.string()); - } +// void return_dotall(connection_ptr &con) { +// std::vector files; +// auto iter = boost::filesystem::directory_iterator(_conf); +// auto end = boost::filesystem::directory_iterator(); +// // Collect all .conf file +// for (; iter != end; ++iter) { +// auto ext = iter->path().filename().string().substr( +// iter->path().filename().stem().size()); +// if (boost::iequals(ext, ".conf")) { +// files.push_back(iter->path()); +// } +// } +// // Sort them so we at least it's stable +// std::sort(files.begin(), files.end()); +// // Concatanate +// std::string body; +// for (const auto &p : files) { +// body += "##########################\n"; +// body += "## " + p.filename().string(); +// body += "\n##########################\n"; +// body += read_file(p.string()); +// } - con->set_body(body); - con->set_status(websocketpp::http::status_code::ok); - } +// con->set_body(body); +// con->set_status(websocketpp::http::status_code::ok); +// } - void return_metrics(connection_ptr &con) { - utils::TimeStamp start = utils::TimeStamp::now(); - std::stringstream ss; - _metrics.print(ss); - con->set_body(ss.str()); - con->set_status(websocketpp::http::status_code::ok); - _mtimer->observe( - (utils::TimeStamp::now() - start).microseconds() / 1000.0); - } +// void return_metrics(connection_ptr &con) { +// utils::TimeStamp start = utils::TimeStamp::now(); +// std::stringstream ss; +// _metrics.print(ss); +// con->set_body(ss.str()); +// con->set_status(websocketpp::http::status_code::ok); +// _mtimer->observe( +// (utils::TimeStamp::now() - start).microseconds() / 1000.0); +// } - void return_perf_trace_data(connection_ptr &con, size_t max_rows) { - utils::TimeStamp start = utils::TimeStamp::now(); - std::stringstream ss; - _perf_log.print_latest_traces(ss, max_rows); - con->set_body(ss.str()); - con->set_status(websocketpp::http::status_code::ok); - _mtimer->observe( - (utils::TimeStamp::now() - start).microseconds() / 1000.0); - } +// void return_perf_trace_data(connection_ptr &con, size_t max_rows) { +// utils::TimeStamp start = utils::TimeStamp::now(); +// std::stringstream ss; +// _perf_log.print_latest_traces(ss, max_rows); +// con->set_body(ss.str()); +// con->set_status(websocketpp::http::status_code::ok); +// _mtimer->observe( +// (utils::TimeStamp::now() - start).microseconds() / 1000.0); +// } - void bad_request(connection_ptr &con, const std::string &message) { - con->set_body(message); - con->set_status(websocketpp::http::status_code::bad_request); - } +// void bad_request(connection_ptr &con, const std::string &message) { +// con->set_body(message); +// con->set_status(websocketpp::http::status_code::bad_request); +// } - std::vector - split_string(std::string body, std::string &deliniator) { - std::vector result; - size_t i = body.find(deliniator); - while (i != std::string::npos) { - result.push_back(body.substr(0, i)); - body = body.substr(i + deliniator.size()); - i = body.find(deliniator); - } - return result; - } +// std::vector +// split_string(std::string body, std::string &deliniator) { +// std::vector result; +// size_t i = body.find(deliniator); +// while (i != std::string::npos) { +// result.push_back(body.substr(0, i)); +// body = body.substr(i + deliniator.size()); +// i = body.find(deliniator); +// } +// return result; +// } - void handle_file_upload(connection_ptr &con) { - auto content_type = con->get_request_header("Content-Type"); - auto data = decode_form_data(content_type, con->get_request_body()); - if (data) { - for (const auto &part : data.value().parts) { - if (!part.filename.empty()) { - LOG(Http, Info, "Received file upload: {}", part.filename); - } - } - } else { - LOG(Http, Warn, - "Failed to decode form data. Ensure you are using " - "'enctype=\"multipart/form-data\"'"); - } +// void handle_file_upload(connection_ptr &con) { +// auto content_type = con->get_request_header("Content-Type"); +// auto data = decode_form_data(content_type, con->get_request_body()); +// if (data) { +// for (const auto &part : data.value().parts) { +// if (!part.filename.empty()) { +// LOG(Http, Info, "Received file upload: {}", part.filename); +// } +// } +// } else { +// LOG(Http, Warn, +// "Failed to decode form data. Ensure you are using " +// "'enctype=\"multipart/form-data\"'"); +// } - con->set_body("got it"); - con->set_status(websocketpp::http::status_code::ok); - } +// con->set_body("got it"); +// con->set_status(websocketpp::http::status_code::ok); +// } - bool require_authentication( - connection_ptr &con, - const std::string &username, - const std::string &password) { - auto auth = con->get_request_header("Authorization"); - if (!auth.empty() && auth.size() >= 7 && - boost::iequals(auth.substr(0, 6), "Basic ")) { - auto b64 = auth.substr(6); - auto decoded = websocketpp::base64_decode(b64); - auto colon = decoded.find(':'); - if (colon != std::string::npos) { - auto user = decoded.substr(0, colon); - auto pass = decoded.substr(colon + 1); - if (user == username && pass == password) - return true; - } - } +// bool require_authentication( +// connection_ptr &con, +// const std::string &username, +// const std::string &password) { +// auto auth = con->get_request_header("Authorization"); +// if (!auth.empty() && auth.size() >= 7 && +// boost::iequals(auth.substr(0, 6), "Basic ")) { +// auto b64 = auth.substr(6); +// auto decoded = websocketpp::base64_decode(b64); +// auto colon = decoded.find(':'); +// if (colon != std::string::npos) { +// auto user = decoded.substr(0, colon); +// auto pass = decoded.substr(colon + 1); +// if (user == username && pass == password) +// return true; +// } +// } - // Failed - con->append_header("WWW-Authenticate", "Basic realm=\"BTS\""); - con->set_status(websocketpp::http::status_code::unauthorized); - con->set_body("Not Authorized"); - return false; - } +// // Failed +// con->append_header("WWW-Authenticate", "Basic realm=\"BTS\""); +// con->set_status(websocketpp::http::status_code::unauthorized); +// con->set_body("Not Authorized"); +// return false; +// } - void check_auth_and_return_info(connection_ptr &con) { - if (require_authentication( - con, "bts", "bbb835af-b1ea-42d3-8be1-fd9d5555530d")) { - auto horrible_json = get_server_info(_ctx); - con->set_body(horrible_json); - con->set_status(websocketpp::http::status_code::ok); - } - } +// void check_auth_and_return_info(connection_ptr &con) { +// if (require_authentication( +// con, "bts", "bbb835af-b1ea-42d3-8be1-fd9d5555530d")) { +// auto horrible_json = get_server_info(_ctx); +// con->set_body(horrible_json); +// con->set_status(websocketpp::http::status_code::ok); +// } +// } - void directory_index( - connection_ptr &con, - const std::string &resource, - const boost::filesystem::path &path) { - // directory listing - std::string body = "\n"; - body += ""; - body += "\n"; - body += "\n"; - body += "\n"; - body += "

Index of " + resource + "

\n"; - auto iter = boost::filesystem::directory_iterator(path); - auto end = boost::filesystem::directory_iterator(); - body += "\n"; - body += "\n"; - con->set_status(websocketpp::http::status_code::ok); - con->set_body(body); - } +// void directory_index( +// connection_ptr &con, +// const std::string &resource, +// const boost::filesystem::path &path) { +// // directory listing +// std::string body = "\n"; +// body += ""; +// body += "\n"; +// body += "\n"; +// body += "\n"; +// body += "

Index of " + resource + "

\n"; +// auto iter = boost::filesystem::directory_iterator(path); +// auto end = boost::filesystem::directory_iterator(); +// body += "\n"; +// body += "\n"; +// con->set_status(websocketpp::http::status_code::ok); +// con->set_body(body); +// } - boost::filesystem::path web_ui_path(const boost::filesystem::path &root) { - auto reldir = root / "web/ui"; - if (boost::filesystem::exists(reldir)) - return reldir; - reldir = root / "ui"; - if (boost::filesystem::exists(reldir)) - return reldir; - if (root.has_parent_path()) - return web_ui_path(root.parent_path()); - return _www; - } +// boost::filesystem::path web_ui_path(const boost::filesystem::path &root) { +// auto reldir = root / "web/ui"; +// if (boost::filesystem::exists(reldir)) +// return reldir; +// reldir = root / "ui"; +// if (boost::filesystem::exists(reldir)) +// return reldir; +// if (root.has_parent_path()) +// return web_ui_path(root.parent_path()); +// return _www; +// } - boost::filesystem::path map_path_to_filesystem(const std::string &resource) { - std::string config = "/config"; - std::string files = "/files"; - std::string perf_trace = "/perf_trace"; - std::string docs = "/docs"; +// boost::filesystem::path map_path_to_filesystem(const std::string &resource) { +// std::string config = "/config"; +// std::string files = "/files"; +// std::string perf_trace = "/perf_trace"; +// std::string docs = "/docs"; - if (resource.compare(0, config.size(), config) == 0) { - return _conf + resource.substr(config.size()); - } else if (resource.compare(0, files.size(), files) == 0) { - return _www + resource.substr(files.size()); - } else if (resource.compare(0, perf_trace.size(), perf_trace) == 0) { - return os::sparkd_wd() + "/data_files" + resource; - } else if (resource.compare(0, docs.size(), docs) == 0) { - return os::sparkd_wd() + "/web" + resource; - } - return web_ui_path(os::get_install_path()) / resource; - } +// if (resource.compare(0, config.size(), config) == 0) { +// return _conf + resource.substr(config.size()); +// } else if (resource.compare(0, files.size(), files) == 0) { +// return _www + resource.substr(files.size()); +// } else if (resource.compare(0, perf_trace.size(), perf_trace) == 0) { +// return os::sparkd_wd() + "/data_files" + resource; +// } else if (resource.compare(0, docs.size(), docs) == 0) { +// return os::sparkd_wd() + "/web" + resource; +// } +// return web_ui_path(os::get_install_path()) / resource; +// } - void return_file(connection_ptr &con, const boost::filesystem::path &path) { - con->set_body(read_file(path.string())); - con->set_status(websocketpp::http::status_code::ok); - } +// void return_file(connection_ptr &con, const boost::filesystem::path &path) { +// con->set_body(read_file(path.string())); +// con->set_status(websocketpp::http::status_code::ok); +// } - void return_bts_installer(connection_ptr &con) { - std::string installer_bits = read_file(_www + "/bts_installer.exe"); - const std::string installer_config = _www + "install_config.json"; - if (boost::filesystem::is_regular_file(installer_config)) { - auto conf = read_file(installer_config); - std::string needle = "$HOST"; - std::size_t pos; - do { - pos = conf.find(needle, 0); - if (pos != std::string::npos) { - auto host = con->get_uri()->get_host(); - conf.replace(pos, needle.size(), host); - } - } while (pos != std::string::npos); - installer_bits += conf; - } - con->set_body(installer_bits); - con->set_status(websocketpp::http::status_code::ok); - } +// void return_bts_installer(connection_ptr &con) { +// std::string installer_bits = read_file(_www + "/bts_installer.exe"); +// const std::string installer_config = _www + "install_config.json"; +// if (boost::filesystem::is_regular_file(installer_config)) { +// auto conf = read_file(installer_config); +// std::string needle = "$HOST"; +// std::size_t pos; +// do { +// pos = conf.find(needle, 0); +// if (pos != std::string::npos) { +// auto host = con->get_uri()->get_host(); +// conf.replace(pos, needle.size(), host); +// } +// } while (pos != std::string::npos); +// installer_bits += conf; +// } +// con->set_body(installer_bits); +// con->set_status(websocketpp::http::status_code::ok); +// } - std::string strip_query_str(const std::string &request) { - auto position = request.find("?"); - if (position != std::string::npos) { - return request.substr(0, position); - } - return request; - } +// std::string strip_query_str(const std::string &request) { +// auto position = request.find("?"); +// if (position != std::string::npos) { +// return request.substr(0, position); +// } +// return request; +// } - void on_http(connection_hdl hdl) { - auto con = _server.get_con_from_hdl(hdl); - auto resource = strip_query_str(con->get_resource()); - LOG(Http, Diag, "HTTP GET: {}", resource); - if (boost::iequals(resource, "/config/.all")) { - return_dotall(con); - } else if (boost::iequals(resource, "/metrics")) { - return_metrics(con); - } else if (boost::iequals(resource, "/perf_trace_data")) { - return_perf_trace_data(con, 1000); - } else if (std::regex_match( - resource, std::regex("/perf_trace_data/(\\d++)"))) { - std::regex rx = std::regex("/perf_trace_data/(\\d++)"); - std::smatch matches; - if (std::regex_match(resource, matches, rx)) { - auto max_rows = std::atoi(matches[1].str().c_str()); - return_perf_trace_data(con, max_rows); - } else - return_perf_trace_data(con, 1000); - } else if (boost::iequals(resource, "/server_info")) { - check_auth_and_return_info(con); - } else if ( - boost::iequals(resource, "/bts_installer.exe") && - boost::filesystem::is_regular_file(_www + "/bts_installer.exe")) { - return_bts_installer(con); - } else if (boost::iequals(resource, "/robots.txt")) { - con->set_status(websocketpp::http::status_code::ok); - std::string body = "User-agent: *\nDisallow: /"; - con->set_body(body); - } else if (boost::iequals(resource, "/upload")) { - handle_file_upload(con); - } else { - auto path = map_path_to_filesystem(resource); - if (boost::filesystem::is_directory(path)) { - auto index = path / "index.html"; - if (boost::filesystem::is_regular_file(index)) { - return_file(con, index); - } else { - directory_index(con, resource, path); - } - } else if (boost::filesystem::is_regular_file(path)) { - return_file(con, path); - } else { - con->set_status(websocketpp::http::status_code::not_found); - con->set_body("Cannot find " + resource); - } - } - } -}; +// void on_http(connection_hdl hdl) { +// auto con = _server.get_con_from_hdl(hdl); +// auto resource = strip_query_str(con->get_resource()); +// LOG(Http, Diag, "HTTP GET: {}", resource); +// if (boost::iequals(resource, "/config/.all")) { +// return_dotall(con); +// } else if (boost::iequals(resource, "/metrics")) { +// return_metrics(con); +// } else if (boost::iequals(resource, "/perf_trace_data")) { +// return_perf_trace_data(con, 1000); +// } else if (std::regex_match( +// resource, std::regex("/perf_trace_data/(\\d++)"))) { +// std::regex rx = std::regex("/perf_trace_data/(\\d++)"); +// std::smatch matches; +// if (std::regex_match(resource, matches, rx)) { +// auto max_rows = std::atoi(matches[1].str().c_str()); +// return_perf_trace_data(con, max_rows); +// } else +// return_perf_trace_data(con, 1000); +// } else if (boost::iequals(resource, "/server_info")) { +// check_auth_and_return_info(con); +// } else if ( +// boost::iequals(resource, "/bts_installer.exe") && +// boost::filesystem::is_regular_file(_www + "/bts_installer.exe")) { +// return_bts_installer(con); +// } else if (boost::iequals(resource, "/robots.txt")) { +// con->set_status(websocketpp::http::status_code::ok); +// std::string body = "User-agent: *\nDisallow: /"; +// con->set_body(body); +// } else if (boost::iequals(resource, "/upload")) { +// handle_file_upload(con); +// } else { +// auto path = map_path_to_filesystem(resource); +// if (boost::filesystem::is_directory(path)) { +// auto index = path / "index.html"; +// if (boost::filesystem::is_regular_file(index)) { +// return_file(con, index); +// } else { +// directory_index(con, resource, path); +// } +// } else if (boost::filesystem::is_regular_file(path)) { +// return_file(con, path); +// } else { +// con->set_status(websocketpp::http::status_code::not_found); +// con->set_body("Cannot find " + resource); +// } +// } +// } +// }; -SparkWebServer::SparkWebServer( - const api::ServiceContext &ctx, - metrics::MetricsContainer &metrics, - trace::PerfLog &l, - int port) - : _me(std::make_shared(ctx, metrics, l, port)) {} +// SparkWebServer::SparkWebServer( +// const api::ServiceContext &ctx, +// metrics::MetricsContainer &metrics, +// trace::PerfLog &l, +// int port) +// : _me(std::make_shared(ctx, metrics, l, port)) {} -} // namespace http -} // namespace bts +// } // namespace http +// } // namespace bts diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 1fb98aced..bb2b4e425 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char **argv) { app.add_subcommand(CLI::App_p(new cmds::QuickTest())); app.add_subcommand(CLI::App_p(new cmds::Run())); app.add_subcommand(CLI::App_p(new cmds::Spartan())); - app.add_subcommand(CLI::App_p(new cmds::Web())); + // app.add_subcommand(CLI::App_p(new cmds::Web())); app.add_subcommand( "test", "Run unit test(s)"); // so this shows up in help CLI11_PARSE(app, argc, argv); From e34a2f519573aad6a1efef8d879ca908aea06286 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 4 Oct 2021 15:55:46 -0400 Subject: [PATCH 006/100] WebsocketClient - allows a user of this class to connect to a host url, and send and receive data asyncronously --- .../websockets/IWebsocketListener.h | 19 + .../websockets/WebsocketClient.cpp | 392 ++++++++++++++++++ .../websockets/WebsocketClient.h | 35 ++ .../websockets/WebsocketClientConfiguration.h | 17 + .../websockets/WebsocketError.h | 19 + .../websockets/WebsocketMessage.h | 20 + .../websockets/tests/WebsocketClientTests.cpp | 246 +++++++++++ 7 files changed, 748 insertions(+) create mode 100644 src/lib/communincation/websockets/IWebsocketListener.h create mode 100644 src/lib/communincation/websockets/WebsocketClient.cpp create mode 100644 src/lib/communincation/websockets/WebsocketClient.h create mode 100644 src/lib/communincation/websockets/WebsocketClientConfiguration.h create mode 100644 src/lib/communincation/websockets/WebsocketError.h create mode 100644 src/lib/communincation/websockets/WebsocketMessage.h create mode 100644 src/lib/communincation/websockets/tests/WebsocketClientTests.cpp diff --git a/src/lib/communincation/websockets/IWebsocketListener.h b/src/lib/communincation/websockets/IWebsocketListener.h new file mode 100644 index 000000000..f1e27e9b5 --- /dev/null +++ b/src/lib/communincation/websockets/IWebsocketListener.h @@ -0,0 +1,19 @@ +#pragma once +#include + +namespace bts::spark::communication { + +class WebsocketError; +class WebsocketMessage; + +class IWebsocketListener { + public: + virtual void on_connection_established() = 0; + virtual void on_error(const WebsocketError &error) = 0; + virtual void on_write_complete(size_t message_id) = 0; + virtual void on_data(WebsocketMessage &msg) = 0; + virtual void on_timer() = 0; + virtual void on_connection_closed(bool gracefully) = 0; +}; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketClient.cpp b/src/lib/communincation/websockets/WebsocketClient.cpp new file mode 100644 index 000000000..42d0519ac --- /dev/null +++ b/src/lib/communincation/websockets/WebsocketClient.cpp @@ -0,0 +1,392 @@ +#include "WebsocketClient.h" +#include "WebsocketClientConfiguration.h" +#include "WebsocketError.h" +#include "WebsocketMessage.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace beast = boost::beast; // from +namespace http = beast::http; // from +namespace websocket = beast::websocket; // from +namespace net = boost::asio; // from +using tcp = boost::asio::ip::tcp; // from + +namespace bts::spark::communication { + +std::string get_thread_string() { + auto core_id = sched_getcpu(); + std::thread::id thread_id = std::this_thread::get_id(); + std::stringstream ss; + ss << "{thread_id:" << thread_id << " core:" << core_id << "}"; + return ss.str(); +} + +// Sends a WebSocket message and prints the response +class WebsocketClientInternal + : public std::enable_shared_from_this { + private: + using WSCI = WebsocketClientInternal; + const WebsocketClientConfiguration _conf; + net::io_context &_io_context; + tcp::resolver _resolver; + websocket::stream _ws; + beast::flat_buffer _read_buffer; + boost::asio::deadline_timer _timer; + IWebsocketListener *_listener; + // can't call async_read until the completion call + bool _pending_read = false; + // same for write + bool _pending_write = false; + // for send_message calls when there is_pending_write is true + std::queue _send_queue = {}; + // this is just incremented and every read message is tagged with it + uint64_t _read_msg_id = 0; + // since there can only be one pending write at a time (ie we cant send an + // aysnc write until the last write's completion has been called) + uint64_t _pending_write_msg_id = 0; + // if any of the async call completion result in an error, this is set. + // this allows the timer + bool _encountered_error = false; + // oneway switch thats turned on once async_close is called + bool _close_attempted = false; + + public: + // Resolver and socket require an io_context + explicit WebsocketClientInternal( + const WebsocketClientConfiguration &conf, + net::io_context &ioc, + IWebsocketListener *listener) + : _conf(conf), _io_context(ioc), _resolver(net::make_strand(ioc)), + _ws(net::make_strand(ioc)), + _timer(ioc, boost::posix_time::milliseconds(conf.timer_ms)), + _listener(listener) {} + + // user facing function + void start() { _resolve(); } + + void send_message(const WebsocketMessage &msg) { + _send_queue.push(msg); + _write_data(); + } + + void close_connection() { + if (!_close_attempted) { + _close_attempted = true; + _ws.async_close( + websocket::close_code::normal, + beast::bind_front_handler(&WSCI::_on_close, shared_from_this())); + } + } + + private: + // Report a failure + static void _fail(beast::error_code ec, char const *what) { + std::cerr << what << ": " << ec.message() << std::endl; + } + + void _handle_error( + beast::error_code error_code, + std::string &&err_msg, + WebsocketError::ErrorType err_type) { + _encountered_error = true; + std::stringstream str; + str << "Error_code:" << error_code << " Text:" << err_msg; + _listener->on_error({err_type, str.str()}); + close_connection(); + } + + // Start the asynchronous operation + void _resolve() { + _resolver.async_resolve( + _conf.ip, _conf.port, + beast::bind_front_handler(&WSCI::_on_resolve, shared_from_this())); + } + + void _on_resolve( + beast::error_code ec, const tcp::resolver::results_type &results) { + if (ec) { + _fail(ec, "resolve"); + _handle_error( + ec, "Address resoloution failed", + WebsocketError::ErrorType::SETUP); + return; + } + // Set the timeout for the operation + beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); + // Make the connection on the IP address we get from a lookup + beast::get_lowest_layer(_ws).async_connect( + results, + beast::bind_front_handler(&WSCI::_on_connect, shared_from_this())); + } + + void _on_connect( + beast::error_code ec, + const tcp::resolver::results_type::endpoint_type &ep) { + if (ec) { + _fail(ec, "connect"); + _handle_error( + ec, "Connection failed", WebsocketError::ErrorType::SETUP); + return; + } + // Turn off the timeout on the tcp_stream, because + // the websocket stream has its own timeout system. + beast::get_lowest_layer(_ws).expires_never(); + // Set suggested timeout settings for the websocket + _ws.set_option( + websocket::stream_base::timeout::suggested(beast::role_type::client)); + // Set a decorator to change the User-Agent of the handshake + _ws.set_option( + websocket::stream_base::decorator([](websocket::request_type &req) { + req.set( + http::field::user_agent, + std::string(BOOST_BEAST_VERSION_STRING) + + " websocket-client-async"); + })); + // Update the host_ string. This will provide the value of the + // Host HTTP header during the WebSocket handshake. + // See https://tools.ietf.org/html/rfc7230#section-5.4 + auto host = _conf.ip + ':' + std::to_string(ep.port()); + // spartan_assert(!host.empty()); + // Perform the websocket handshake + _ws.async_handshake( + _conf.host_name, "/", + beast::bind_front_handler(&WSCI::_on_handshake, shared_from_this())); + } + + void _on_handshake(beast::error_code ec) { + if (ec) { + _fail(ec, "handshake"); + _handle_error( + ec, "Handshake failed", WebsocketError::ErrorType::SETUP); + return; + } + // this is when the connection is really established + _listener->on_connection_established(); + _read_data(); + _write_data(); + _reinit_timer(); + } + + void _on_timer(beast::error_code ec) { + if (ec) { + _fail(ec, "timer"); + _handle_error(ec, "Timer failed", WebsocketError::ErrorType::MISC); + return; + } + _listener->on_timer(); + if (_is_active()) { + _reinit_timer(); + } + } + + void _reinit_timer() { + _timer.expires_at( + _timer.expires_at() + + boost::posix_time::milliseconds(_conf.timer_ms)); + _timer.async_wait( + beast::bind_front_handler(&WSCI::_on_timer, shared_from_this())); + } + + void _write_data() { + if (!_pending_write) { + if (!_send_queue.empty()) { + WebsocketMessage msg = _send_queue.front(); + _pending_write_msg_id = msg.message_id; + _send_queue.pop(); + _pending_write = true; + _ws.async_write( + net::buffer(msg.data, msg.data_size), + beast::bind_front_handler( + &WSCI::_on_write, shared_from_this())); + } + } + } + + void _read_data() { + if (!_pending_read) { + _pending_read = true; + _ws.async_read( + _read_buffer, + beast::bind_front_handler(&WSCI::_on_read, shared_from_this())); + } + } + + void _on_write(beast::error_code ec, std::size_t bytes_transferred) { + boost::ignore_unused(bytes_transferred); + if (ec) { + _fail(ec, "write"); + _handle_error( + ec, "Write failed", WebsocketError::ErrorType::WRITE_FAILED); + return; + } + _pending_write = false; + // Read a message into our buffer + _listener->on_write_complete(_pending_write_msg_id); + _read_data(); + _write_data(); + } + + void _on_read(beast::error_code ec, std::size_t bytes_transferred) { + boost::ignore_unused(bytes_transferred); + if (ec) { + _fail(ec, "read"); + _handle_error( + ec, "Read failed", WebsocketError::ErrorType::READ_FAILED); + return; + } + _pending_read = false; + WebsocketMessage msg = { + _read_msg_id++, + static_cast(_read_buffer.cdata().data()), + _read_buffer.data().size()}; + _listener->on_data(msg); + _read_buffer.clear(); + _read_data(); + _write_data(); + } + + void _on_close(beast::error_code ec) { + if (ec) { + _fail(ec, "close"); + _listener->on_connection_closed(false); + return; + } + _listener->on_connection_closed(true); + // If we get here then the connection is closed gracefully + // The make_printable() function helps print a ConstBufferSequence + std::cout << "on_close" + << " last data:" << beast::make_printable(_read_buffer.data()) + << std::endl; + } + + bool _is_active() const { return !_encountered_error && !_close_attempted; } +}; +extern "C" { +struct WebsocketMessageWrapper { + std::uint64_t message_id; + std::unique_ptr data; // NOLINT + size_t data_size; + explicit WebsocketMessageWrapper(const WebsocketMessage &msg) + : message_id(msg.message_id), + data(std::make_unique(msg.data_size)), // NOLINT + data_size(msg.data_size) { + memcpy(data.get(), msg.data, msg.data_size); + } + [[nodiscard]] WebsocketMessage get_msg() const { + return {message_id, data.get(), data_size}; + } + bool operator<(const WebsocketMessageWrapper &m) const { + return message_id < m.message_id; + } +}; +} + +struct WebsocketClient::PImpl { + const WebsocketClientConfiguration conf; + IWebsocketListener *listener; + // this is used outside of the start loop + WebsocketClientInternal *wsci = nullptr; + std::vector cached_messages = {}; + bool ioc_blocked = false; + explicit PImpl( + WebsocketClientConfiguration conf_a, IWebsocketListener *listener_a) + : conf(std::move(conf_a)), listener(listener_a) {} +}; + +WebsocketClient::WebsocketClient( + const WebsocketClientConfiguration &conf, IWebsocketListener *listener) { + me = std::make_unique(conf, listener); + // me = new PImpl(conf, listener); +} + +// this is a blocking call +void WebsocketClient::start() { + for (size_t i = 0; i < me->conf.n_reconnection_attempts; i++) { + net::io_context ioc; + std::shared_ptr wsci = + std::make_shared(me->conf, ioc, this); + me->wsci = wsci.get(); + // this also puts something in the io_context "work queue" to stop + // it from ending auto ip_cstr = _ip.c_str(); + me->ioc_blocked = true; + wsci->start(); + ioc.run(); + me->ioc_blocked = false; + me->cached_messages.clear(); + std::this_thread::sleep_for( + std::chrono::milliseconds(me->conf.msecs_bw_connection_tries)); + } +} + +void WebsocketClient::send_message(const WebsocketMessage &msg) { + const auto &msg_copy = me->cached_messages.emplace_back(msg); + me->wsci->send_message(msg_copy.get_msg()); +} + +void close_connection() {} + +// interface methods +void WebsocketClient::on_connection_established() { + // spartan_assert(me->ioc_blocked); + me->listener->on_connection_established(); +} +void WebsocketClient::on_error(const WebsocketError &error) { + // spartan_assert(me->ioc_blocked); + me->listener->on_error(error); +} + +void WebsocketClient::on_write_complete(size_t message_id) { + // _assert(me->ioc_blocked); + me->cached_messages.erase( + std::remove_if( + me->cached_messages.begin(), me->cached_messages.end(), + [&](const auto &m) { return m.message_id == message_id; }), + me->cached_messages.end()); + me->listener->on_write_complete(message_id); +} + +void WebsocketClient::on_data(WebsocketMessage &msg) { + // spartan_assert(me->ioc_blocked); + me->listener->on_data(msg); +} +void WebsocketClient::on_timer() { me->listener->on_timer(); } + +void WebsocketClient::on_connection_closed(bool gracefully) { + me->listener->on_connection_closed(gracefully); +} + +WebsocketClient::~WebsocketClient() = default; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketClient.h b/src/lib/communincation/websockets/WebsocketClient.h new file mode 100644 index 000000000..d846b7377 --- /dev/null +++ b/src/lib/communincation/websockets/WebsocketClient.h @@ -0,0 +1,35 @@ + +#pragma once +#include "IWebsocketListener.h" +#include +#include + +namespace bts::spark::communication { + +struct WebsocketClientConfiguration; + +class WebsocketClient : public IWebsocketListener, + public std::enable_shared_from_this { + private: + struct PImpl; + std::unique_ptr me; + + public: + WebsocketClient( + const WebsocketClientConfiguration &conf, IWebsocketListener *listener); + // ~WebsocketClient() = default; + // this is a blocking call + void start(); + void send_message(const WebsocketMessage &msg); + + // interface methods + void on_connection_established() override; + void on_error(const WebsocketError &error) override; + void on_write_complete(size_t message_id) override; + void on_data(WebsocketMessage &msg) override; + void on_timer() override; + void on_connection_closed(bool gracefully) override; + ~WebsocketClient(); +}; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketClientConfiguration.h b/src/lib/communincation/websockets/WebsocketClientConfiguration.h new file mode 100644 index 000000000..4ce912561 --- /dev/null +++ b/src/lib/communincation/websockets/WebsocketClientConfiguration.h @@ -0,0 +1,17 @@ + +#pragma once +#include + +namespace bts::spark::communication { + +struct WebsocketClientConfiguration { + const std::string ip; + const std::string port; + // this can not be derived form the ip and port only + const std::string host_name; + const size_t n_reconnection_attempts; + const size_t msecs_bw_connection_tries; + const size_t timer_ms; +}; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketError.h b/src/lib/communincation/websockets/WebsocketError.h new file mode 100644 index 000000000..5ebbcd4ff --- /dev/null +++ b/src/lib/communincation/websockets/WebsocketError.h @@ -0,0 +1,19 @@ + +#pragma once +#include + +namespace bts::spark::communication { + +struct WebsocketError { + enum class ErrorType { + SETUP = 0, + DISCONNECT, + WRITE_FAILED, + READ_FAILED, + MISC + }; + ErrorType error_type; + std::string message; +}; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketMessage.h b/src/lib/communincation/websockets/WebsocketMessage.h new file mode 100644 index 000000000..93027a11c --- /dev/null +++ b/src/lib/communincation/websockets/WebsocketMessage.h @@ -0,0 +1,20 @@ + +#pragma once +#include +#include + +namespace bts::spark::communication { + +struct WebsocketMessage { + // user controls the message_id. callback for write complete is called + // using this id + const std::uint64_t message_id; + char const *data; + const size_t data_size; + [[nodiscard]] std::vector convert_to_vector() const { + std::vector rv(data, data + data_size); // NOLINT + return rv; + } +}; + +} // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp new file mode 100644 index 000000000..f5ed0d7bc --- /dev/null +++ b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp @@ -0,0 +1,246 @@ +#include "lib/communincation/websockets/IWebsocketListener.h" +#include "lib/communincation/websockets/WebsocketClient.h" +#include "lib/communincation/websockets/WebsocketClientConfiguration.h" +#include "lib/communincation/websockets/WebsocketError.h" +#include "lib/communincation/websockets/WebsocketMessage.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace beast = boost::beast; // from +namespace http = beast::http; // from +namespace websocket = beast::websocket; // from +namespace net = boost::asio; // from +using tcp = boost::asio::ip::tcp; // from + // using namespace + +namespace bts::spark::communication { + +class RandomGenerator { + public: + double random_double(double min, double max) { + // Standard mersenne_twister_engine seeded with rd() + std::mt19937 gen(rd()); + return std::uniform_real_distribution<>(min, max)(gen); + } + + int random_int(int min, int max) { + return static_cast(random_double(min, max)); + } + + private: + std::random_device rd; +}; + +std::string get_random_string(size_t min_l, size_t max_l) { + RandomGenerator rg = {}; + int len = rg.random_int(static_cast(min_l), static_cast(max_l)); + std::string rv = {}; + for (auto i = 0; i < len; i++) { + // 65-90 + int ic = rg.random_int(65, 90); + char c = static_cast(ic); + rv.append(&c, 1); + } + return rv; +} + +class SyncWebsocketEchoServer { + public: + const std::string ip; + const std::string port; + SyncWebsocketEchoServer(std::string ip_a, std::string port_a) + : ip(std::move(ip_a)), port(std::move(port_a)) {} + static std::string get_thread_string() { + auto core_id = sched_getcpu(); + std::thread::id thread_id = std::this_thread::get_id(); + std::stringstream ss; + ss << "{thread_id:" << thread_id << " core:" << core_id << "}"; + return ss.str(); + } + static void print_thread() { + auto core_id = sched_getcpu(); + std::thread::id thread_id = std::this_thread::get_id(); + std::cout << "Thread details id:" << thread_id << " core:" << core_id + << std::endl; + } + static void handle_single_session(tcp::socket socket) { + try { + auto remote_ep = socket.remote_endpoint(); + std::cout << "New connection local_endpoint:" + << socket.local_endpoint() + << " remote_endpoint:" << socket.remote_endpoint() + << std::endl; + print_thread(); + websocket::stream ws{std::move(socket)}; + + // Set a decorator to change the Server of the handshake + ws.set_option(websocket::stream_base::decorator( + [](websocket::response_type &res) { + res.set( + http::field::server, + std::string(BOOST_BEAST_VERSION_STRING) + + " websocket-server-sync"); + })); + // Accept the websocket handshake + ws.accept(); + auto n_msgs = 0; + for (;;) { + // This buffer will hold the incoming message + beast::flat_buffer buffer; + // Read a message + ws.read(buffer); + ws.text(ws.got_text()); + std::string recv_txt = beast::buffers_to_string(buffer.data()); + n_msgs++; + // std::cout << "Received data:" << recv_txt << " from:" << + // remote_ep + // << std::endl; + std::cout << "Received msg#: " << n_msgs + << " sz:" << recv_txt.size() << " from:" << remote_ep + << std::endl; + // invert the text and echo it + auto send_i_txt = recv_txt; + std::cout << "Sending data:(after sleeping) sz: " + << send_i_txt.size() << " to:" << remote_ep << std::endl; + std::this_thread::sleep_for(std::chrono::seconds(2)); + ws.write(net::buffer(send_i_txt)); + } + } catch (beast::system_error const &se) { + // This indicates that the session was closed + if (se.code() != websocket::error::closed) { + std::cerr << "Error: " << se.code().message() << std::endl; + } + } catch (std::exception const &e) { + std::cerr << "Error: " << e.what() << std::endl; + } + } + + void accept_connection() { + try { + auto const address_ip = boost::asio::ip::make_address(ip); + auto const address_port = static_cast(std::stoi(port)); + + // The io_context is required for all I/O + net::io_context ioc{1}; + std::cout << "Starting websocket server on ip:" << ip + << " port:" << port << std::endl; + // The acceptor receives incoming connections + tcp::acceptor acceptor{ioc, {address_ip, address_port}}; + for (;;) { + // This will receive the new connection + tcp::socket socket{ioc}; + // Block until we get a connection + acceptor.accept(socket); + std::cout << "Connection accepted" << std::endl; + // Launch the session, transferring ownership of the socket + // copy cons is deleted for socket + auto conn_wrapper = [&](tcp::socket s) { + handle_single_session(std::move(s)); + }; + std::thread socket_thread(conn_wrapper, std::move(socket)); + socket_thread.detach(); + } + } catch (const std::exception &e) { + std::cerr << "Error: " << e.what() << std::endl; + return; + } + } +}; + +TEST_CASE("WebsocketEchoServer", "[websocketserver]") { + SyncWebsocketEchoServer serv("127.0.0.1", "8083"); + serv.accept_connection(); +} + +TEST_CASE("WebsocketClientTest", "[websocketclient]") { + class WebsocketSync : public IWebsocketListener { + public: + std::shared_ptr wsc = nullptr; + const int msg_burst_sz = 20; + uint64_t msg_id = 0; + int n_msgs_recv = 0; + int n_msgs_send = 0; + WebsocketSync() = default; + void on_connection_established() override { + std::cout << "*** Listener::connection established" << std::endl; + n_msgs_recv = 0; + n_msgs_send = 0; + } + void on_error(const WebsocketError &error) override { + std::cout << "*** Listener:on_error " << error.message << std::endl; + } + void on_write_complete(size_t message_id) override { + std::cout << "*** Listener::on_write_complete message_id: " + << message_id << std::endl; + } + void on_data(WebsocketMessage &msg) override { + n_msgs_recv++; + std::cout << "*** Listener::on_data sz: " << msg.data_size + << " n_msgs_recv: " << n_msgs_recv << std::endl; + } + void on_timer() override { + std::cout << "*** Listener::on_timer" << std::endl; + if (n_msgs_send == n_msgs_recv) { + send_msg(msg_burst_sz); + } + } + void on_connection_closed(bool gracefully) override { + std::cout << "*** Listener::on_connection_closed gracefully: " + << gracefully << std::endl; + } + void send_msg(int n_msgs = 1) { + for (auto i = 0; i < n_msgs; i++) { + auto text = get_random_string(5, 20); + WebsocketMessage msg{msg_id++, text.c_str(), text.size()}; + wsc->send_message(msg); + n_msgs_send++; + std::cout << "*** Listener::send_message sz: " << text.size() + << " n_msgs_send: " << n_msgs_send << std::endl; + } + } + }; + WebsocketSync l; + std::shared_ptr c = std::make_shared( + WebsocketClientConfiguration{ + "127.0.0.1", "8083", "127.0.0.1:8083", 10, 10000, 1000}, + &l); + l.wsc = c; + // blocking call + c->start(); + std::cout << "Test end" << std::endl; +} +} // namespace bts::spark::communication \ No newline at end of file From fc4fa3893c27ed54c622ee399bc85f185e6d4279 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 4 Oct 2021 17:34:30 -0400 Subject: [PATCH 007/100] added comments to the websocket interface and structures --- doc/user/CMakeDeps.cmake | 2 +- src/data_files/CMakeDeps.cmake | 2 +- src/lib/CMakeDeps.cmake | 2 +- .../communincation/websockets/IWebsocketListener.h | 11 +++++++++++ src/lib/communincation/websockets/WebsocketClient.h | 12 ++++++++---- src/lib/communincation/websockets/WebsocketError.h | 2 +- src/lib/communincation/websockets/WebsocketMessage.h | 3 +-- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/doc/user/CMakeDeps.cmake b/doc/user/CMakeDeps.cmake index 59a6b66b9..2a030ae60 100644 --- a/doc/user/CMakeDeps.cmake +++ b/doc/user/CMakeDeps.cmake @@ -1 +1 @@ -set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html) \ No newline at end of file +set(sources /home/taha/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html) \ No newline at end of file diff --git a/src/data_files/CMakeDeps.cmake b/src/data_files/CMakeDeps.cmake index 4d159d163..e3d917eb4 100644 --- a/src/data_files/CMakeDeps.cmake +++ b/src/data_files/CMakeDeps.cmake @@ -1 +1 @@ -set(sources files/audit_ilink3.py;files/audit_upload.sh;files/audit_uploader.py;files/cert_secure_logon.txt;files/example.conf;files/futures.coconut.xz;files/onixs_ice/ConnectivityConfiguration.APITest.xml;files/onixs_ice/ConnectivityConfiguration.APITest.xml.orig;files/onixs_ice/ConnectivityConfiguration.PerfTest.xml;files/onixs_ice/ConnectivityConfiguration.Production.xml;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js;files/small_es.pcap.xz;files/spartan/create_polygon_books.sql;files/spartan/log.sql;files/spartan/md.sql;files/spartan/sim_db.sql) \ No newline at end of file +set(sources files/audit_ilink3.py;files/audit_upload.sh;files/audit_uploader.py;files/cert_secure_logon.txt;files/example.conf;files/futures.coconut.xz;files/onixs_ice/ConnectivityConfiguration.APITest.xml;files/onixs_ice/ConnectivityConfiguration.PerfTest.xml;files/onixs_ice/ConnectivityConfiguration.Production.xml;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js;files/small_es.pcap.xz;files/spartan/create_polygon_books.sql;files/spartan/log.sql;files/spartan/md.sql;files/spartan/sim_db.sql) \ No newline at end of file diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index e0dd5288c..e08b280c5 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3GW.cpp;orderman/actors/ilink3/IL3Parser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/SessionStore.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/WebsocketClient.cpp;communincation/websockets/tests/WebsocketClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;md/websockets/WebsocketClient.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3GW.cpp;orderman/actors/ilink3/IL3Parser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/SessionStore.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/communincation/websockets/IWebsocketListener.h b/src/lib/communincation/websockets/IWebsocketListener.h index f1e27e9b5..b88f3de49 100644 --- a/src/lib/communincation/websockets/IWebsocketListener.h +++ b/src/lib/communincation/websockets/IWebsocketListener.h @@ -6,13 +6,24 @@ namespace bts::spark::communication { class WebsocketError; class WebsocketMessage; +// Interface on which to receive data, status and timer events class IWebsocketListener { public: + // this is called after successful address resolution, connection and + // handshake virtual void on_connection_established() = 0; + // any kind of error, either before the connection is established or after + // results in a call to on_error. this is usually followed by an + // on_connection_closed(false) call virtual void on_error(const WebsocketError &error) = 0; virtual void on_write_complete(size_t message_id) = 0; + // msg's data is valid for the duration of the call virtual void on_data(WebsocketMessage &msg) = 0; + // timer period is set in WebsocketClientConfiguration::timer_ms virtual void on_timer() = 0; + // called when a connection is closed either gracefully or because of a + // disconnection. A !gracefully on_connection_closed call is usually + // preceeded by an on_error virtual void on_connection_closed(bool gracefully) = 0; }; diff --git a/src/lib/communincation/websockets/WebsocketClient.h b/src/lib/communincation/websockets/WebsocketClient.h index d846b7377..155da013d 100644 --- a/src/lib/communincation/websockets/WebsocketClient.h +++ b/src/lib/communincation/websockets/WebsocketClient.h @@ -15,14 +15,18 @@ class WebsocketClient : public IWebsocketListener, std::unique_ptr me; public: + // Listerner is registered at construction time, websockets settings are + // defined in WebsocketClientConfiguration WebsocketClient( const WebsocketClientConfiguration &conf, IWebsocketListener *listener); - // ~WebsocketClient() = default; - // this is a blocking call + // this is a blocking call. All callbacks are called on this callstack. If a + // connection goes down or encounters an error, a new connection attempt is + // automatically attemped. void start(); + // msg::data has to be valid for the duration of the call only. + // msg::message_id should be unique across lifetime of the WebsocketClient void send_message(const WebsocketMessage &msg); - - // interface methods + // IWebsocketListener interface methods void on_connection_established() override; void on_error(const WebsocketError &error) override; void on_write_complete(size_t message_id) override; diff --git a/src/lib/communincation/websockets/WebsocketError.h b/src/lib/communincation/websockets/WebsocketError.h index 5ebbcd4ff..58e0becc4 100644 --- a/src/lib/communincation/websockets/WebsocketError.h +++ b/src/lib/communincation/websockets/WebsocketError.h @@ -6,7 +6,7 @@ namespace bts::spark::communication { struct WebsocketError { enum class ErrorType { - SETUP = 0, + SETUP = 0, // error happens during the connection setup phase DISCONNECT, WRITE_FAILED, READ_FAILED, diff --git a/src/lib/communincation/websockets/WebsocketMessage.h b/src/lib/communincation/websockets/WebsocketMessage.h index 93027a11c..93015b1f6 100644 --- a/src/lib/communincation/websockets/WebsocketMessage.h +++ b/src/lib/communincation/websockets/WebsocketMessage.h @@ -12,8 +12,7 @@ struct WebsocketMessage { char const *data; const size_t data_size; [[nodiscard]] std::vector convert_to_vector() const { - std::vector rv(data, data + data_size); // NOLINT - return rv; + return std::vector{data, data + data_size}; // NOLINT } }; From 936a3b624b24587e5e69ac7086b1b4c2a9a9894c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 7 Oct 2021 14:20:49 -0400 Subject: [PATCH 008/100] Added WebsocketSyncClientTests --- src/lib/CMakeDeps.cmake | 2 +- .../websockets/WebsocketClient.cpp | 25 ++- .../websockets/tests/WebsocketClientTests.cpp | 9 +- .../tests/WebsocketSyncClientTests.cpp | 200 ++++++++++++++++++ src/lib/md/websockets/WebsocketClient.cpp | 1 - src/lib/md/websockets/WebsocketClient.h | 104 --------- .../spreader_orders/tests/spreader_tests.cpp | 1 - 7 files changed, 229 insertions(+), 113 deletions(-) create mode 100644 src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp delete mode 100644 src/lib/md/websockets/WebsocketClient.cpp delete mode 100644 src/lib/md/websockets/WebsocketClient.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index e08b280c5..7eef4024c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/WebsocketClient.cpp;communincation/websockets/tests/WebsocketClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;md/websockets/WebsocketClient.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3GW.cpp;orderman/actors/ilink3/IL3Parser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/SessionStore.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/WebsocketClient.cpp;communincation/websockets/tests/WebsocketClientTests.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3GW.cpp;orderman/actors/ilink3/IL3Parser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/SessionStore.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/communincation/websockets/WebsocketClient.cpp b/src/lib/communincation/websockets/WebsocketClient.cpp index 42d0519ac..6ece40528 100644 --- a/src/lib/communincation/websockets/WebsocketClient.cpp +++ b/src/lib/communincation/websockets/WebsocketClient.cpp @@ -2,6 +2,7 @@ #include "WebsocketClientConfiguration.h" #include "WebsocketError.h" #include "WebsocketMessage.h" +#include "lib/logging/logging.h" #include #include #include @@ -21,7 +22,6 @@ #include #include #include -// #include #include #include #include @@ -32,10 +32,14 @@ #include #include #include +#include #include #include #include #include +#include +// #include +#include namespace beast = boost::beast; // from namespace http = beast::http; // from @@ -123,6 +127,9 @@ class WebsocketClientInternal _encountered_error = true; std::stringstream str; str << "Error_code:" << error_code << " Text:" << err_msg; + LOG(OrderMan, Info, + "WebsocketClientInternal::_handle_error error_code:{} err_msg:{}", + error_code, err_msg); _listener->on_error({err_type, str.str()}); close_connection(); } @@ -143,6 +150,9 @@ class WebsocketClientInternal WebsocketError::ErrorType::SETUP); return; } + LOG(OrderMan, Info, + "WebsocketClientInternal::_on_resolve successfull results:{}", + results.size()); // Set the timeout for the operation beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); // Make the connection on the IP address we get from a lookup @@ -160,6 +170,8 @@ class WebsocketClientInternal ec, "Connection failed", WebsocketError::ErrorType::SETUP); return; } + LOG(OrderMan, Info, + "WebsocketClientInternal::_on_connect successfull ep:{}", ep); // Turn off the timeout on the tcp_stream, because // the websocket stream has its own timeout system. beast::get_lowest_layer(_ws).expires_never(); @@ -177,11 +189,16 @@ class WebsocketClientInternal // Update the host_ string. This will provide the value of the // Host HTTP header during the WebSocket handshake. // See https://tools.ietf.org/html/rfc7230#section-5.4 - auto host = _conf.ip + ':' + std::to_string(ep.port()); + auto host = + "wss://" + ep.address().to_string() + ':' + std::to_string(ep.port()); + host = _conf.host_name; + LOG(OrderMan, Info, + "WebsocketClientInternal::_on_connect sending hand_shake to:{}", + host); // spartan_assert(!host.empty()); // Perform the websocket handshake _ws.async_handshake( - _conf.host_name, "/", + host, "/", beast::bind_front_handler(&WSCI::_on_handshake, shared_from_this())); } @@ -192,6 +209,8 @@ class WebsocketClientInternal ec, "Handshake failed", WebsocketError::ErrorType::SETUP); return; } + + LOG(OrderMan, Info, "WebsocketClientInternal::_on_connect successfull"); // this is when the connection is really established _listener->on_connection_established(); _read_data(); diff --git a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp index f5ed0d7bc..2aa9bbf5c 100644 --- a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp +++ b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp @@ -194,7 +194,7 @@ TEST_CASE("WebsocketClientTest", "[websocketclient]") { uint64_t msg_id = 0; int n_msgs_recv = 0; int n_msgs_send = 0; - WebsocketSync() = default; + WebsocketSync(int msg_burst_sz_a) : msg_burst_sz(msg_burst_sz_a) {} void on_connection_established() override { std::cout << "*** Listener::connection established" << std::endl; n_msgs_recv = 0; @@ -233,10 +233,13 @@ TEST_CASE("WebsocketClientTest", "[websocketclient]") { } } }; - WebsocketSync l; + WebsocketSync l{0}; std::shared_ptr c = std::make_shared( WebsocketClientConfiguration{ - "127.0.0.1", "8083", "127.0.0.1:8083", 10, 10000, 1000}, + //"127.0.0.1", "8083", "blah://127.0.0.1:8083", 1, 10000, 1000}, + "stream.binance.com", "9443", "/ws/btcusdt@depth@100ms", 1, 10000, + 10000}, + &l); l.wsc = c; // blocking call diff --git a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp new file mode 100644 index 000000000..b8655acf6 --- /dev/null +++ b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp @@ -0,0 +1,200 @@ +// #include "./root_certificates.hpp" + +#include +#include +// #include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +namespace beast = boost::beast; // from +namespace http = beast::http; // from +namespace websocket = beast::websocket; // from +namespace net = boost::asio; // from +namespace ssl = boost::asio::ssl; // from +using tcp = boost::asio::ip::tcp; // from + +// Class to connect to a websocket endpoint and receive data continuously +// counterparty closes or stopped manually +class WebSocketSession : public std::enable_shared_from_this { + net::io_context &_ioContext; + ssl::context &_sslContext; + tcp::resolver _tcpResolver; + std::shared_ptr>> _ws; + beast::flat_buffer _buffer; + std::string _host; + char const *_port; + std::string _target; + std::string _hostAndPort; + std::string _text; + tcp::endpoint _tcpEndPoint; + bool _terminate = false; + + void ConnectAndReceive() { + // Look up the domain name + auto const tcpResolverResults = _tcpResolver.resolve(_host, _port); + + // Make the connection on the IP address we get from a lookup + _tcpEndPoint = net::connect(get_lowest_layer(*_ws), tcpResolverResults); + + // Set SNI Hostname (many hosts need this to handshake successfully) + if (!SSL_set_tlsext_host_name( + _ws->next_layer().native_handle(), _host.c_str())) { + throw beast::system_error( + beast::error_code( + static_cast(::ERR_get_error()), + net::error::get_ssl_category()), + "Failed to set SNI Hostname"); + } + // Update the _host string. This will provide the value of the + // Host HTTP header during the WebSocket handshake. + // See https://tools.ietf.org/html/rfc7230#section-5.4 + _hostAndPort = _host + ':' + std::to_string(_tcpEndPoint.port()); + std::cout << "_hostAndPort:" << _hostAndPort << std::endl; + // Perform the SSL handshake + _ws->next_layer().handshake(ssl::stream_base::client); + + // Set a decorator to change the User-Agent of the handshake + _ws->set_option( + websocket::stream_base::decorator([](websocket::request_type &req) { + req.set( + http::field::user_agent, + std::string(BOOST_BEAST_VERSION_STRING) + + " websocket-client-coro"); + })); + + // Perform the websocket handshake + std::cout << "sending handshake, _hostAndPort:" << _hostAndPort + << " _target:" << _target << std::endl; + _ws->handshake(_hostAndPort, _target); + + // Read Messages + try { + while (true) // expect to read continuously until a connection failure + { + if (!_terminate) { + _ws->read(_buffer); + + if (_buffer.size() > 0) { + std::cout << beast::make_printable(_buffer.data()) + << std::endl; + } + _buffer.clear(); + } else { + _ws->close(boost::beast::websocket::close_code::normal); + } + } + } catch (beast::system_error const &se) { + if (se.code() == websocket::error::closed) { + std::cout << "socket was closed." << std::endl; + } else { + std::cout << "exception: " << se.code() << ", " + << se.code().message() << ", " << se.what(); + } + } catch (std::exception &ex) { + std::cout << "exception: " << ex.what(); + } + } + + public: + // Resolver and socket require an io_context + explicit WebSocketSession( + net::io_context &ioc, + ssl::context &ctx, + char const *host, + char const *port, + char const *target) + : _ioContext(ioc), _sslContext(ctx), _tcpResolver(_ioContext), + _host(host), _port(port), _target(target), _hostAndPort() {} + + void Stop() { _terminate = true; } + + void Start() { + while (!_terminate) { + + _ws = std::make_shared< + websocket::stream>>( + _ioContext, _sslContext); + + try { + ConnectAndReceive(); // initalizes websocket and polls continuously + // for messages until socket closed or an + // exception occurs + } catch (beast::system_error const &se) { + std::cout << "exception: " << se.code() << ", " + << se.code().message() << std::endl; + + // Sleep(1000); // just wait a little while to not spam + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); + } + + _ws.reset(); + } + + // if we get to here process has been terminated + } +}; + +//------------------------------------------------------------------------------ + +TEST_CASE("WebsocketSyncClientTest", "[ws_ssl]") { + auto host = "stream.binance.com"; + auto port = "9443"; + auto target = "/ws/btcusdt@depth@100ms"; // bitcoin full order book endpoint, + // 100ms updates + // auto text = ""; + + // The io_context is required for all I/O + net::io_context ioc; + // The SSL context is required, and holds certificates + ssl::context ctx{ssl::context::tlsv12_client}; + ctx.set_verify_mode(ssl::verify_none); + // This holds the root certificate used for verification + // boost::asio::ssl::load_root_certificates(ctx); + + // Run the I/O service. The call will return when + // the socket is closed. + ioc.run(); + + std::string inputStr; + std::thread t; + + std::shared_ptr websocketSession; + + while (inputStr != "x") { + std::cout << "Press 'r' to run. Press 's' to stop. Press 'x' to Exit." + << std::endl; + std::cin >> inputStr; + + if (inputStr == "r") { // run + if (websocketSession.use_count() == 0) { // should not run twice + t = std::thread( + [&websocketSession, &ioc, &ctx, host, port, target] { + websocketSession = std::make_shared( + ioc, ctx, host, port, target); + websocketSession->Start(); // within a thread so doesn't + // block + }); + } + } else if (inputStr == "s" || inputStr == "x") { // stop & exit + if (websocketSession.use_count()) { // running + websocketSession->Stop(); + t.join(); + t.~thread(); + websocketSession.reset(); + } + } + } +} \ No newline at end of file diff --git a/src/lib/md/websockets/WebsocketClient.cpp b/src/lib/md/websockets/WebsocketClient.cpp deleted file mode 100644 index a716ac3a1..000000000 --- a/src/lib/md/websockets/WebsocketClient.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "WebsocketClient.h" \ No newline at end of file diff --git a/src/lib/md/websockets/WebsocketClient.h b/src/lib/md/websockets/WebsocketClient.h deleted file mode 100644 index df5c5e6d3..000000000 --- a/src/lib/md/websockets/WebsocketClient.h +++ /dev/null @@ -1,104 +0,0 @@ -#pragma once - -// #include -// #include -// #include -#include -#include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// namespace beast = boost::beast; // from -// namespace http = beast::http; // from -// namespace websocket = beast::websocket; // from -// namespace net = boost::asio; // from -// using tcp = boost::asio::ip::tcp; // from - -namespace bts { -namespace md { - -// This lightweight wrapper type is used to exchange messages between the -// WebsocketClient it's user. Since it has a const* access to the data, it does -// NOT manage data's memory. -struct WebsocketMessage { - // The generators of the message controls the unique message_id - const std::uint64_t message_id; - // The actual data. This lifecycle of the memory is controlled by the - // generator of this message. The only assumption is that the memory is valid - // while this object is passed from the caller to the callee - char const *data; - const size_t data_size; -}; - -// All errors for now are irrecoverable. In case of an error the physical -// connection is destroyed, resources are collected and a new connection is -// attempted -struct WebsocketError { - enum class ErrorType { SETUP = 0, DISCONNECT, WRITE_FAILED, READ_FAILED }; - ErrorType error_type; - std::string message; -}; - -// This interface is passed to the WebsocketClient. -class IWebsocketListener { - public: - // This is called after a successful resoloution, connection and handshake. - // The first batch of data can be sent on this callback - virtual void on_connection_established() = 0; - // Called when an irrecoverable error happens. The WebsocketClient tries to - // reconnect after this. Any attempts to send_message are ignored until the - // connection is re-established - virtual void on_error(const WebsocketError &error) = 0; - virtual void on_write_complete(size_t message_id) = 0; - virtual void on_data(WebsocketMessage &msg) = 0; -}; - -struct WebsocketClientConfiguration { - const size_t msecs_bw_connection_tries = 5000; -}; - -// This is the main class the market data components (client to the exchange -// websockets) will use. The ip, port, other configurations, listener -// registration is done at construction time, followed by a blocking call to -// start. -class WebsocketClient : public IWebsocketListener { - public: - explicit WebsocketClient( - const std::string &ip, - const std::string &port, - WebsocketClientConfiguration conf, - IWebsocketListener *listener); - // this is a blocking call, that is called only once. - void start(); - // can be called on any IWebsocketListener callback - void send_message(const std::vector &msgs); -}; - -} // namespace md -} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index da55ef6f8..cc97147ac 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,7 +1,6 @@ #include "lib/md/emumba/IMarketDataListener.h" #include "lib/md/emumba/MarketDataCommon.h" #include "lib/md/emumba/MarketDataGateway.h" -#include "lib/md/websockets/WebsocketClient.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From fc7237c7b9d9e6a2dc7ccd57cc892c3f31145084 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 8 Oct 2021 00:22:52 -0400 Subject: [PATCH 009/100] WebsocketClient working after and getting data from binance after adding the SSL handshake --- .../websockets/WebsocketClient.cpp | 361 ++++++++++++++++-- .../websockets/WebsocketClient.h | 1 + .../websockets/tests/WebsocketClientTests.cpp | 168 ++++++-- .../tests/WebsocketSyncClientTests.cpp | 1 + 4 files changed, 469 insertions(+), 62 deletions(-) diff --git a/src/lib/communincation/websockets/WebsocketClient.cpp b/src/lib/communincation/websockets/WebsocketClient.cpp index 6ece40528..291c263e3 100644 --- a/src/lib/communincation/websockets/WebsocketClient.cpp +++ b/src/lib/communincation/websockets/WebsocketClient.cpp @@ -3,6 +3,7 @@ #include "WebsocketError.h" #include "WebsocketMessage.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include #include #include @@ -16,7 +17,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -38,13 +41,13 @@ #include #include #include -// #include #include namespace beast = boost::beast; // from namespace http = beast::http; // from namespace websocket = beast::websocket; // from namespace net = boost::asio; // from +namespace ssl = boost::asio::ssl; // from using tcp = boost::asio::ip::tcp; // from namespace bts::spark::communication { @@ -57,18 +60,282 @@ std::string get_thread_string() { return ss.str(); } -// Sends a WebSocket message and prints the response -class WebsocketClientInternal - : public std::enable_shared_from_this { +// class WebsocketClientInternal +// : public std::enable_shared_from_this { +// private: +// using WSCI = WebsocketClientInternal; +// const WebsocketClientConfiguration _conf; +// net::io_context &_io_context; +// tcp::resolver _resolver; +// websocket::stream _ws; +// beast::flat_buffer _read_buffer; +// boost::asio::deadline_timer _timer; +// IWebsocketListener *_listener; +// // can't call async_read until the completion call +// bool _pending_read = false; +// // same for write +// bool _pending_write = false; +// // for send_message calls when there is_pending_write is true +// std::queue _send_queue = {}; +// // this is just incremented and every read message is tagged with it +// uint64_t _read_msg_id = 0; +// // since there can only be one pending write at a time (ie we cant send an +// // aysnc write until the last write's completion has been called) +// uint64_t _pending_write_msg_id = 0; +// // if any of the async call completion result in an error, this is set. +// // this allows the timer +// bool _encountered_error = false; +// // oneway switch thats turned on once async_close is called +// bool _close_attempted = false; + +// public: +// // Resolver and socket require an io_context +// explicit WebsocketClientInternal( +// const WebsocketClientConfiguration &conf, +// net::io_context &ioc, +// IWebsocketListener *listener) +// : _conf(conf), _io_context(ioc), _resolver(net::make_strand(ioc)), +// _ws(net::make_strand(ioc)), +// _timer(ioc, boost::posix_time::milliseconds(conf.timer_ms)), +// _listener(listener) {} + +// // user facing function +// void start() { _resolve(); } + +// void send_message(const WebsocketMessage &msg) { +// _send_queue.push(msg); +// _write_data(); +// } + +// void close_connection() { +// if (!_close_attempted) { +// _close_attempted = true; +// _ws.async_close( +// websocket::close_code::normal, +// beast::bind_front_handler(&WSCI::_on_close, +// shared_from_this())); +// } +// } + +// private: +// // Report a failure +// static void _fail(beast::error_code ec, char const *what) { +// std::cerr << what << ": " << ec.message() << std::endl; +// } + +// void _handle_error( +// beast::error_code error_code, +// std::string &&err_msg, +// WebsocketError::ErrorType err_type) { +// _encountered_error = true; +// std::stringstream str; +// str << "Error_code:" << error_code << " Text:" << err_msg; +// LOG(OrderMan, Info, +// "WebsocketClientInternal::_handle_error error_code:{} err_msg:{}", +// error_code, err_msg); +// _listener->on_error({err_type, str.str()}); +// close_connection(); +// } + +// // Start the asynchronous operation +// void _resolve() { +// _resolver.async_resolve( +// _conf.ip, _conf.port, +// beast::bind_front_handler(&WSCI::_on_resolve, shared_from_this())); +// } + +// void _on_resolve( +// beast::error_code ec, const tcp::resolver::results_type &results) { +// if (ec) { +// _fail(ec, "resolve"); +// _handle_error( +// ec, "Address resoloution failed", +// WebsocketError::ErrorType::SETUP); +// return; +// } +// LOG(OrderMan, Info, +// "WebsocketClientInternal::_on_resolve successfull results:{}", +// results.size()); +// // Set the timeout for the operation +// beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); +// // Make the connection on the IP address we get from a lookup +// beast::get_lowest_layer(_ws).async_connect( +// results, +// beast::bind_front_handler(&WSCI::_on_connect, shared_from_this())); +// } + +// void _on_connect( +// beast::error_code ec, +// const tcp::resolver::results_type::endpoint_type &ep) { +// if (ec) { +// _fail(ec, "connect"); +// _handle_error( +// ec, "Connection failed", WebsocketError::ErrorType::SETUP); +// return; +// } +// LOG(OrderMan, Info, +// "WebsocketClientInternal::_on_connect successfull ep:{}", ep); +// // Turn off the timeout on the tcp_stream, because +// // the websocket stream has its own timeout system. +// beast::get_lowest_layer(_ws).expires_never(); +// // Set suggested timeout settings for the websocket +// _ws.set_option( +// websocket::stream_base::timeout::suggested(beast::role_type::client)); +// // Set a decorator to change the User-Agent of the handshake +// _ws.set_option( +// websocket::stream_base::decorator([](websocket::request_type &req) +// { +// req.set( +// http::field::user_agent, +// std::string(BOOST_BEAST_VERSION_STRING) + +// " websocket-client-async"); +// })); +// // Update the host_ string. This will provide the value of the +// // Host HTTP header during the WebSocket handshake. +// // See https://tools.ietf.org/html/rfc7230#section-5.4 +// auto ip_port = ep.address().to_string() + ':' + +// std::to_string(ep.port()); +// // host = _conf.host_name; +// LOG(OrderMan, Info, +// "WebsocketClientInternal::_on_connect sending handshake to ip_port: +// " +// "{} host: {}", +// _conf.host_name); +// // spartan_assert(!host.empty()); +// // Perform the websocket handshake +// _ws.async_handshake( +// ip_port, _conf.host_name, +// beast::bind_front_handler(&WSCI::_on_handshake, +// shared_from_this())); +// } + +// void _on_handshake(beast::error_code ec) { +// if (ec) { +// _fail(ec, "handshake"); +// _handle_error( +// ec, "Handshake failed", WebsocketError::ErrorType::SETUP); +// return; +// } + +// LOG(OrderMan, Info, "WebsocketClientInternal::_on_connect +// successfull"); +// // this is when the connection is really established +// _listener->on_connection_established(); +// _read_data(); +// _write_data(); +// _reinit_timer(); +// } + +// void _on_timer(beast::error_code ec) { +// if (ec) { +// _fail(ec, "timer"); +// _handle_error(ec, "Timer failed", WebsocketError::ErrorType::MISC); +// return; +// } +// _listener->on_timer(); +// if (_is_active()) { +// _reinit_timer(); +// } +// } + +// void _reinit_timer() { +// _timer.expires_at( +// _timer.expires_at() + +// boost::posix_time::milliseconds(_conf.timer_ms)); +// _timer.async_wait( +// beast::bind_front_handler(&WSCI::_on_timer, shared_from_this())); +// } + +// void _write_data() { +// if (!_pending_write) { +// if (!_send_queue.empty()) { +// WebsocketMessage msg = _send_queue.front(); +// _pending_write_msg_id = msg.message_id; +// _send_queue.pop(); +// _pending_write = true; +// _ws.async_write( +// net::buffer(msg.data, msg.data_size), +// beast::bind_front_handler( +// &WSCI::_on_write, shared_from_this())); +// } +// } +// } + +// void _read_data() { +// if (!_pending_read) { +// _pending_read = true; +// _ws.async_read( +// _read_buffer, +// beast::bind_front_handler(&WSCI::_on_read, shared_from_this())); +// } +// } + +// void _on_write(beast::error_code ec, std::size_t bytes_transferred) { +// boost::ignore_unused(bytes_transferred); +// if (ec) { +// _fail(ec, "write"); +// _handle_error( +// ec, "Write failed", WebsocketError::ErrorType::WRITE_FAILED); +// return; +// } +// _pending_write = false; +// // Read a message into our buffer +// _listener->on_write_complete(_pending_write_msg_id); +// _read_data(); +// _write_data(); +// } + +// void _on_read(beast::error_code ec, std::size_t bytes_transferred) { +// boost::ignore_unused(bytes_transferred); +// if (ec) { +// _fail(ec, "read"); +// _handle_error( +// ec, "Read failed", WebsocketError::ErrorType::READ_FAILED); +// return; +// } +// _pending_read = false; +// WebsocketMessage msg = { +// _read_msg_id++, +// static_cast(_read_buffer.cdata().data()), +// _read_buffer.data().size()}; +// _listener->on_data(msg); +// _read_buffer.clear(); +// _read_data(); +// _write_data(); +// } + +// void _on_close(beast::error_code ec) { +// if (ec) { +// _fail(ec, "close"); +// _listener->on_connection_closed(false); +// return; +// } +// _listener->on_connection_closed(true); +// // If we get here then the connection is closed gracefully +// // The make_printable() function helps print a ConstBufferSequence +// std::cout << "on_close" +// << " last data:" << +// beast::make_printable(_read_buffer.data()) +// << std::endl; +// } + +// bool _is_active() const { return !_encountered_error && !_close_attempted; +// } +// }; + +class WebsocketSSLClientInternal + : public std::enable_shared_from_this { private: - using WSCI = WebsocketClientInternal; + using WSCI = WebsocketSSLClientInternal; const WebsocketClientConfiguration _conf; net::io_context &_io_context; + ssl::context &_ctx; tcp::resolver _resolver; - websocket::stream _ws; + websocket::stream> _ws; beast::flat_buffer _read_buffer; boost::asio::deadline_timer _timer; IWebsocketListener *_listener; + std::string ip_port = {}; // can't call async_read until the completion call bool _pending_read = false; // same for write @@ -88,12 +355,13 @@ class WebsocketClientInternal public: // Resolver and socket require an io_context - explicit WebsocketClientInternal( + explicit WebsocketSSLClientInternal( const WebsocketClientConfiguration &conf, net::io_context &ioc, + ssl::context &ctx, IWebsocketListener *listener) - : _conf(conf), _io_context(ioc), _resolver(net::make_strand(ioc)), - _ws(net::make_strand(ioc)), + : _conf(conf), _io_context(ioc), _ctx(ctx), + _resolver(net::make_strand(ioc)), _ws(net::make_strand(ioc), ctx), _timer(ioc, boost::posix_time::milliseconds(conf.timer_ms)), _listener(listener) {} @@ -115,7 +383,6 @@ class WebsocketClientInternal } private: - // Report a failure static void _fail(beast::error_code ec, char const *what) { std::cerr << what << ": " << ec.message() << std::endl; } @@ -128,7 +395,7 @@ class WebsocketClientInternal std::stringstream str; str << "Error_code:" << error_code << " Text:" << err_msg; LOG(OrderMan, Info, - "WebsocketClientInternal::_handle_error error_code:{} err_msg:{}", + "WebsocketSSLClientInternal::_handle_error error_code:{} err_msg:{}", error_code, err_msg); _listener->on_error({err_type, str.str()}); close_connection(); @@ -151,7 +418,7 @@ class WebsocketClientInternal return; } LOG(OrderMan, Info, - "WebsocketClientInternal::_on_resolve successfull results:{}", + "WebsocketSSLClientInternal::_on_resolve successfull results:{}", results.size()); // Set the timeout for the operation beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); @@ -171,34 +438,59 @@ class WebsocketClientInternal return; } LOG(OrderMan, Info, - "WebsocketClientInternal::_on_connect successfull ep:{}", ep); + "WebsocketSSLClientInternal::_on_connect successfull ep:{}", ep); + ip_port = _conf.ip + ':' + std::to_string(ep.port()); + // Set a timeout on the operation + beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); + + // Set SNI Hostname (many hosts need this to handshake successfully) + if (!SSL_set_tlsext_host_name( + _ws.next_layer().native_handle(), ip_port.c_str())) { + ec = beast::error_code( + static_cast(::ERR_get_error()), + net::error::get_ssl_category()); + _fail(ec, "connect"); + _handle_error( + ec, "Connection failed", WebsocketError::ErrorType::SETUP); + return; + } + + // Perform the SSL handshake + _ws.next_layer().async_handshake( + ssl::stream_base::client, + beast::bind_front_handler( + &WSCI::_on_ssl_handshake, shared_from_this())); + } + + void _on_ssl_handshake(beast::error_code ec) { + if (ec) { + _fail(ec, "ssl_handshake"); + _handle_error( + ec, "SSL Handshake failed", WebsocketError::ErrorType::SETUP); + return; + } + LOG(OrderMan, Info, + "WebsocketSSLClientInternal::_on_ssl_handshake successful"); // Turn off the timeout on the tcp_stream, because // the websocket stream has its own timeout system. beast::get_lowest_layer(_ws).expires_never(); + // Set suggested timeout settings for the websocket _ws.set_option( websocket::stream_base::timeout::suggested(beast::role_type::client)); + // Set a decorator to change the User-Agent of the handshake _ws.set_option( websocket::stream_base::decorator([](websocket::request_type &req) { req.set( http::field::user_agent, std::string(BOOST_BEAST_VERSION_STRING) + - " websocket-client-async"); + " websocket-client-async-ssl"); })); - // Update the host_ string. This will provide the value of the - // Host HTTP header during the WebSocket handshake. - // See https://tools.ietf.org/html/rfc7230#section-5.4 - auto host = - "wss://" + ep.address().to_string() + ':' + std::to_string(ep.port()); - host = _conf.host_name; - LOG(OrderMan, Info, - "WebsocketClientInternal::_on_connect sending hand_shake to:{}", - host); - // spartan_assert(!host.empty()); + // Perform the websocket handshake _ws.async_handshake( - host, "/", + ip_port, _conf.host_name, beast::bind_front_handler(&WSCI::_on_handshake, shared_from_this())); } @@ -209,8 +501,8 @@ class WebsocketClientInternal ec, "Handshake failed", WebsocketError::ErrorType::SETUP); return; } - - LOG(OrderMan, Info, "WebsocketClientInternal::_on_connect successfull"); + LOG(OrderMan, Info, + "WebsocketSSLClientInternal::_on_handshake successfull"); // this is when the connection is really established _listener->on_connection_established(); _read_data(); @@ -336,7 +628,7 @@ struct WebsocketClient::PImpl { const WebsocketClientConfiguration conf; IWebsocketListener *listener; // this is used outside of the start loop - WebsocketClientInternal *wsci = nullptr; + WebsocketSSLClientInternal *wsci = nullptr; std::vector cached_messages = {}; bool ioc_blocked = false; explicit PImpl( @@ -347,15 +639,18 @@ struct WebsocketClient::PImpl { WebsocketClient::WebsocketClient( const WebsocketClientConfiguration &conf, IWebsocketListener *listener) { me = std::make_unique(conf, listener); - // me = new PImpl(conf, listener); } -// this is a blocking call void WebsocketClient::start() { for (size_t i = 0; i < me->conf.n_reconnection_attempts; i++) { net::io_context ioc; - std::shared_ptr wsci = - std::make_shared(me->conf, ioc, this); + // The SSL context is required, and holds certificates + ssl::context ctx{ssl::context::tlsv12_client}; + // This holds the root certificate used for verification + // load_root_certificates(ctx); + std::shared_ptr wsci = + std::make_shared( + me->conf, ioc, ctx, this); me->wsci = wsci.get(); // this also puts something in the io_context "work queue" to stop // it from ending auto ip_cstr = _ip.c_str(); @@ -374,7 +669,7 @@ void WebsocketClient::send_message(const WebsocketMessage &msg) { me->wsci->send_message(msg_copy.get_msg()); } -void close_connection() {} +void WebsocketClient::close_connection() { me->wsci->close_connection(); } // interface methods void WebsocketClient::on_connection_established() { diff --git a/src/lib/communincation/websockets/WebsocketClient.h b/src/lib/communincation/websockets/WebsocketClient.h index 155da013d..a72f58864 100644 --- a/src/lib/communincation/websockets/WebsocketClient.h +++ b/src/lib/communincation/websockets/WebsocketClient.h @@ -26,6 +26,7 @@ class WebsocketClient : public IWebsocketListener, // msg::data has to be valid for the duration of the call only. // msg::message_id should be unique across lifetime of the WebsocketClient void send_message(const WebsocketMessage &msg); + void close_connection(); // IWebsocketListener interface methods void on_connection_established() override; void on_error(const WebsocketError &error) override; diff --git a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp index 2aa9bbf5c..ba0538e03 100644 --- a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp +++ b/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp @@ -186,19 +186,137 @@ TEST_CASE("WebsocketEchoServer", "[websocketserver]") { serv.accept_connection(); } -TEST_CASE("WebsocketClientTest", "[websocketclient]") { +// TEST_CASE("WebsocketClientTest", "[websocketclient]") { +// class WebsocketSync : public IWebsocketListener { +// public: +// std::shared_ptr wsc = nullptr; +// const int msg_burst_sz = 20; +// uint64_t msg_id = 0; +// int n_msgs_recv = 0; +// int n_msgs_send = 0; +// WebsocketSync(int msg_burst_sz_a) : msg_burst_sz(msg_burst_sz_a) {} +// void on_connection_established() override { +// std::cout << "*** Listener::connection established" << std::endl; +// n_msgs_recv = 0; +// n_msgs_send = 0; +// } +// void on_error(const WebsocketError &error) override { +// std::cout << "*** Listener:on_error " << error.message << std::endl; +// } +// void on_write_complete(size_t message_id) override { +// std::cout << "*** Listener::on_write_complete message_id: " +// << message_id << std::endl; +// } +// void on_data(WebsocketMessage &msg) override { +// n_msgs_recv++; +// std::cout << "*** Listener::on_data sz: " << msg.data_size +// << " n_msgs_recv: " << n_msgs_recv << std::endl; +// } +// void on_timer() override { +// std::cout << "*** Listener::on_timer" << std::endl; +// if (n_msgs_send == n_msgs_recv) { +// send_msg(msg_burst_sz); +// } +// } +// void on_connection_closed(bool gracefully) override { +// std::cout << "*** Listener::on_connection_closed gracefully: " +// << gracefully << std::endl; +// } +// void send_msg(int n_msgs = 1) { +// for (auto i = 0; i < n_msgs; i++) { +// auto text = get_random_string(5, 20); +// WebsocketMessage msg{msg_id++, text.c_str(), text.size()}; +// wsc->send_message(msg); +// n_msgs_send++; +// std::cout << "*** Listener::send_message sz: " << text.size() +// << " n_msgs_send: " << n_msgs_send << std::endl; +// } +// } +// }; +// WebsocketSync l{10}; +// std::shared_ptr c = std::make_shared( +// WebsocketClientConfiguration{ +// "127.0.0.1", "8083", "ws://127.0.0.1:8083", 10, 50000, 1000}, +// // "stream.binance.com", "9443", "/ws/btcusdt@depth@100ms", 1, +// 10000, +// // 10000}, + +// &l); +// l.wsc = c; +// // blocking call +// c->start(); +// std::cout << "Test end" << std::endl; +// } + +// TEST_CASE("WebsocketClientTest", "[websocketclient]") { +// class WebsocketSync : public IWebsocketListener { +// public: +// std::shared_ptr wsc = nullptr; +// const int msg_burst_sz = 20; +// uint64_t msg_id = 0; +// int n_msgs_recv = 0; +// int n_msgs_send = 0; +// WebsocketSync(int msg_burst_sz_a) : msg_burst_sz(msg_burst_sz_a) {} +// void on_connection_established() override { +// std::cout << "*** Listener::connection established" << std::endl; +// n_msgs_recv = 0; +// n_msgs_send = 0; +// } +// void on_error(const WebsocketError &error) override { +// std::cout << "*** Listener:on_error " << error.message << std::endl; +// } +// void on_write_complete(size_t message_id) override { +// std::cout << "*** Listener::on_write_complete message_id: " +// << message_id << std::endl; +// } +// void on_data(WebsocketMessage &msg) override { +// n_msgs_recv++; +// std::cout << "*** Listener::on_data sz: " << msg.data_size +// << " n_msgs_recv: " << n_msgs_recv << std::endl; +// } +// void on_timer() override { +// std::cout << "*** Listener::on_timer" << std::endl; +// if (n_msgs_send == n_msgs_recv) { +// send_msg(msg_burst_sz); +// } +// } +// void on_connection_closed(bool gracefully) override { +// std::cout << "*** Listener::on_connection_closed gracefully: " +// << gracefully << std::endl; +// } +// void send_msg(int n_msgs = 1) { +// for (auto i = 0; i < n_msgs; i++) { +// auto text = get_random_string(5, 20); +// WebsocketMessage msg{msg_id++, text.c_str(), text.size()}; +// wsc->send_message(msg); +// n_msgs_send++; +// std::cout << "*** Listener::send_message sz: " << text.size() +// << " n_msgs_send: " << n_msgs_send << std::endl; +// } +// } +// }; +// WebsocketSync l{10}; +// std::shared_ptr c = std::make_shared( +// WebsocketClientConfiguration{ +// "127.0.0.1", "8083", "ws://127.0.0.1:8083", 10, 50000, 1000}, +// &l); +// l.wsc = c; +// // blocking call +// c->start(); +// } + +TEST_CASE("WebsocketClientTest", "[bin_conn]") { class WebsocketSync : public IWebsocketListener { + // close after these many messages + const size_t _n_max_msgs; + size_t _n_msgs_recv = 0; + public: std::shared_ptr wsc = nullptr; - const int msg_burst_sz = 20; - uint64_t msg_id = 0; - int n_msgs_recv = 0; - int n_msgs_send = 0; - WebsocketSync(int msg_burst_sz_a) : msg_burst_sz(msg_burst_sz_a) {} + WebsocketSync(size_t n_max_msgs = 100) : _n_max_msgs(n_max_msgs) {} void on_connection_established() override { + _n_msgs_recv = 0; std::cout << "*** Listener::connection established" << std::endl; - n_msgs_recv = 0; - n_msgs_send = 0; } void on_error(const WebsocketError &error) override { std::cout << "*** Listener:on_error " << error.message << std::endl; @@ -208,42 +326,34 @@ TEST_CASE("WebsocketClientTest", "[websocketclient]") { << message_id << std::endl; } void on_data(WebsocketMessage &msg) override { - n_msgs_recv++; + _n_msgs_recv++; std::cout << "*** Listener::on_data sz: " << msg.data_size - << " n_msgs_recv: " << n_msgs_recv << std::endl; + << " n_msgs_recv: " << _n_msgs_recv << " txt: " << msg.data + << std::endl; + if (_n_msgs_recv >= _n_max_msgs) { + std::cout << "*** Listener::on_data closing connection" + << std::endl; + wsc->close_connection(); + } } void on_timer() override { std::cout << "*** Listener::on_timer" << std::endl; - if (n_msgs_send == n_msgs_recv) { - send_msg(msg_burst_sz); - } } void on_connection_closed(bool gracefully) override { + _n_msgs_recv = 0; std::cout << "*** Listener::on_connection_closed gracefully: " << gracefully << std::endl; } - void send_msg(int n_msgs = 1) { - for (auto i = 0; i < n_msgs; i++) { - auto text = get_random_string(5, 20); - WebsocketMessage msg{msg_id++, text.c_str(), text.size()}; - wsc->send_message(msg); - n_msgs_send++; - std::cout << "*** Listener::send_message sz: " << text.size() - << " n_msgs_send: " << n_msgs_send << std::endl; - } - } }; - WebsocketSync l{0}; + WebsocketSync l{}; std::shared_ptr c = std::make_shared( WebsocketClientConfiguration{ - //"127.0.0.1", "8083", "blah://127.0.0.1:8083", 1, 10000, 1000}, - "stream.binance.com", "9443", "/ws/btcusdt@depth@100ms", 1, 10000, - 10000}, - + "stream.binance.com", "9443", "/ws/btcusdt@depth@100ms", 1, 5000, + 1000}, &l); l.wsc = c; // blocking call c->start(); - std::cout << "Test end" << std::endl; } + } // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp index b8655acf6..3b252bb6b 100644 --- a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp +++ b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp @@ -150,6 +150,7 @@ class WebSocketSession : public std::enable_shared_from_this { //------------------------------------------------------------------------------ TEST_CASE("WebsocketSyncClientTest", "[ws_ssl]") { + return; auto host = "stream.binance.com"; auto port = "9443"; auto target = "/ws/btcusdt@depth@100ms"; // bitcoin full order book endpoint, From 648a30ecf829ce5094bef5e691ae0196960db0d4 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 11 Oct 2021 19:46:34 -0400 Subject: [PATCH 010/100] Fixing clang build --- .../communincation/websockets/IWebsocketListener.h | 4 ++-- .../communincation/websockets/WebsocketClient.cpp | 6 ++---- src/lib/communincation/websockets/WebsocketClient.h | 2 +- src/lib/md/emumba/IMarketDataListener.h | 12 ++++++------ src/lib/md/emumba/MarketDataCommon.h | 3 +++ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/lib/communincation/websockets/IWebsocketListener.h b/src/lib/communincation/websockets/IWebsocketListener.h index b88f3de49..28f0b7862 100644 --- a/src/lib/communincation/websockets/IWebsocketListener.h +++ b/src/lib/communincation/websockets/IWebsocketListener.h @@ -3,8 +3,8 @@ namespace bts::spark::communication { -class WebsocketError; -class WebsocketMessage; +struct WebsocketError; +struct WebsocketMessage; // Interface on which to receive data, status and timer events class IWebsocketListener { diff --git a/src/lib/communincation/websockets/WebsocketClient.cpp b/src/lib/communincation/websockets/WebsocketClient.cpp index 291c263e3..afd6fd1b4 100644 --- a/src/lib/communincation/websockets/WebsocketClient.cpp +++ b/src/lib/communincation/websockets/WebsocketClient.cpp @@ -328,8 +328,6 @@ class WebsocketSSLClientInternal private: using WSCI = WebsocketSSLClientInternal; const WebsocketClientConfiguration _conf; - net::io_context &_io_context; - ssl::context &_ctx; tcp::resolver _resolver; websocket::stream> _ws; beast::flat_buffer _read_buffer; @@ -360,8 +358,8 @@ class WebsocketSSLClientInternal net::io_context &ioc, ssl::context &ctx, IWebsocketListener *listener) - : _conf(conf), _io_context(ioc), _ctx(ctx), - _resolver(net::make_strand(ioc)), _ws(net::make_strand(ioc), ctx), + : _conf(conf), _resolver(net::make_strand(ioc)), + _ws(net::make_strand(ioc), ctx), _timer(ioc, boost::posix_time::milliseconds(conf.timer_ms)), _listener(listener) {} diff --git a/src/lib/communincation/websockets/WebsocketClient.h b/src/lib/communincation/websockets/WebsocketClient.h index a72f58864..90414c7af 100644 --- a/src/lib/communincation/websockets/WebsocketClient.h +++ b/src/lib/communincation/websockets/WebsocketClient.h @@ -34,7 +34,7 @@ class WebsocketClient : public IWebsocketListener, void on_data(WebsocketMessage &msg) override; void on_timer() override; void on_connection_closed(bool gracefully) override; - ~WebsocketClient(); + virtual ~WebsocketClient(); }; } // namespace bts::spark::communication \ No newline at end of file diff --git a/src/lib/md/emumba/IMarketDataListener.h b/src/lib/md/emumba/IMarketDataListener.h index 86a01c508..db157eafb 100644 --- a/src/lib/md/emumba/IMarketDataListener.h +++ b/src/lib/md/emumba/IMarketDataListener.h @@ -3,12 +3,12 @@ namespace EMumbaMarketData { -class Security; -class SecurityState; -class SecurityMarketDataStatistics; -class Book; -class TradeRecord; -class MarketDataError; +struct Security; +struct SecurityState; +struct SecurityMarketDataStatistics; +struct Book; +struct TradeRecord; +struct MarketDataError; struct RFQ; // The is the interface that registers itself to IMarketDataGateway and receives diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index e4b48ad72..859ca5d61 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -119,6 +119,9 @@ struct TimeStamp { private: // posix time uint64_t _v{}; + + public: + uint64_t value() const { return _v; } }; enum class Side { BUY, SIDE }; From c85ef44a1bb00a2231571870e4ee680ec0ee95b9 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 13 Oct 2021 12:48:33 -0500 Subject: [PATCH 011/100] Added skeleton for EmumbaMDListener --- src/lib/md/emumba/IMarketDataListener.h | 8 ++--- src/lib/md/emumba/MarketDataCommon.h | 4 +-- src/lib/md/emumba/MarketDataGateway.h | 4 +-- src/server/sparkd/CMakeDeps.cmake | 2 +- .../md/platforms/emumba/EmumbaMDListener.cpp | 17 ++++++++++ .../md/platforms/emumba/EmumbaMDListener.h | 23 +++++++++++++ .../md/platforms/mdp3_onixs/MDP3Listener.cpp | 10 +++--- .../md/platforms/mdp3_onixs/MDP3Listener.h | 33 +++++++++++-------- 8 files changed, 75 insertions(+), 26 deletions(-) create mode 100644 src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp create mode 100644 src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h diff --git a/src/lib/md/emumba/IMarketDataListener.h b/src/lib/md/emumba/IMarketDataListener.h index db157eafb..3b1767cbc 100644 --- a/src/lib/md/emumba/IMarketDataListener.h +++ b/src/lib/md/emumba/IMarketDataListener.h @@ -1,7 +1,7 @@ #pragma once #include -namespace EMumbaMarketData { +namespace EmumbaMarketData { struct Security; struct SecurityState; @@ -20,13 +20,13 @@ class IMarketDataListener { // security are made. virtual void on_securities( const std::vector &complete_security_list) = 0; - virtual void on_security_state(const SecurityState &security_state); + virtual void on_security_state(const SecurityState &security_state) = 0; virtual void on_security_statistics( - const SecurityMarketDataStatistics &security_stats); + const SecurityMarketDataStatistics &security_stats) = 0; virtual void on_book(const Book &book) = 0; virtual void on_trades(const std::vector &trades) = 0; virtual void on_rfqs(const std::vector &rfqs) = 0; virtual void on_error(const MarketDataError &error) = 0; }; -} // namespace EMumbaMarketData \ No newline at end of file +} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index 859ca5d61..1f032175a 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -9,7 +9,7 @@ #include #include -namespace EMumbaMarketData { +namespace EmumbaMarketData { // placed a bunch of common types here. Need to be exctracted out to their own // classes/files @@ -225,4 +225,4 @@ struct MarketDataError { struct RFQ {}; -} // namespace EMumbaMarketData \ No newline at end of file +} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataGateway.h b/src/lib/md/emumba/MarketDataGateway.h index 65960b7c6..47b669b0b 100644 --- a/src/lib/md/emumba/MarketDataGateway.h +++ b/src/lib/md/emumba/MarketDataGateway.h @@ -6,7 +6,7 @@ #include class IMarketDataListener; -namespace EMumbaMarketData { +namespace EmumbaMarketData { struct MarketDataRegistration { struct RegstrationError { @@ -31,4 +31,4 @@ class MarketDataGateway { void unregister_listener(MarketDataListenerID id); }; -} // namespace EMumbaMarketData \ No newline at end of file +} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index ce5e9c93f..0c0a46231 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Web.cpp;cmds/md/cmds/Channels.cpp;cmds/md/cmds/Cleanup.cpp;cmds/md/cmds/Dump.cpp;cmds/md/cmds/DumpSecurity.cpp;cmds/md/cmds/RecTool.cpp;cmds/md/cmds/Record.cpp;cmds/md/cmds/Relay.cpp;cmds/md/cmds/Replay.cpp;cmds/md/cmds/Run.cpp;cmds/md/cmds/Tail.cpp;cmds/md/cmds/rec_tool/cmds/Print.cpp;cmds/md/cmds/rec_tool/cmds/Trace.cpp;cmds/md/cmds/rec_tool/cmds/Unprint.cpp;cmds/md/common/PlatformOption.cpp;cmds/md/common/SecurityTypeOption.cpp;cmds/md/common/VenueOption.cpp;cmds/spartan/algo/AlgoManager.cpp;cmds/spartan/algo/IAlgo.cpp;cmds/spartan/algo/IAlgoInitService.cpp;cmds/spartan/algo/IAlgoRunService.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/TestObserver.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/common/EventRangeMonitor.cpp;cmds/spartan/back_testing/common/IcebergQuantityModification.cpp;cmds/spartan/back_testing/common/OrderModification.cpp;cmds/spartan/back_testing/common/Trace.cpp;cmds/spartan/back_testing/common/mdp3_common.cpp;cmds/spartan/back_testing/common/mdp3_utils.cpp;cmds/spartan/back_testing/common/order_utils.cpp;cmds/spartan/back_testing/common/security_comp.cpp;cmds/spartan/back_testing/common/security_parser.cpp;cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp;cmds/spartan/back_testing/feed_observers/CompositeObserver.cpp;cmds/spartan/back_testing/feed_observers/DefinitionCollector.cpp;cmds/spartan/back_testing/feed_observers/FeedObserver.cpp;cmds/spartan/back_testing/feed_observers/FillCounter.cpp;cmds/spartan/back_testing/feed_observers/IcebergFinder.cpp;cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherFillRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherProcTimeRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherRecorder.cpp;cmds/spartan/back_testing/implied/implied_market.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FillDepot.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/common/IcebergFileCache.cpp;cmds/spartan/back_testing/matcher/common/MatcherOneof.cpp;cmds/spartan/back_testing/matcher/common/MatcherOrder.cpp;cmds/spartan/back_testing/matcher/common/MatchingSession.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/PCapEventSource.cpp;cmds/spartan/back_testing/sim/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/PandL.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/SimDB.cpp;cmds/spartan/back_testing/sim/SimSessionOptions.proto;cmds/spartan/back_testing/sim/run_sim.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/MatcherCmd.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/Test.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/cmds/matcher/cmds/BooksCmd.cpp;cmds/spartan/cmds/matcher/cmds/FillsCmd.cpp;cmds/spartan/cmds/matcher/cmds/ProcTimeCmd.cpp;cmds/spartan/cmds/matcher/common/InitData.cpp;cmds/spartan/common/DataPacket.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/SpartanError.cpp;cmds/spartan/common/Stopwatch.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/common/cli/RangeArg.cpp;cmds/spartan/domain/BookUpdate.cpp;cmds/spartan/domain/CancelReplace.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/NewOrder.cpp;cmds/spartan/domain/OrderUpdate.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/SideQuantity.cpp;cmds/spartan/domain/TradeSummaryUpdate.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/domain/book/book_utils.cpp;cmds/spartan/domain/book/tests/book_merging_tests.cpp;cmds/spartan/domain/book/tests/synthetic_book_tests.cpp;cmds/spartan/domain/order/OrderChange.cpp;cmds/spartan/domain/order/OrderKey.cpp;cmds/spartan/domain/polygons/PolygonFinder.cpp;cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp;cmds/spartan/domain/polygons/polygon_utils.cpp;cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp;cmds/spartan/feed_handler/FeedEvent.cpp;cmds/spartan/feed_handler/FeedHandler.cpp;cmds/spartan/feed_handler/FeedHandlerBinder.cpp;cmds/spartan/feed_handler/detail/BookSnapshot.cpp;cmds/spartan/feed_handler/detail/DefinitionSnapshot.cpp;cmds/spartan/feed_handler/detail/FeedHandler_RealTime.cpp;cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp;cmds/spartan/feed_handler/detail/IncrementalQueue.cpp;cmds/spartan/feed_handler/detail/MDP3MsgBox.cpp;cmds/spartan/feed_handler/detail/MDP3Parser.cpp;cmds/spartan/feed_handler/test/spartan_md_tests.cpp;cmds/spartan/gateway/Gateway.cpp;cmds/spartan/gateway/GatewayCfg.cpp;cmds/spartan/gateway/PartyDetailsSetter.cpp;cmds/spartan/gateway/detail/GatewayInitRec.cpp;cmds/spartan/gateway/detail/Gateway_Init.cpp;cmds/spartan/gateway/detail/Gateway_RealTime.cpp;cmds/spartan/gateway/detail/IL3MsgFramer.cpp;cmds/spartan/gateway/detail/IL3OutgoingQueue.cpp;cmds/spartan/gateway/detail/IL3Parser.cpp;cmds/spartan/gateway/detail/IL3SessionFileStore.cpp;cmds/spartan/gateway/test/order_execution_tests.cpp;cmds/spartan/logger/ConsoleSink.cpp;cmds/spartan/logger/FileSink.cpp;cmds/spartan/logger/ILoggingSink.cpp;cmds/spartan/logger/LogEntry.cpp;cmds/spartan/logger/LoggerHub.cpp;cmds/spartan/logger/PackedLogEntry.cpp;cmds/spartan/logger/SQLiteSink.cpp;cmds/spartan/logger/ThreadLocalLogger.cpp;cmds/spartan/obsolete/tas/RunTAS.cpp;cmds/spartan/obsolete/tas/TASOrderReactor.cpp;cmds/spartan/obsolete/tas/TASTriggerDef.cpp;cmds/spartan/system/Delegate.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/ProducerConsumerQueue.cpp;cmds/spartan/system/Reactor.cpp;cmds/spartan/system/SBEParser.cpp;cmds/spartan/utils/ActionSummarizer.cpp;cmds/spartan/utils/FileUtils.cpp;cmds/spartan/utils/StringUtils.cpp;cmds/spartan/utils/sql/adapters/polygon_defs.cpp;cmds/spartan/utils/tests/PermutationTests.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Web.cpp;cmds/md/cmds/Channels.cpp;cmds/md/cmds/Cleanup.cpp;cmds/md/cmds/Dump.cpp;cmds/md/cmds/DumpSecurity.cpp;cmds/md/cmds/RecTool.cpp;cmds/md/cmds/Record.cpp;cmds/md/cmds/Relay.cpp;cmds/md/cmds/Replay.cpp;cmds/md/cmds/Run.cpp;cmds/md/cmds/Tail.cpp;cmds/md/cmds/rec_tool/cmds/Print.cpp;cmds/md/cmds/rec_tool/cmds/Trace.cpp;cmds/md/cmds/rec_tool/cmds/Unprint.cpp;cmds/md/common/PlatformOption.cpp;cmds/md/common/SecurityTypeOption.cpp;cmds/md/common/VenueOption.cpp;cmds/spartan/algo/AlgoManager.cpp;cmds/spartan/algo/IAlgo.cpp;cmds/spartan/algo/IAlgoInitService.cpp;cmds/spartan/algo/IAlgoRunService.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/TestObserver.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/common/EventRangeMonitor.cpp;cmds/spartan/back_testing/common/IcebergQuantityModification.cpp;cmds/spartan/back_testing/common/OrderModification.cpp;cmds/spartan/back_testing/common/Trace.cpp;cmds/spartan/back_testing/common/mdp3_common.cpp;cmds/spartan/back_testing/common/mdp3_utils.cpp;cmds/spartan/back_testing/common/order_utils.cpp;cmds/spartan/back_testing/common/security_comp.cpp;cmds/spartan/back_testing/common/security_parser.cpp;cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp;cmds/spartan/back_testing/feed_observers/CompositeObserver.cpp;cmds/spartan/back_testing/feed_observers/DefinitionCollector.cpp;cmds/spartan/back_testing/feed_observers/FeedObserver.cpp;cmds/spartan/back_testing/feed_observers/FillCounter.cpp;cmds/spartan/back_testing/feed_observers/IcebergFinder.cpp;cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherFillRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherProcTimeRecorder.cpp;cmds/spartan/back_testing/feed_observers/recorders/MatcherRecorder.cpp;cmds/spartan/back_testing/implied/implied_market.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FillDepot.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/common/IcebergFileCache.cpp;cmds/spartan/back_testing/matcher/common/MatcherOneof.cpp;cmds/spartan/back_testing/matcher/common/MatcherOrder.cpp;cmds/spartan/back_testing/matcher/common/MatchingSession.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/PCapEventSource.cpp;cmds/spartan/back_testing/sim/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/PandL.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/SimDB.cpp;cmds/spartan/back_testing/sim/SimSessionOptions.proto;cmds/spartan/back_testing/sim/run_sim.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/MatcherCmd.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/Test.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/cmds/matcher/cmds/BooksCmd.cpp;cmds/spartan/cmds/matcher/cmds/FillsCmd.cpp;cmds/spartan/cmds/matcher/cmds/ProcTimeCmd.cpp;cmds/spartan/cmds/matcher/common/InitData.cpp;cmds/spartan/common/DataPacket.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/SpartanError.cpp;cmds/spartan/common/Stopwatch.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/common/cli/RangeArg.cpp;cmds/spartan/domain/BookUpdate.cpp;cmds/spartan/domain/CancelReplace.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/NewOrder.cpp;cmds/spartan/domain/OrderUpdate.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/SideQuantity.cpp;cmds/spartan/domain/TradeSummaryUpdate.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/domain/book/book_utils.cpp;cmds/spartan/domain/book/tests/book_merging_tests.cpp;cmds/spartan/domain/book/tests/synthetic_book_tests.cpp;cmds/spartan/domain/order/OrderChange.cpp;cmds/spartan/domain/order/OrderKey.cpp;cmds/spartan/domain/polygons/PolygonFinder.cpp;cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp;cmds/spartan/domain/polygons/polygon_utils.cpp;cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp;cmds/spartan/feed_handler/FeedEvent.cpp;cmds/spartan/feed_handler/FeedHandler.cpp;cmds/spartan/feed_handler/FeedHandlerBinder.cpp;cmds/spartan/feed_handler/detail/BookSnapshot.cpp;cmds/spartan/feed_handler/detail/DefinitionSnapshot.cpp;cmds/spartan/feed_handler/detail/FeedHandler_RealTime.cpp;cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp;cmds/spartan/feed_handler/detail/IncrementalQueue.cpp;cmds/spartan/feed_handler/detail/MDP3MsgBox.cpp;cmds/spartan/feed_handler/detail/MDP3Parser.cpp;cmds/spartan/feed_handler/test/spartan_md_tests.cpp;cmds/spartan/gateway/Gateway.cpp;cmds/spartan/gateway/GatewayCfg.cpp;cmds/spartan/gateway/PartyDetailsSetter.cpp;cmds/spartan/gateway/detail/GatewayInitRec.cpp;cmds/spartan/gateway/detail/Gateway_Init.cpp;cmds/spartan/gateway/detail/Gateway_RealTime.cpp;cmds/spartan/gateway/detail/IL3MsgFramer.cpp;cmds/spartan/gateway/detail/IL3OutgoingQueue.cpp;cmds/spartan/gateway/detail/IL3Parser.cpp;cmds/spartan/gateway/detail/IL3SessionFileStore.cpp;cmds/spartan/gateway/test/order_execution_tests.cpp;cmds/spartan/logger/ConsoleSink.cpp;cmds/spartan/logger/FileSink.cpp;cmds/spartan/logger/ILoggingSink.cpp;cmds/spartan/logger/LogEntry.cpp;cmds/spartan/logger/LoggerHub.cpp;cmds/spartan/logger/PackedLogEntry.cpp;cmds/spartan/logger/SQLiteSink.cpp;cmds/spartan/logger/ThreadLocalLogger.cpp;cmds/spartan/obsolete/tas/RunTAS.cpp;cmds/spartan/obsolete/tas/TASOrderReactor.cpp;cmds/spartan/obsolete/tas/TASTriggerDef.cpp;cmds/spartan/system/Delegate.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/ProducerConsumerQueue.cpp;cmds/spartan/system/Reactor.cpp;cmds/spartan/system/SBEParser.cpp;cmds/spartan/utils/ActionSummarizer.cpp;cmds/spartan/utils/FileUtils.cpp;cmds/spartan/utils/StringUtils.cpp;cmds/spartan/utils/sql/adapters/polygon_defs.cpp;cmds/spartan/utils/tests/PermutationTests.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/emumba/EmumbaMDListener.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp new file mode 100644 index 000000000..eab24135c --- /dev/null +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -0,0 +1,17 @@ +#include "EmumbaMDListener.h" + +namespace bts::md::emumba { +void EmumbaMDListener::on_securities( + const std::vector & /*unused*/) {} +void EmumbaMDListener::on_security_state( + const EmumbaMarketData::SecurityState & /*unused*/) {} +void EmumbaMDListener::on_security_statistics( + const EmumbaMarketData::SecurityMarketDataStatistics & /*unused*/) {} +void EmumbaMDListener::on_book(const EmumbaMarketData::Book & /*unused*/) {} +void EmumbaMDListener::on_trades( + const std::vector & /*unused*/) {} +void EmumbaMDListener::on_rfqs( + const std::vector & /*unused*/) {} +void EmumbaMDListener::on_error( + const EmumbaMarketData::MarketDataError & /*unused*/) {} +} // namespace bts::md::emumba \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h new file mode 100644 index 000000000..0ccb52019 --- /dev/null +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h @@ -0,0 +1,23 @@ +#include "lib/md/emumba/IMarketDataListener.h" +#include "lib/md/emumba/MarketDataCommon.h" + +namespace bts::md::emumba { + +// Listens to the emumba market data source and +class EmumbaMDListener : public EmumbaMarketData::IMarketDataListener { + void on_securities(const std::vector + &complete_security_list) override; + void on_security_state( + const EmumbaMarketData::SecurityState &security_state) override; + void on_security_statistics( + const EmumbaMarketData::SecurityMarketDataStatistics &security_stats) + override; + void on_book(const EmumbaMarketData::Book &book) override; + void on_trades(const std::vector + &trades) override; + void on_rfqs( + const std::vector &rfqs) override; + void on_error(const EmumbaMarketData::MarketDataError &error) override; +}; + +} // namespace bts::md::emumba \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index a20d763c3..fd313a8e8 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -177,7 +177,8 @@ void MDP3Listener::onBookUpdate( // // Trades - +// Called from onTradeSummary and onTradeRecovery, ends up calling +// MDProducerHandle::add_trade void on_trade( SecurityData *data, const onixs::Decimal &price, @@ -280,9 +281,8 @@ void MDP3Listener::heartbeat() { } } -// -// Private functions - +// Called by MDP3Main::prepare_listener as part of pre-load. Also called by +// MDP3Listener::onFuture, onOption and onSpread void MDP3Listener::add_security( const FixedSecurity &security, co2::TradingStatus status) { bts_assert(security.numeric_id != 0); @@ -294,6 +294,8 @@ void MDP3Listener::add_security( handle.update_exchange_status(utils::TimeStamp::now(), status); } +// Private functions + void MDP3Listener::flush_books() { // This is called at the end of the packet // Write all book updates to shared memory and reset for the next packet diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index cd2e6f089..10ca8e6ed 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -166,7 +166,8 @@ class MDP3Listener : public onixs::HandlerListener, const onixs::IncrementalRefreshBook46Args &args) override { onIncrementalRefreshBook(args); } - template void onIncrementalRefreshBook(const Args &args) { + template + void onIncrementalRefreshBook(const Args &args) { if (!_mbo) return; @@ -261,7 +262,6 @@ class MDP3Listener : public onixs::HandlerListener, if (signal.sk == invalid_security_key) { // First entry defines the side, security and packet sn - signal.sk = data->handle.key(); signal.ts = _packet_arrived; signal.aggressor = ag_side; @@ -289,7 +289,8 @@ class MDP3Listener : public onixs::HandlerListener, const onixs::IncrementalRefreshOrderBook47Args &args) override { onIncrementalRefreshOrderBook(args); } - template void onIncrementalRefreshOrderBook(const Args &args) { + template + void onIncrementalRefreshOrderBook(const Args &args) { if (!_mbo) return; for (const auto &entry : args.message().entries()) { @@ -332,7 +333,8 @@ class MDP3Listener : public onixs::HandlerListener, const onixs::SnapshotFullRefreshOrderBook53Args &args) override { onSnapshotFullRefreshOrderBook(args); } - template void onSnapshotFullRefreshOrderBook(const Args &args) { + template + void onSnapshotFullRefreshOrderBook(const Args &args) { if (!_mbo) return; auto data = _index.get_security(args.message().securityId()); @@ -512,8 +514,8 @@ class MDP3Listener : public onixs::HandlerListener, // // Misc template - void - onSettlementPrice(const onixs::Security &sec, const StatisticsArgs &args); + void onSettlementPrice( + const onixs::Security &sec, const StatisticsArgs &args); void onSettlementPrice( onixs::Handler &, const onixs::Security &s, @@ -548,8 +550,8 @@ class MDP3Listener : public onixs::HandlerListener, template void onSessionOpeningPrice(const onixs::Security &, const SessionArgs &); template - void - onRecoveryOpeningPrice(const onixs::Security &sec, const RecoveryArgs &args); + void onRecoveryOpeningPrice( + const onixs::Security &sec, const RecoveryArgs &args); void onOpeningPrice( onixs::Handler &, const onixs::Security &s, @@ -801,12 +803,12 @@ void MDP3Listener::onOption( } // min_tick specializations -inline onixs::Decimal -tick_rule(const onixs::InstrumentDefinitionSpread29 &sec) { +inline onixs::Decimal tick_rule( + const onixs::InstrumentDefinitionSpread29 &sec) { return sec.minPriceIncrement(); } -inline onixs::Decimal -tick_rule(const onixs::InstrumentDefinitionSpread56 &sec) { +inline onixs::Decimal tick_rule( + const onixs::InstrumentDefinitionSpread56 &sec) { onixs::Decimal min_tick; sec.minPriceIncrement(min_tick); return min_tick; @@ -869,6 +871,8 @@ void MDP3Listener::onSpread( add_security(fsec, status); } +// onBookUpdate callbacks from onixs end up here (MDP3Listener::onBookUpdate in +// the cpp) template void MDP3Listener::onBookUpdate( const onixs::Security &sec, const TBook &onixs_book, BookType booktype) { @@ -876,7 +880,7 @@ void MDP3Listener::onBookUpdate( bts_trace, trace_order, (char *)"onBookUpdate", _latest_sequence, (uint16_t)_latest_sequence, 0); - auto data = _index.get_security(sec.id()); + auto data = _index.get_security(sec.id()); // SecurityData* if (data == nullptr) return; bts_assert(data->id == (uint32_t)sec.id()); @@ -949,6 +953,7 @@ void MDP3Listener::onTradeRecovery( } } +// Called from callback onTrade. Prepares the data and calls on_trade template void MDP3Listener::onTradeSummary( const onixs::Security &sec, const TradeSummary &arg) { @@ -990,6 +995,8 @@ void MDP3Listener::onElectronicVolume( } } +// All onSettlementPrice end up here with the templated args +// taking different types template void MDP3Listener::onSettlementPrice( const onixs::Security &sec, const StatisticsArgs &args) { From 38d94663cf772a06f8ec4a7c5329c8b3943ba4ec Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 14 Oct 2021 16:09:14 -0400 Subject: [PATCH 012/100] More flesh on the skeleton --- src/lib/md/emumba/MarketDataCommon.h | 16 ++-- .../md/platforms/emumba/EmumbaMDListener.cpp | 90 ++++++++++++++++++- .../md/platforms/emumba/EmumbaMDListener.h | 23 ++++- .../md/platforms/emumba/EmumbaSecurityIndex.h | 16 ++++ .../md/platforms/mdp3_onixs/MDP3Listener.h | 2 + 5 files changed, 135 insertions(+), 12 deletions(-) create mode 100644 src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index 1f032175a..9b3f220c2 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -43,7 +43,7 @@ class ValueWrapper { }; using Quantity = ValueWrapper; -using SecurityID = ValueWrapper; +using SecurityID = ValueWrapper; using MarketDataListenerID = ValueWrapper; @@ -130,7 +130,7 @@ enum class Side { BUY, SIDE }; class SecurityCommon { public: Venue venue; - SecurityID _security_id{}; + SecurityID security_id{}; SecurityType security_type; Currency currency; double display_factor{}; @@ -138,15 +138,16 @@ class SecurityCommon { std::string symbol; std::string security_group; std::string asset; + std::string security_desc; Price min_price_increment{}; double min_price_increment_ammount = 0; bool implied_matching = false; - std::string cme_security_type; }; +class IndexSecurity {}; + class FutureSecurity { public: - SecurityCommon security_definition; TimeStamp expiration; }; @@ -158,15 +159,16 @@ struct LegDefinition { class SpreadSecurity { public: - SecurityCommon security_definition; std::vector legs; }; struct Security { SecurityCommon security_common; - std::variant security; + std::variant security; SecurityType security_type() const { - if (std::holds_alternative(security)) { + if (std::holds_alternative(security)) { + return SecurityType::INDEX; + } else if (std::holds_alternative(security)) { return SecurityType::FUTURE; } else { return SecurityType::SPREAD; diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index eab24135c..f0df41a40 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -1,8 +1,45 @@ #include "EmumbaMDListener.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/logging/logging.h" +#include "lib/md/MDProducer.h" +#include "lib/md/Shm/FixedSecurity.h" +#include "lib/utils/bts_assert.h" +#include +#include +#include +#include + +namespace bts::md { + +api::Venue convert_venue(EmumbaMarketData::Venue /*unused*/) { + // TODO + return api::Venue::VENUE_BTS; +} + +struct EmumbaMDListener::PImpl { + EmumbaSecurityIndex &index; + MDProducer &md_producer; + explicit PImpl(EmumbaSecurityIndex &index_a, MDProducer &md_producer_a) + : index(index_a), md_producer(md_producer_a) {} +}; + +EmumbaMDListener::EmumbaMDListener( + EmumbaSecurityIndex &index, MDProducer &md_producer) + : me(std::make_unique(index, md_producer)) {} -namespace bts::md::emumba { void EmumbaMDListener::on_securities( - const std::vector & /*unused*/) {} + const std::vector + &complete_security_list) { + for (EmumbaMarketData::Security const *s : complete_security_list) { + if (std::holds_alternative( + s->security)) { + _add_index(*s); + } else if (std::holds_alternative( + s->security)) { + _add_future(*s); + } + } +} void EmumbaMDListener::on_security_state( const EmumbaMarketData::SecurityState & /*unused*/) {} void EmumbaMDListener::on_security_statistics( @@ -14,4 +51,51 @@ void EmumbaMDListener::on_rfqs( const std::vector & /*unused*/) {} void EmumbaMDListener::on_error( const EmumbaMarketData::MarketDataError & /*unused*/) {} -} // namespace bts::md::emumba \ No newline at end of file +EmumbaMDListener::~EmumbaMDListener() = default; + +// private functions +void EmumbaMDListener::_add_index(const EmumbaMarketData::Security &sec) { + FixedStockSecurity fsec = {}; + _copy_security_common(sec, fsec); + _add_security(fsec); +} + +void EmumbaMDListener::_add_future(const EmumbaMarketData::Security &sec) { + FixedFutureSecurity fsec = {}; + _copy_security_common(sec, fsec); + _add_security(fsec); + const auto &future_sec = + std::get(sec.security); + auto boost_ts = + boost::posix_time::from_time_t(future_sec.expiration.value()); + fsec.expiration_year = boost_ts.date().year(); + fsec.expiration_month = boost_ts.date().month().as_number(); + fsec.expiration_day = boost_ts.date().day().as_number(); +} + +void EmumbaMDListener::_copy_security_common( + const EmumbaMarketData::Security &from, FixedSecurity &to) const { + to.numeric_id = from.security_common.security_id.value(); + to.symbol(from.security_common.symbol); + to.security_desc(from.security_common.security_desc); + to.exchange = convert_venue(from.security_common.venue); + // these are not filled in + // TODO + // fsec.display_factor = def.displayFactor().exponent() + + // floorlog10(def.displayFactor().mantissa()); + + // def.mainFraction(fsec.cme_main_fraction); + // def.subFraction(fsec.cme_sub_fraction); + // def.priceDisplayFormat(fsec.cme_price_display_format); +} + +void EmumbaMDListener::_add_security(const FixedSecurity &security) { + bts_assert(security.numeric_id != 0); + // Set up the shared memory for this security + auto handle = me->md_producer.add_security(security); + // Add it to the index so it can receive messages + me->index.add_security(security.numeric_id, handle); + // handle.update_exchange_status(utils::TimeStamp::now(), status); +} + +} // namespace bts::md diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h index 0ccb52019..f5b43e5db 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h @@ -1,10 +1,21 @@ +#include "EmumbaSecurityIndex.h" +#include "lib/md/MDProducer.h" #include "lib/md/emumba/IMarketDataListener.h" #include "lib/md/emumba/MarketDataCommon.h" -namespace bts::md::emumba { +namespace bts::md { + +class MDProducer; +class FixedSecurity; // Listens to the emumba market data source and class EmumbaMDListener : public EmumbaMarketData::IMarketDataListener { + private: + struct PImpl; + std::unique_ptr me; + + public: + EmumbaMDListener(EmumbaSecurityIndex &index, MDProducer &md_producer); void on_securities(const std::vector &complete_security_list) override; void on_security_state( @@ -18,6 +29,14 @@ class EmumbaMDListener : public EmumbaMarketData::IMarketDataListener { void on_rfqs( const std::vector &rfqs) override; void on_error(const EmumbaMarketData::MarketDataError &error) override; + ~EmumbaMDListener(); + + private: + void _add_index(const EmumbaMarketData::Security &sec); + void _add_future(const EmumbaMarketData::Security &sec); + void _copy_security_common( + const EmumbaMarketData::Security &from, FixedSecurity &to) const; + void _add_security(const FixedSecurity &security); }; -} // namespace bts::md::emumba \ No newline at end of file +} // namespace bts::md \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h b/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h new file mode 100644 index 000000000..43d0d7102 --- /dev/null +++ b/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h @@ -0,0 +1,16 @@ +#pragma once + +#include "lib/md/SecurityIndex.h" +#include + +namespace bts::md { + +struct EmumbaSecurityData { + EmumbaSecurityData(uint32_t id, MDProducerHandle &h) : id(id), handle(h) {} + int id; // exchange id + MDProducerHandle handle; +}; + +using EmumbaSecurityIndex = ConcurrentSecurityIndex; + +} // namespace bts::md \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index 10ca8e6ed..d653e37c5 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -719,6 +719,8 @@ void set_security_common(const Definition &def, FixedSecurity &fsec) { def.priceDisplayFormat(fsec.cme_price_display_format); } +// This is templatized over the various instrument definitions passed over by +// onixs template void MDP3Listener::onFuture( onixs::Handler &, From 8a0196979655396959e67bec17feec55687489c5 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 15 Oct 2021 16:13:35 -0400 Subject: [PATCH 013/100] Added more handler code to EmumbaMDListener --- src/lib/md/emumba/MarketDataCommon.h | 2 + .../md/platforms/emumba/EmumbaMDListener.cpp | 93 +++++++++++++++++-- 2 files changed, 89 insertions(+), 6 deletions(-) diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index 9b3f220c2..d70f452f5 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -190,6 +190,7 @@ struct BookSide { }; struct Book { + SecurityID id; BookSide bids; BookSide asks; }; @@ -208,6 +209,7 @@ struct SecurityState { public: enum class State { PREOPEN, OPEN }; State state = State::OPEN; + SecurityID id; }; struct SecurityMarketDataStatistics { diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index f0df41a40..9c2f8c0c3 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -1,8 +1,11 @@ #include "EmumbaMDListener.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" +#include "lib/md/IntPrice.h" #include "lib/md/MDProducer.h" #include "lib/md/Shm/FixedSecurity.h" +#include "lib/md/protos/co2.pb.h" +#include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include #include @@ -11,11 +14,47 @@ namespace bts::md { -api::Venue convert_venue(EmumbaMarketData::Venue /*unused*/) { +inline api::Venue convert_venue(EmumbaMarketData::Venue /*unused*/) { // TODO return api::Venue::VENUE_BTS; } +inline co2::TradingStatus convert_status( + EmumbaMarketData::SecurityState::State state) { + switch (state) { + case EmumbaMarketData::SecurityState::State::OPEN: + return co2::TRADINGSTATUS_NORMAL; + case EmumbaMarketData::SecurityState::State::PREOPEN: + return co2::TRADINGSTATUS_PRE_OPEN; + } + return co2::TRADINGSTATUS_UNKNOWN; +} + +inline co2::AggressorSide convert_agg_side( + EmumbaMarketData::AggressorSide agg_side) { + switch (agg_side) { + case EmumbaMarketData::AggressorSide::Buy: + return co2::AggressorSide::AGGRESSOR_SIDE_BUY; + case EmumbaMarketData::AggressorSide::Sell: + return co2::AggressorSide::AGGRESSOR_SIDE_SELL; + case EmumbaMarketData::AggressorSide::None: + return co2::AggressorSide::AGGRESSOR_SIDE_NONE; + } + return co2::AggressorSide::AGGRESSOR_SIDE_NONE; +} + +bts::md::IntPrice convert_to_intprice(EmumbaMarketData::Price price) { + return IntPrice_from_double<9>(price.to_double()); +} + +inline EmumbaSecurityData *get_security( + EmumbaSecurityIndex &sec_map, EmumbaMarketData::SecurityID id) { + auto int_id = static_cast(id.value()); + EmumbaSecurityData *rv = sec_map.get_security(int_id); + bts_assert(rv != nullptr); + return rv; +} + struct EmumbaMDListener::PImpl { EmumbaSecurityIndex &index; MDProducer &md_producer; @@ -41,16 +80,58 @@ void EmumbaMDListener::on_securities( } } void EmumbaMDListener::on_security_state( - const EmumbaMarketData::SecurityState & /*unused*/) {} + const EmumbaMarketData::SecurityState &state) { + EmumbaSecurityData *sec_data = get_security(me->index, state.id); + bts_assert(sec_data != nullptr); + auto co2_status = convert_status(state.state); + sec_data->handle.update_exchange_status(utils::TimeStamp::now(), co2_status); +} + void EmumbaMDListener::on_security_statistics( - const EmumbaMarketData::SecurityMarketDataStatistics & /*unused*/) {} + const EmumbaMarketData::SecurityMarketDataStatistics &security_stats) { + EmumbaSecurityData *sec_data = + get_security(me->index, security_stats.security_id); + bts_assert(sec_data != nullptr); + auto now = utils::TimeStamp::now(); + sec_data->handle.update_session_low(now, security_stats.low.to_double()); + sec_data->handle.update_session_high(now, security_stats.high.to_double()); + bts::datetime::Date date_temp = {}; + sec_data->handle.update_opening( + now, security_stats.open.to_double(), date_temp); + sec_data->handle.update_settlement( + now, IntPrice_from_double<8>(security_stats.settle.to_double()), + date_temp); +} + void EmumbaMDListener::on_book(const EmumbaMarketData::Book & /*unused*/) {} + void EmumbaMDListener::on_trades( - const std::vector & /*unused*/) {} + const std::vector &latest_trades) { + for (EmumbaMarketData::TradeRecord const *t : latest_trades) { + EmumbaSecurityData *sec_data = get_security(me->index, t->sec_id); + auto now = utils::TimeStamp::now(); + if (sec_data != nullptr) { + bts::datetime::LLDateTime lldt_temp = {}; + sec_data->handle.add_trade( + now, + PriceSize( + convert_to_intprice(t->trade_price), + t->trade_quantity.value()), + lldt_temp, convert_agg_side(t->agg_side)); + } + } +} void EmumbaMDListener::on_rfqs( - const std::vector & /*unused*/) {} + const std::vector & /*unused*/) { + // TODO +} + void EmumbaMDListener::on_error( - const EmumbaMarketData::MarketDataError & /*unused*/) {} + const EmumbaMarketData::MarketDataError &error) { + LOG(md, Error, "EmumbaMDListener::on_error error: {}", error.error_text); + // TODO: clear out books? +} + EmumbaMDListener::~EmumbaMDListener() = default; // private functions From 205953d92884864d2347c49ba9f4adb436e2c1c3 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 15 Oct 2021 19:32:46 -0400 Subject: [PATCH 014/100] Added more handler code to EmumbaMDListener 2 --- src/lib/md/emumba/MarketDataCommon.h | 4 +- .../md/platforms/emumba/EmumbaMDListener.cpp | 40 +++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index d70f452f5..1fa9b1637 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -190,7 +190,7 @@ struct BookSide { }; struct Book { - SecurityID id; + SecurityID security_id; BookSide bids; BookSide asks; }; @@ -209,7 +209,7 @@ struct SecurityState { public: enum class State { PREOPEN, OPEN }; State state = State::OPEN; - SecurityID id; + SecurityID security_id; }; struct SecurityMarketDataStatistics { diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index 9c2f8c0c3..b95f83e60 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -7,6 +7,7 @@ #include "lib/md/protos/co2.pb.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" +#include #include #include #include @@ -43,6 +44,12 @@ inline co2::AggressorSide convert_agg_side( return co2::AggressorSide::AGGRESSOR_SIDE_NONE; } +void clear_md(std::array &md_side) { + for (PriceSize &psz : md_side) { + psz = PriceSize{}; + } +} + bts::md::IntPrice convert_to_intprice(EmumbaMarketData::Price price) { return IntPrice_from_double<9>(price.to_double()); } @@ -58,6 +65,8 @@ inline EmumbaSecurityData *get_security( struct EmumbaMDListener::PImpl { EmumbaSecurityIndex &index; MDProducer &md_producer; + std::array bids; + std::array asks; explicit PImpl(EmumbaSecurityIndex &index_a, MDProducer &md_producer_a) : index(index_a), md_producer(md_producer_a) {} }; @@ -81,8 +90,13 @@ void EmumbaMDListener::on_securities( } void EmumbaMDListener::on_security_state( const EmumbaMarketData::SecurityState &state) { - EmumbaSecurityData *sec_data = get_security(me->index, state.id); - bts_assert(sec_data != nullptr); + EmumbaSecurityData *sec_data = get_security(me->index, state.security_id); + if (sec_data == nullptr) { + LOG(md, Error, + "EmumbaMDListener::on_security_statistics could not find id: {}", + state.security_id.value()); + return; + } auto co2_status = convert_status(state.state); sec_data->handle.update_exchange_status(utils::TimeStamp::now(), co2_status); } @@ -91,7 +105,12 @@ void EmumbaMDListener::on_security_statistics( const EmumbaMarketData::SecurityMarketDataStatistics &security_stats) { EmumbaSecurityData *sec_data = get_security(me->index, security_stats.security_id); - bts_assert(sec_data != nullptr); + if (sec_data == nullptr) { + LOG(md, Error, + "EmumbaMDListener::on_security_statistics could not find id: {}", + security_stats.security_id.value()); + return; + } auto now = utils::TimeStamp::now(); sec_data->handle.update_session_low(now, security_stats.low.to_double()); sec_data->handle.update_session_high(now, security_stats.high.to_double()); @@ -103,7 +122,20 @@ void EmumbaMDListener::on_security_statistics( date_temp); } -void EmumbaMDListener::on_book(const EmumbaMarketData::Book & /*unused*/) {} +void EmumbaMDListener::on_book(const EmumbaMarketData::Book &book) { + EmumbaSecurityData *sec_data = get_security(me->index, book.security_id); + if (sec_data == nullptr) { + LOG(md, Error, "EmumbaMDListener::on_book could not find id: {}", + book.security_id.value()); + return; + } + clear_md(me->bids); + clear_md(me->asks); + // copy bids now + // auto copy_arr = [](std::) { + + // }; +} void EmumbaMDListener::on_trades( const std::vector &latest_trades) { From 3ff6c725a33f0f8937ef22ff49f5e7a076be1e28 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 18 Oct 2021 13:51:01 -0400 Subject: [PATCH 015/100] Hooked book --- .../md/platforms/emumba/EmumbaMDListener.cpp | 49 +++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index b95f83e60..f5bce2356 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -15,6 +15,35 @@ namespace bts::md { +using MdArray = std::array; + +namespace helpers { + +using namespace bts::md; + +void clear_books(MdArray &md_side) { + for (PriceSize &psz : md_side) { + psz = PriceSize{}; + } +} + +void copy_books( + const EmumbaMarketData::BookSide &from, MdArray &to, bool clear = true) { + if (clear) { + clear_books(to); + } + size_t i = 0; + for (const EmumbaMarketData::BookLevel &l : from.blevel) { + if (i < COCONUT_MAX_DEPTH) { + to[i++] = PriceSize{// TODO + IntPrice_from_double<9>(l.price.to_double()), + l.direct_qty.value()}; + } + } +} + +} // namespace helpers + inline api::Venue convert_venue(EmumbaMarketData::Venue /*unused*/) { // TODO return api::Venue::VENUE_BTS; @@ -44,12 +73,6 @@ inline co2::AggressorSide convert_agg_side( return co2::AggressorSide::AGGRESSOR_SIDE_NONE; } -void clear_md(std::array &md_side) { - for (PriceSize &psz : md_side) { - psz = PriceSize{}; - } -} - bts::md::IntPrice convert_to_intprice(EmumbaMarketData::Price price) { return IntPrice_from_double<9>(price.to_double()); } @@ -65,8 +88,8 @@ inline EmumbaSecurityData *get_security( struct EmumbaMDListener::PImpl { EmumbaSecurityIndex &index; MDProducer &md_producer; - std::array bids; - std::array asks; + MdArray bids; + MdArray asks; explicit PImpl(EmumbaSecurityIndex &index_a, MDProducer &md_producer_a) : index(index_a), md_producer(md_producer_a) {} }; @@ -129,12 +152,10 @@ void EmumbaMDListener::on_book(const EmumbaMarketData::Book &book) { book.security_id.value()); return; } - clear_md(me->bids); - clear_md(me->asks); - // copy bids now - // auto copy_arr = [](std::) { - - // }; + helpers::copy_books(book.bids, me->bids); + helpers::copy_books(book.asks, me->asks); + sec_data->handle.update_books( + utils::TimeStamp::now(), me->bids, me->asks, {}, {}); } void EmumbaMDListener::on_trades( From 317fc93c768fd0e9e1e9e14a2c238f033bf2c365 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 20 Oct 2021 20:04:42 -0400 Subject: [PATCH 016/100] OrderGateway added for EMumba integration --- src/lib/md/emumba/MarketDataCommon.h | 3 + src/lib/md/emumba/OrderGateway.h | 77 +++++++++++++++++++ .../spreader_orders/tests/spreader_tests.cpp | 1 + 3 files changed, 81 insertions(+) create mode 100644 src/lib/md/emumba/OrderGateway.h diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h index 1fa9b1637..40cf66655 100644 --- a/src/lib/md/emumba/MarketDataCommon.h +++ b/src/lib/md/emumba/MarketDataCommon.h @@ -44,8 +44,11 @@ class ValueWrapper { using Quantity = ValueWrapper; using SecurityID = ValueWrapper; +using AccountID = ValueWrapper; +using UserID = ValueWrapper; using MarketDataListenerID = ValueWrapper; +using OrderKey = ValueWrapper; // more types will be needed there like spots etc enum class SecurityType { INDEX, FUTURE, SPREAD, OPTION }; diff --git a/src/lib/md/emumba/OrderGateway.h b/src/lib/md/emumba/OrderGateway.h new file mode 100644 index 000000000..8b9b1e332 --- /dev/null +++ b/src/lib/md/emumba/OrderGateway.h @@ -0,0 +1,77 @@ +#pragma once + +#include "MarketDataCommon.h" +#include +#include +#include + +namespace EmumbaMarketData { + +enum class TimeInForce { + TIME_IN_FORCE_DAY = 48, + TIME_IN_FORCE_GTC = 49, + TIME_IN_FORCE_IOC = 51, + TIME_IN_FORCE_DATE = 52 +}; + +struct DeribitOrderDefinition {}; +struct GlbxOrderDefinition {}; + +struct OrderDefinition { + SecurityID security_id; + Side side; + std::string user; + UserID user_id; + std::string account; + AccountID account_id; + TimeInForce time_in_force; + const std::variant + exchange_order = {DeribitOrderDefinition{}}; +}; + +struct NewOrder { + OrderDefinition order_def; + Price price; + Quantity qty; +}; + +struct OrderUpdate { + OrderKey order_key; + Price price; + Quantity qty; +}; + +enum class ChildStatus { WORKING, COMPLETED, CANCELED }; + +struct DeribitOrderState {}; +struct GlbxOrderState {}; + +struct OrderState { + ChildStatus status; + Quantity total_fills; + Price avg_price; + Quantity last_fills; + Price last_price; + std::variant exchange_order_state; +}; + +class IOrderListener { + virtual void on_order_update( + OrderKey order_key, const OrderState &order_state) = 0; +}; + +// Anologous to the MarketDataGateway. All order interactions happen through +// this class. +class OrderGateway { + // This is called just once to register the client, to receive callback for + // order updates + void register_once(IOrderListener *listener) noexcept; + // New orders are enterred via this function. An internal OrderKey is + // generated for every order new order. This OrderKey is used for subsequent + // API calls + OrderKey launch_new_order(const NewOrder &new_order); + void update_order(const OrderUpdate &order_update); + void cancel_order(OrderKey order_key); +}; + +} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index cc97147ac..8f3fa5c4a 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,6 +1,7 @@ #include "lib/md/emumba/IMarketDataListener.h" #include "lib/md/emumba/MarketDataCommon.h" #include "lib/md/emumba/MarketDataGateway.h" +#include "lib/md/emumba/OrderGateway.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From 849adc5d7c91c0fd4fda2bde2958f22f575da35b Mon Sep 17 00:00:00 2001 From: taha afzal Date: Fri, 22 Oct 2021 07:47:39 -0400 Subject: [PATCH 017/100] Completed OrderGatewy inteface --- src/lib/md/emumba/OrderGateway.h | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/lib/md/emumba/OrderGateway.h b/src/lib/md/emumba/OrderGateway.h index 8b9b1e332..ee7ee3009 100644 --- a/src/lib/md/emumba/OrderGateway.h +++ b/src/lib/md/emumba/OrderGateway.h @@ -17,6 +17,8 @@ enum class TimeInForce { struct DeribitOrderDefinition {}; struct GlbxOrderDefinition {}; +// This contains the order parameters common to all exchanges. It is sent once +// when a new order is launched struct OrderDefinition { SecurityID security_id; Side side; @@ -25,51 +27,60 @@ struct OrderDefinition { std::string account; AccountID account_id; TimeInForce time_in_force; + // Exchange specific order definition (ex if a certain exchange offers + // Iceberg orders, this is where its parameters will be) const std::variant exchange_order = {DeribitOrderDefinition{}}; }; +// Sent once per order, when the order is first launched (launching an order, +// placing, firing, sending all mean the same) struct NewOrder { OrderDefinition order_def; Price price; Quantity qty; }; +// Structure for order modifications (also know as cancel-replace at some +// exchanges). struct OrderUpdate { OrderKey order_key; Price price; Quantity qty; }; -enum class ChildStatus { WORKING, COMPLETED, CANCELED }; +// Order can be in one of these states +enum class OrderStatus { WORKING, COMPLETED, CANCELED }; struct DeribitOrderState {}; struct GlbxOrderState {}; struct OrderState { - ChildStatus status; + OrderStatus status; Quantity total_fills; - Price avg_price; - Quantity last_fills; - Price last_price; + Price avg_filled_price; + // If there is any exchange specific order state std::variant exchange_order_state; }; +// Order cacllbacks are passed to this interface class IOrderListener { - virtual void on_order_update( + virtual void on_order_state( OrderKey order_key, const OrderState &order_state) = 0; }; // Anologous to the MarketDataGateway. All order interactions happen through // this class. class OrderGateway { - // This is called just once to register the client, to receive callback for - // order updates + // This is called just once to register the listening class (to get order + // callbacks) void register_once(IOrderListener *listener) noexcept; - // New orders are enterred via this function. An internal OrderKey is + // New orders are placed via this function. An internal OrderKey is // generated for every order new order. This OrderKey is used for subsequent - // API calls + // calls as well as IOrderListener callbacks OrderKey launch_new_order(const NewOrder &new_order); + // An order is changed via this method. We can start by allowing only price + // and qty changes (these are by far the most common changes) void update_order(const OrderUpdate &order_update); void cancel_order(OrderKey order_key); }; From d0ceed37b5f75158f9966ce99258951b8b5cab56 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 14 Feb 2021 14:22:15 -0600 Subject: [PATCH 018/100] cli: Remove ValidateFifo cmd (obsolete) --- src/server/sparkd/cmds/Spartan.cpp | 2 - .../matcher_validation_observer.cpp | 541 ------------------ .../validation/matcher_validation_observer.h | 55 -- .../sparkd/cmds/spartan/cmds/ValidateFifo.cpp | 25 - .../sparkd/cmds/spartan/cmds/ValidateFifo.h | 16 - 5 files changed, 639 deletions(-) delete mode 100644 src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp delete mode 100644 src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.h delete mode 100644 src/server/sparkd/cmds/spartan/cmds/ValidateFifo.cpp delete mode 100644 src/server/sparkd/cmds/spartan/cmds/ValidateFifo.h diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 78b0f92be..9785ecc99 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -11,7 +11,6 @@ #include "cmds/SQL.h" #include "cmds/Sim.h" #include "cmds/Stats.h" -#include "cmds/ValidateFifo.h" #include "cmds/ValuePolys.h" #include "cmds/Test.h" @@ -33,7 +32,6 @@ Spartan::Spartan() : CLI::App("Futures trading system for devs", "spartan") { add_subcommand(CLI::App_p(new Sim())); add_subcommand(CLI::App_p(new SQL())); add_subcommand(CLI::App_p(new Stats())); - add_subcommand(CLI::App_p(new ValidateFifo())); add_subcommand(CLI::App_p(new ValuePolys())); add_subcommand(CLI::App_p(new Test())); } diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp deleted file mode 100644 index e8bd37051..000000000 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp +++ /dev/null @@ -1,541 +0,0 @@ -#include "back_testing/matcher/validation/matcher_validation_observer.h" -#include "back_testing/matcher/FifoMatcherContext.h" -#include "back_testing/matcher/FillDepot.h" -#include "back_testing/matcher/iceberg_helper.h" -#include "back_testing/matcher/matcher_diagnostics.h" -#include "back_testing/matcher/validation/event_flags.h" -#include "domain/SecuritySnapshot.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/orderman/orderman_utils/PriceComp.h" -#include "back_testing/matcher/iceberg_helper.h" -#include "back_testing/matcher/matcher_diagnostics.h" -#include "back_testing/matcher/validation/event_flags.h" -#include "domain/SecuritySnapshot.h" -#include "feed_handler/detail/gen/src/SecurityTradingStatus.h" -#include "back_testing/common/event_ordinal.h" -#include "back_testing/common/mdp3_utils.h" -#include "back_testing/common/order_utils.h" -#include "back_testing/common/security_comp.h" -#include "utils/ActionSummarizer.h" -#include "utils/ActionSummarizerMacros.h" -#include -#include -#include - -// Error logs are automatically logged to the console -// (w/ default logging configuration), but they lag behind -// immediate console output (i.e., calls to std::cout). -// If _ECHO_ON is defined, the _ERROR_LEVEL macro is set to Info -// to avoid duplicate, and (perhaps more importantly) unsynchronized output. -// #define _ECHO_ON -#ifdef _ECHO_ON -#define _ECHO(...) std::cout << bts::orderman::Formatter::fmt(__VA_ARGS__); -#define _ERROR_LEVEL Info -#else -#define _ECHO(...) -#define _ERROR_LEVEL Error -#endif -#define _LOG(level, msg) \ - _ECHO(_log_header(), " ", msg, "\n") \ - LOG(OrderMan, level, "{} {}", _log_header(), msg) -#define INFO(...) _LOG(Info, bts::orderman::Formatter::fmt(__VA_ARGS__)) -#define ERROR(...) \ - _LOG(_ERROR_LEVEL, bts::orderman::Formatter::fmt(__VA_ARGS__)) - -// SUMMARIZE macro wrappers -#define _SUMMARIZE SUMMARIZE(_log_header()) -#define _SUMMARIZE_TRANSACTION(...) \ - SUMMARIZE_TRANSACTION(_log_header(), FMT(__VA_ARGS__)) -#define _SUMMARIZE_TRANSACTION_NAMED(name, ...) \ - SUMMARIZE_TRANSACTION_NAMED(name, _log_header(), FMT(__VA_ARGS__)) - -namespace bts::spartan::mdp3 { -using namespace bts::spartan::mdp3::iceberg_helper; -// aliases -using TradingStatus = MatcherValidationObserver::TradingStatus; -template -using flat_map = boost::container::flat_map; -// consts -const size_t NO_EVENT = 0, MIN_OBSERVED_EVENT = 100; - -enum class Verbosity { Minimal = 0, Normal = 1, Verbose = 2 }; - -/////////////////////// -// stateless helpers -/////////////////////// -inline std::string _log_header() { return "MatcherValidationObserver"; } - -inline bool _is_interesting_sec(const SecuritySnapshot &s) { - return s.definition().asset() == "ES"; - // return strcmp(s.definition().asset(), "SI") == 0; -} - -void _sync_orders( - size_t event_id, - const SecuritySnapshot &s, - Orders &orders, - const std::unordered_map &icebergs) { - // - for (auto ch : s.order_changes()) { - switch (ch.change) { - case OrderChange::added: - case OrderChange::updated: - case OrderChange::updated_price: - add_iceberg_annotation(ch.order, ch.change, icebergs, event_id, true); - orders[ch.order.key] = ch.order; - break; - case OrderChange::removed: - orders.erase(ch.order.key); - break; - } - } -} - -bool _has_multiple_aggressor_secs(const FeedEvent &ev) { - bool aggr_sec_found = false; - for (auto *s : ev) { - for (auto f : s->fills()) { - switch (f.aggressor) { - case MDP3Fill::Aggressor::THIS_BUY: - case MDP3Fill::Aggressor::THIS_SELL: - if (aggr_sec_found) - return true; - aggr_sec_found = true; - break; - default: - continue; - } - break; - } - } - return false; -} - -inline std::ostream &operator<<(std::ostream &ostr, const TradingStatus &ts) { - switch (ts) { - case TradingStatus::None: - ostr << "None"; - break; - case TradingStatus::Preopen: - ostr << "Preopen"; - break; - case TradingStatus::Uninitialized: - ostr << "Uninitialized"; - break; - case TradingStatus::Initialized: - ostr << "Initialized"; - break; - default: - ostr << "TradingStatus_" << static_cast(ts); - break; - } - return ostr; -} - -template -inline void print_if_not_empty( - TIter first, TIter last, std::string title, std::ostream &out = std::cout) { - bool printed_title = false; - while (first != last) { - if (!printed_title) { - out << title << std::endl; - printed_title = true; - } - out << *first << std::endl; - first++; - } -} - -inline bool fill_equals(const MDP3Fill &a, const MDP3Fill &b) { - return a.aggressor == b.aggressor && a.quantity == b.quantity && - orderman::price_comp::is_equal(a.price, b.price); -} - -inline bool match_fills( - const FillDepot &fd, - std::vector snaps, - std::ostream &out = std::cout) { - std::unordered_map> fill_map; - fd.copy_to(fill_map); - bool errors = false; - for (const auto *s : snaps) { - auto sec_fills_it = fill_map.find(s->security_id()); - if (sec_fills_it == fill_map.end()) { - print_if_not_empty( - s->fills().begin(), s->fills().end(), - FMT(s->symbol(), " unmatched fills"), out); - continue; - } - auto &act_fills = sec_fills_it->second; - auto exp_it = s->fills().begin(); - std::vector unmatched_exp; - while (exp_it != s->fills().end()) { - bool matched = false; - for (auto act_it = act_fills.begin(); act_it != act_fills.end(); - act_it++) { - if (fill_equals(*act_it, *exp_it)) { - act_fills.erase(act_it); - matched = true; - break; - } - } - if (!matched) { - unmatched_exp.push_back(*exp_it); - } - exp_it++; - } - errors |= (act_fills.size() || unmatched_exp.size()); - print_if_not_empty( - act_fills.begin(), act_fills.end(), - FMT(s->symbol(), " unexpected fills"), out); - print_if_not_empty( - unmatched_exp.begin(), unmatched_exp.begin(), - FMT(s->symbol(), " unmatched fills"), out); - } - return !errors; -} -/////////////////////// -// private classes -/////////////////////// -struct _SecurityData { - _SecurityData() - : status(TradingStatus::None), current_orders(), previous_orders() {} - TradingStatus status; - Orders current_orders, previous_orders; - size_t last_observed_event = NO_EVENT; - const SecuritySnapshot *snapshot = nullptr; - std::string symbol() const { - return snapshot == nullptr ? "N/A" : snapshot->symbol(); - } - SecurityID security_id() const { - return snapshot == nullptr ? SecurityID(0) : snapshot->security_id(); - } -}; - -struct MatcherValidationObserver::PImpl { - PImpl() {} - PImpl( - std::unordered_map icebergs, - flat_map interesting_event_ranges) - : icebergs(icebergs), - interesting_event_ranges(interesting_event_ranges) {} - - flat_map security_cache; - std::unordered_map icebergs; - flat_map interesting_event_ranges; - flat_map interesting_orders; - - // number of 'interesting events' observed so far. - uint32_t interesting_event_count = 0; - // actual event_id (from the exchange) of most recently observed event. - size_t event_id = NO_EVENT; - FifoMatcherContext exch_matcher; - Verbosity verbosity = Verbosity::Minimal; - EventFlags ignore_flags = EventFlags::MultipleSecurityAggressors; - - // event_id is used to transition the security's trading status from - // Preopen to Uninitialized - _SecurityData & - get_security_data(const SecuritySnapshot &s, size_t event_id) { - auto it = security_cache.find(s.security_id()); - if (it != security_cache.end()) { - auto &data = it->second; - if (event_id != data.last_observed_event) { - data.last_observed_event = event_id; - switch (data.status) { - case TradingStatus::Preopen: - data.status = TradingStatus::Uninitialized; - break; - case TradingStatus::None: - if (s.trading_status() == - ::mdp3::SecurityTradingStatus::ReadyToTrade) - data.status = TradingStatus::Preopen; - break; - default: - break; - } - } - data.snapshot = &s; - return data; - } - // this is the first time this security has been observed; initialize its - // data. - auto &data = security_cache.emplace(s.security_id(), _SecurityData()) - .first->second; - data.snapshot = &s; - data.last_observed_event = event_id; - data.previous_orders = s.orders(); - for (auto &o : data.previous_orders) - add_iceberg_annotation( - o.second, OrderChange::ChangeType::added, icebergs, event_id); - // the first event at the open isn't processed bc - // we don't have a clear understanding of how preopen matching works. - data.status = - s.trading_status() == ::mdp3::SecurityTradingStatus::ReadyToTrade - ? TradingStatus::Preopen - : TradingStatus::None; - data.snapshot = &s; - return data; - } - - EventFlags get_event_flags(const FeedEvent &ev) { - EventFlags flags = EventFlags::None; - if (_has_multiple_aggressor_secs(ev)) - flags |= EventFlags::MultipleSecurityAggressors; - for (const auto *s : ev) { - for (auto &f : s->fills()) { - if (icebergs.find(f.key) != icebergs.end()) - flags |= EventFlags::IcebergOrders; - switch (f.aggressor) { - case MDP3Fill::Aggressor::THIS_BUY: - case MDP3Fill::Aggressor::THIS_SELL: - flags |= EventFlags::DirectFills; - break; - case MDP3Fill::Aggressor::IMPLIED: - flags |= EventFlags::ImpliedFills; - break; - default: - break; - } - } - } - return flags; - } -}; -/////////////////////// -// constructors -/////////////////////// -MatcherValidationObserver::MatcherValidationObserver( - std::unordered_map icebergs) - : MatcherValidationObserver(icebergs, flat_map{}) {} - -MatcherValidationObserver::MatcherValidationObserver( - std::unordered_map icebergs, - flat_map interesting_event_ranges) - : _me(new MatcherValidationObserver::PImpl( - icebergs, interesting_event_ranges)) {} - -MatcherValidationObserver::~MatcherValidationObserver() {} - -/////////////////////// -// misc private methods -/////////////////////// -TradingStatus MatcherValidationObserver::_trading_status( - const SecuritySnapshot &s, size_t event_id) { - return _me->get_security_data(s, event_id).status; -} - -bool MatcherValidationObserver::_is_ready_to_trade( - const SecuritySnapshot &s, size_t event_id) { - switch (_trading_status(s, event_id)) { - case TradingStatus::Uninitialized: - case TradingStatus::Initialized: - return true; - default: - return false; - } -} - -void MatcherValidationObserver::_sync_current_orders(FeedEvent const &ev) { - for (auto s : ev) { - auto &new_orders = _me->get_security_data(*s, ev.event_id).current_orders; - _sync_orders(ev.event_id, *s, new_orders, _me->icebergs); - } -} - -void MatcherValidationObserver::_sync_previous_orders(const FeedEvent &ev) { - for (auto s : ev) { - auto &old_orders = - _me->get_security_data(*s, ev.event_id).previous_orders; - _sync_orders(ev.event_id, *s, old_orders, _me->icebergs); - } -} - -void MatcherValidationObserver::_reset_matcher() { - // remove orders, and change [actively trading] securities - // trading status back to Preopen so they will be added back - // in the next update (the state must be re-initialized - // before updates can be consumed incrementally again). - if (_me->verbosity > Verbosity::Normal) - INFO("clearing orders to reset the matcher's state"); - _me->exch_matcher.clear(); - for (auto &kv : _me->security_cache) { - if (kv.second.status != TradingStatus::None) - kv.second.status = TradingStatus::Preopen; - } -} -/////////////////////// -// IMDP3FeedObserver -/////////////////////// -void MatcherValidationObserver::on_recovery_complete( - InitialSnapshot const &snap) { - _SUMMARIZE; - for (auto s : snap) { - auto &sec_data = _me->get_security_data(*s, NO_EVENT); - sec_data.current_orders.clear(); - _sync_orders(NO_EVENT, *s, sec_data.current_orders, _me->icebergs); - sec_data.previous_orders = sec_data.current_orders; - } -} - -void MatcherValidationObserver::on_event_end(FeedEvent const &ev) { - bts_assert(ev.event_id > _me->event_id); - _me->event_id = ev.event_id; - switch (get_event_ordinal( - _me->interesting_event_ranges, ev.event_id, MIN_OBSERVED_EVENT)) { - case bts::spartan::EventOrdinal::Waiting: - // just need to synchronize the order caches. - // the matcher is only validated during 'interesting events.' - _sync_current_orders(ev); - _sync_previous_orders(ev); - return; - case bts::spartan::EventOrdinal::Interesting: - // _sync_previous_orders should be called after - // the matcher has digested the order changes. - break; - case bts::spartan::EventOrdinal::Done: - // nothing left to do (might as well kill the process). - bts_assert_msg(false, "no further events of interest."); - return; - } - auto flags = _me->get_event_flags(ev); - if ((flags & _me->ignore_flags) != EventFlags::None) { - if (_me->verbosity > Verbosity::Minimal) - INFO(FMT("skipping event ", ev.event_id, ", with flags ", flags)); - _sync_current_orders(ev); - _sync_previous_orders(ev); - _reset_matcher(); - return; - } - ++_me->interesting_event_count; - if (_me->verbosity > Verbosity::Minimal) - INFO( - "Update No ", _me->interesting_event_count, "(event id ", ev.event_id, - ")"); - // Note: the exchange processes the order updates per security, - // in a particular order, sorted hierarchically by symbol, then expiration. - // 'sorted_secs' will contain the proper order of securities. - std::vector sorted_secs; - for (auto *s : ev) { - if (_is_interesting_sec(*s)) - sorted_secs.push_back(s); - } - if (sorted_secs.empty()) - return; - std::sort( - sorted_secs.begin(), sorted_secs.end(), security_comp::SymbolComp()); - // securities must be added to the matcher before the order - // changes are processed to ensure the correct implied markets are used. - // Fills are also indexed in this pass, so they can be added to the iceberg - // qty - std::unordered_map fill_map; - for (const auto *s : sorted_secs) { - accumulate_fills(s->fills().begin(), s->fills().end(), fill_map); - _me->exch_matcher.add_security( - s->security_id(), s->symbol(), s->definition().legs()); - _me->exch_matcher.implied_matching_status( - s->security_id(), s->definition().implied_matching()); - } - // initialize matcher with previous state (only applies - // to securities whose orders the matcher hasn't seen yet). - for (const auto *s : sorted_secs) { - if (_trading_status(*s, ev.event_id) != TradingStatus::Uninitialized) - continue; - auto it = _me->security_cache.find(s->security_id()); - bts_assert(it != _me->security_cache.end()); - auto prev_ords = - it->second.previous_orders | - ranges::views::transform([](auto &p) { return p.second; }); - _me->exch_matcher.reset( - s->security_id(), prev_ords.begin(), prev_ords.end()); - _me->security_cache[s->security_id()].status = TradingStatus::Initialized; - } - // process changes with matcher - FillDepot fills; - for (const auto *s : sorted_secs) { - switch (_trading_status(*s, ev.event_id)) { - case TradingStatus::Initialized: - break; - default: - continue; - } - auto deduced = s->deduced_order_changes(); - if (deduced.size()) { - std::vector deduced_sm; - for (auto &ch : deduced) { - add_iceberg_annotation( - ch.order, ch.change, _me->icebergs, ev.event_id); - deduced_sm.emplace_back(ch); - } - _me->exch_matcher.on_order_change( - s->security_id(), deduced_sm, nullptr, fills); - } - } - // Verify the matcher's orders are identitical to the exchange's. - _sync_current_orders(ev); - bool orders_match = true; - for (const auto *s : sorted_secs) { - if (!_is_ready_to_trade(*s, ev.event_id)) - continue; - auto &sec_data = _me->security_cache[s->security_id()]; - auto &curr_orders = sec_data.current_orders; - auto error = - _me->exch_matcher.has_same_orders(s->security_id(), curr_orders); - if (error) { - ERROR( - "order discrepancies detected for ", s->symbol(), " on event ", - ev.event_id, "\nError: ", error.value(), "\nOld Orders:\n", - _me->security_cache[s->security_id()].previous_orders); - orders_match = false; - } - } - bool fills_match = match_fills(fills, sorted_secs); - if (!orders_match || !fills_match) { - // todo: add the iceberg fills back, to get to the previous state. - // describe current state for diagnostic purposes - std::stringstream msg; - msg << "Spartan Top of Books:" << std::endl; - _me->exch_matcher.print_all_bbos(msg); - msg << std::endl; - // spartan fills - msg << "Spartan Total Fill Qty: " << fills.total_fill_qty() << std::endl; - auto fill_cmp = [](const auto &lhs, const auto &rhs) { - return lhs.trade_entry_id == rhs.trade_entry_id - ? static_cast(lhs.aggressor) > - static_cast(rhs.aggressor) - : lhs.trade_entry_id < rhs.trade_entry_id; - }; - std::vector spartan_fills; - fills.copy_to(spartan_fills); - std::sort(spartan_fills.begin(), spartan_fills.end(), fill_cmp); - msg << "Spartan Fills (ordered by Trade ID):" << std::endl; - diagnostics::print_fills(spartan_fills.begin(), spartan_fills.end(), msg); - // exch top of books - msg << "Exchange Top of Books:" << std::endl; - diagnostics::print_many_bbo( - sorted_secs.begin(), sorted_secs.end(), true, true, msg); - int exch_fill_qty = 0; - for (auto *s : sorted_secs) { - for (auto f : s->fills()) - exch_fill_qty += f.quantity.value(); - } - // exch fills - msg << "Exchange Total Fill Qty: " << exch_fill_qty << std::endl; - std::vector all_exch_fills; - for (auto *s : sorted_secs) { - for (auto f : s->fills()) - all_exch_fills.push_back(f); - } - std::sort(all_exch_fills.begin(), all_exch_fills.end(), fill_cmp); - msg << "Exchange Fills (ordered by Trade ID):" << std::endl; - diagnostics::print_fills( - all_exch_fills.begin(), all_exch_fills.end(), msg); - INFO(msg.str()); - // reset the matcher to avoid cascading/compounding errors in subsequent - // events. - _reset_matcher(); - } - _sync_previous_orders(ev); -} - -} // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.h b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.h deleted file mode 100644 index 68ad21b81..000000000 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.h +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once -#include "back_testing/matcher/FifoMatcherContext.h" -#include "domain/SecuritySnapshot.h" -#include "back_testing/common/mdp3_common.h" -#include "back_testing/feed_observers/IcebergFinder.h" -#include "back_testing/feed_observers/FeedObserver.h" -#include "back_testing/common/mdp3_utils.h" -#include -#include -#include - -namespace bts::spartan::mdp3 { -struct MatcherValidationObserver : FeedObserver { - MatcherValidationObserver( - std::unordered_map icebergs); - // interesting_event_ranges: - // - keys indicate the first event in an interesting range - // - values indicate the number of events in the range (i.e., the range's - // length). - MatcherValidationObserver( - std::unordered_map icebergs, - boost::container::flat_map interesting_event_ranges); - ~MatcherValidationObserver(); - void on_recovery_complete(InitialSnapshot const &snap) override; - void on_event_end(FeedEvent const &ev) override; - // the first time a security's actual trading status - // (i.e., mdp3::SecurityTradingStatus from the exchange) - // is observed to be 'ReadyToTrade,' its local TradingStatus - // (this enum) is switched from 'None' to Preopen.' The security's - // changes in that event are ignored, but on the subsequent event - // its TradingStatus will be flipped from 'Preopen' to 'Uninitialized' - // (in the beginning of the callback). That will be the first event - // in which order changes will be processed for the security. - // As such, the matcher will initialize the state for the security - // by adding every resting order it had prior to the event. - // After that, the TradingStatus will be flipped to 'Initialized.' - // From then on, updates for the security will be processed incrementally. - enum class TradingStatus { None, Preopen, Uninitialized, Initialized }; - - private: - struct PImpl; - std::unique_ptr _me; - - TradingStatus _trading_status(const SecuritySnapshot &s, size_t event_id); - // returns true if the security's TradingStatus is 'Uninitialized', or - // 'Initialized' (in other words, if it isn't 'None,' or 'Preopen') - bool _is_ready_to_trade(const SecuritySnapshot &s, size_t event_id); - // std::tuple _event_filter(const FeedEvent&); - - // state maintenance - void _sync_current_orders(FeedEvent const &ev); - void _sync_previous_orders(FeedEvent const &ev); - void _reset_matcher(); -}; -} // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.cpp b/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.cpp deleted file mode 100644 index a8226fe92..000000000 --- a/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "ValidateFifo.h" -#include "back_testing/matcher/validation/matcher_validation_observer.h" -#include "back_testing/feed_observers/IcebergFinder.h" -#include "back_testing/common/mdp3_utils.h" -#include - -namespace bts::spartan::cmds { - -struct ValidateFifo::Args { - std::string pcap; -}; - -ValidateFifo::ValidateFifo() - : CLI::App("", "validate-fifo"), _args(new ValidateFifo::Args()) { - add_option("pcap,--pcap", _args->pcap)->required(); - callback([&] { - auto ibs = mdp3::IcebergFinder::find_all(_args->pcap); - mdp3::MatcherValidationObserver obs(ibs); - mdp3::observe_channel(_args->pcap, obs); - }); -} - -ValidateFifo::~ValidateFifo() {} - -} // namespace bts::spartan::cmds diff --git a/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.h b/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.h deleted file mode 100644 index d54c7059e..000000000 --- a/src/server/sparkd/cmds/spartan/cmds/ValidateFifo.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -#include -#include - -namespace bts::spartan::cmds { - -struct ValidateFifo : public CLI::App { - ValidateFifo(); - ~ValidateFifo(); - -private: - struct Args; - std::unique_ptr _args; -}; - -} // namespace bts::spartan::cmds From e3cd1e9fc3a3c34e1b9054f6c795e55548648663 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Feb 2021 01:05:17 -0600 Subject: [PATCH 019/100] refactor: Replace includes w/ fwd decls to speed up build Also replace public templated function FifoMatcherContext::reset with non-templated overloads, which call a private templated impl --- .../matcher/FifoImpliedSecurityMatcher.cpp | 6 +- .../matcher/FifoImpliedSecurityMatcher.h | 11 +-- .../matcher/FifoMatcherContext.cpp | 58 +++++++++++++++- .../back_testing/matcher/FifoMatcherContext.h | 69 +++++-------------- .../spartan/back_testing/matcher/Matcher.cpp | 4 +- 5 files changed, 87 insertions(+), 61 deletions(-) diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp index 2e8024cad..80a769a90 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp @@ -1,12 +1,14 @@ #include "FifoImpliedSecurityMatcher.h" #include "FifoSecurityMatcher.h" +#include "FillDepot.h" +#include "back_testing/common/mdp3_common.h" +#include "back_testing/common/order_utils.h" #include "back_testing/matcher/fill_factory.h" #include "back_testing/sim/sim_common.h" #include "domain/LegDefinition.h" #include "domain/SideQuantity.h" -#include "lib/domain_model/Security.h" #include "domain/book/book_utils.h" -#include "back_testing/common/order_utils.h" +#include "lib/domain_model/Security.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h index cae53af2d..d9c232a72 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h @@ -1,19 +1,22 @@ #pragma once -#include "FillDepot.h" #include "back_testing/common/MatchEffect.h" #include "back_testing/common/mdp3_common.h" -#include +#include "domain/Quantity.h" +#include "domain/SecurityID.h" +#include "domain/Side.h" +#include "domain/book/Book.h" #include -#include #include -namespace bts::spartan{ +namespace bts::spartan { struct LegDefinition; } namespace bts::spartan::mdp3 { class FifoSecurityMatcher; +class FillDepot; +struct SmallBookLevel; class FifoImpliedSecurityMatcher { public: diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp index 0a673de27..6e14795ea 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp @@ -1,11 +1,14 @@ #include "FifoMatcherContext.h" +#include "FifoImpliedSecurityMatcher.h" +#include "FifoMergedSecurityMatcher.h" +#include "FifoSecurityMatcher.h" #include "FillDepot.h" -#include "lib/orderman/orderman_utils/PriceComp.h" #include "back_testing/common/mdp3_common.h" -#include "back_testing/implied/implied_market.h" -#include "domain/book/book_utils.h" #include "back_testing/common/order_utils.h" #include "back_testing/common/security_comp.h" +#include "back_testing/implied/implied_market.h" +#include "domain/book/book_utils.h" +#include "lib/orderman/orderman_utils/PriceComp.h" #include "utils/ActionSummarizerMacros.h" #include "utils/TableDisplay.h" #include @@ -138,6 +141,10 @@ ImpliedBookSide FifoMatcherContext::implied_book(SecurityID sec_id, Side side) { /////////////////////// // matcher accessors /////////////////////// +FifoMergedSecurityMatcher *FifoMatcherContext::get_matcher(SecurityID sec_id) { + return _get_matcher(sec_id); +} + FifoMergedSecurityMatcher *FifoMatcherContext::_get_matcher(SecurityID sec_id) { auto m = _me->matchers.find(sec_id); return m == _me->matchers.end() ? nullptr : m->second; @@ -209,6 +216,50 @@ void FifoMatcherContext::clear() { kv.second->matcher()->clear(); } +template +void FifoMatcherContext::_reset( + SecurityID sec_id, + TIter first, + TIter last, + std::vector *effects) { + _ensure_sync_implied_candidates(); + auto *matcher = _get_or_add_matcher(sec_id); + // The 'order' in which orders are added to the matcher matters. + // The matcher uses an internal order priority counter + // so it can integrate custom orders (i.e., generated by our algos) + // into its books during simulations. + // The scope of an order's priority does not extend beyond its price + // level. + struct Comp { + bool operator()(const MDP3Order &a, const MDP3Order &b) { + if (a.side == b.side) { + return a.price.is_better(a.side, b.price) || + (a.price == b.price && a.priority < b.priority); + } + return a.side == Side::Buy; + } + }; + std::set sorted_orders; + while (first != last) { + sorted_orders.emplace(*first); + first++; + } + matcher->matcher()->reset(sorted_orders.begin(), sorted_orders.end()); + if (effects != nullptr) { + effects->emplace_back(SimBookUpdate()); + SimBookUpdate &mbp = std::get(effects->back()); + mbp.security_id = sec_id; + mbp.mbp_buy = matcher->book(Side::Buy); + mbp.mbp_sell = matcher->book(Side::Sell); + mbp.implied_mbp_buy = matcher->implied_book(Side::Buy); + mbp.implied_mbp_sell = matcher->implied_book(Side::Sell); + } +} + +void FifoMatcherContext::reset(SecurityID sec, std::vector orders, std::vector *effects) { + _reset(sec, orders.begin(), orders.end(), effects); +} + using BBORow = std::tuple; void FifoMatcherContext::print_all_bbos(std::ostream &out) { @@ -254,4 +305,5 @@ void FifoMatcherContext::_ensure_sync_implied_candidates() { } _me->implied_candidates_dirty = false; } + } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.h b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.h index 61acec18f..b9980741c 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.h +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.h @@ -1,8 +1,5 @@ #pragma once #include "back_testing/common/Trace.h" -#include "FifoImpliedSecurityMatcher.h" -#include "FifoMergedSecurityMatcher.h" -#include "FifoSecurityMatcher.h" #include "domain/LegDefinition.h" #include #include @@ -14,7 +11,10 @@ namespace bts::spartan::mdp3 { class FillDepot; +class FifoMergedSecurityMatcher; +class FifoSecurityMatcher; class FifoPriceLevelMatcher; +class FifoImpliedSecurityMatcher; struct MatcherOrder; class FifoMatcherContext { @@ -29,9 +29,7 @@ class FifoMatcherContext { ~FifoMatcherContext(); bool add_security( - SecurityID sec_id, - const std::string &symbol, - const LegVec &legs); + SecurityID sec_id, const std::string &symbol, const LegVec &legs); bool remove_security(SecurityID sec_id); void implied_matching_status(SecurityID sec_id, bool value); bool implied_matching_status(SecurityID sec_id) const; @@ -54,8 +52,17 @@ class FifoMatcherContext { AlgoEventID = no_algo_event()); void print_all_bbos(std::ostream &out); std::optional has_same_orders(SecurityID, const Orders &); - std::tuple - find_order(SecurityID, OrderKey); + std::tuple find_order( + SecurityID, OrderKey); + + FifoMergedSecurityMatcher *get_matcher(SecurityID); + + /** + * Resets a security's order book with a particular collection of resting orders. + * It is the caller's responsibility to ensure that there are no crosses in the + * 'resting orders,' as this method does not attempt to fill them. + */ + void reset(SecurityID, std::vector, std::vector * = nullptr); private: struct PImpl; @@ -67,52 +74,12 @@ class FifoMatcherContext { FifoMergedSecurityMatcher *_get_or_add_matcher(SecurityID sec_id); void _ensure_sync_implied_candidates(); - public: - FifoMergedSecurityMatcher *get_matcher(SecurityID sec_id) { - return _get_matcher(sec_id); - } - // This method doesn't check for crosses, as it assumes all of the orders - // are resting. The expectation is that this method will be called - // to initialize/reset the books (i.e., in response to the first callback, - // or after reset events). template - inline void reset( + void _reset( SecurityID sec_id, TIter first, TIter last, - std::vector *effects = nullptr) { - _ensure_sync_implied_candidates(); - auto *matcher = _get_or_add_matcher(sec_id); - // The 'order' in which orders are added to the matcher matters. - // The matcher uses an internal order priority counter - // so it can integrate custom orders (i.e., generated by our algos) - // into its books during simulations. - // The scope of an order's priority does not extend beyond its price - // level. - struct Comp { - bool operator()(const MDP3Order &a, const MDP3Order &b) { - if (a.side == b.side) { - return a.price.is_better(a.side, b.price) || - (a.price == b.price && a.priority < b.priority); - } - return a.side == Side::Buy; - } - }; - std::set sorted_orders; - while (first != last) { - sorted_orders.emplace(*first); - first++; - } - matcher->matcher()->reset(sorted_orders.begin(), sorted_orders.end()); - if (effects != nullptr) { - effects->emplace_back(SimBookUpdate()); - SimBookUpdate &mbp = std::get(effects->back()); - mbp.security_id = sec_id; - mbp.mbp_buy = matcher->book(Side::Buy); - mbp.mbp_sell = matcher->book(Side::Sell); - mbp.implied_mbp_buy = matcher->implied_book(Side::Buy); - mbp.implied_mbp_sell = matcher->implied_book(Side::Sell); - } - } + std::vector *effects = nullptr); }; + } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp index b7c1297cd..60fab3359 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp @@ -1,4 +1,6 @@ #include "Matcher.h" +#include "FillDepot.h" +#include "FifoMergedSecurityMatcher.h" #include "MatchingCommon.h" #include "back_testing/common/Trace.h" #include "domain/book/book_utils.h" @@ -128,7 +130,7 @@ void MergedMatcher::reset( std::vector *effects) { for (const auto &o : orders) _me->used_order_keys.emplace(o.key); - _asset_matcher(sec).reset(sec, orders.begin(), orders.end(), effects); + _asset_matcher(sec).reset(sec, orders, effects); } void MergedMatcher::match( From 63549fd3e27223604f36fcc5cdc6dac382886847 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 23 Feb 2021 14:29:30 -0600 Subject: [PATCH 020/100] refactor: Break up BookStatRecorder --- .../feed_observers/BookStatRecorder.cpp | 47 +--------- .../back_testing/feed_observers/BookStats.cpp | 50 ++++++++++ .../back_testing/feed_observers/BookStats.h | 38 ++++++++ src/server/sparkd/cmds/spartan/domain/Side.cc | 15 +++ src/server/sparkd/cmds/spartan/domain/Side.h | 32 +++++-- .../cmds/spartan/domain/book/BookMark.cc | 21 +++++ .../cmds/spartan/domain/book/BookMark.cpp | 34 +++++++ .../cmds/spartan/domain/book/BookMark.h | 45 +++++++++ .../cmds/spartan/domain/book/BookSlice.cpp | 24 +++++ .../cmds/spartan/domain/book/BookSlice.h | 26 ++++++ .../cmds/spartan/domain/book/book_utils.cpp | 30 ------ .../cmds/spartan/domain/book/book_utils.h | 92 ++++--------------- 12 files changed, 300 insertions(+), 154 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.cpp create mode 100644 src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.h create mode 100644 src/server/sparkd/cmds/spartan/domain/Side.cc create mode 100644 src/server/sparkd/cmds/spartan/domain/book/BookMark.cc create mode 100644 src/server/sparkd/cmds/spartan/domain/book/BookMark.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/BookMark.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/BookSlice.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/BookSlice.h diff --git a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp index 73d428062..badd26300 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStatRecorder.cpp @@ -1,4 +1,5 @@ #include "BookStatRecorder.h" +#include "BookStats.h" #include "lib/orderman/orderman_utils/Formatter.h" #include "back_testing/matcher/validation/event_flags.h" #include "domain/SecuritySnapshot.h" @@ -19,50 +20,10 @@ using flat_map = boost::container::flat_map; /////////////////////// // private classes /////////////////////// -/** - * The per-side stats in each csv row written to the output stream. - */ -struct BookStats { - BookStats() : BookStats(BookSide()) {} - BookStats(BookSide book) : _book(book) {} +} - const BookSide &book() const { return _book; } - void book(BookSide value) { _book = value; } - Quantity total_qty() const { - return stats::total_qty(book()); - } - Price avg_price() const { - return stats::avg_price(book()); - } - Price variance() const { return stats::variance(book()); } - - inline BookSlice get_slice(uint32_t slice_num, uint32_t block_size) { - return book_utils::get_slice( - book(), Quantity(slice_num * block_size), - Quantity(slice_num * (block_size + 1))); - } - - inline std::ostream & - to_csv(std::ostream &out, uint32_t block_size, uint32_t num_blocks) { - orderman::Formatter::join( - out, ",", _book[0].price, avg_price(), variance(), total_qty()); - for (uint32_t i = 0; i < num_blocks; i++) { - // top price of ith block - out << "," - << stats::best_price_after_qty( - _book.begin(), _book.end(), Quantity(i * block_size)); - // avg price of ith block - out << "," << stats::avg_price(_book, get_slice(i, block_size)); - // variance of ith block - out << "," << stats::variance(_book, get_slice(i, block_size)); - } - return out; - } - - private: - BookSide _book; -}; +namespace bts::spartan::mdp3 { /** * All of the stats/data in each csv row written to the output stream. @@ -71,7 +32,7 @@ struct BookStatsRow { BookStatsRow() : BookStatsRow(SecurityID(0), NO_EVENT, BookSide(), BookSide()) {} BookStatsRow(SecurityID security_id, size_t event_id, BookSide bid, BookSide ask) - : _security_id(security_id), _event_id(event_id), _data(bid, ask) {} + : _security_id(security_id), _event_id(event_id), _data{bid, ask} {} static std::ostream & headers_to_csv(std::ostream &out, uint32_t block_size, uint32_t num_blocks) { diff --git a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.cpp b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.cpp new file mode 100644 index 000000000..e82d9a6bb --- /dev/null +++ b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.cpp @@ -0,0 +1,50 @@ +#include "BookStats.h" +#include "domain/book/BookSlice.h" +#include "domain/book/book_utils.h" +#include "lib/orderman/orderman_utils/Formatter.h" + +namespace bts::spartan::mdp3 { + +using namespace book_utils; + +BookStats::BookStats() : BookStats(BookSide()) {} + +BookStats::BookStats(BookSide book) : _book(book) {} + +const BookSide &BookStats::book() const { return _book; } +void BookStats::book(BookSide value) { _book = value; } +Quantity BookStats::total_qty() const { return stats::total_qty(book()); } +Price BookStats::avg_price() const { return stats::avg_price(book()); } +Price BookStats::variance() const { return stats::variance(book()); } + +BookSlice BookStats::get_slice(uint32_t slice_num, uint32_t block_size) { + return book_utils::get_slice( + book(), Quantity(slice_num * block_size), + Quantity(slice_num * (block_size + 1))); +} + +std::ostream &BookStats::to_csv( + std::ostream &out, uint32_t block_size, uint32_t num_blocks) { + orderman::Formatter::join( + out, ",", _book[0].price, avg_price(), variance(), total_qty()); + for (uint32_t i = 0; i < num_blocks; i++) { + // top price of ith block + out << "," + << stats::best_price_after_qty( + _book.begin(), _book.end(), Quantity(i * block_size)); + // avg price of ith block + out << "," << stats::avg_price(_book, get_slice(i, block_size)); + // variance of ith block + out << "," << stats::variance(_book, get_slice(i, block_size)); + } + return out; +} + +} // namespace bts::spartan::mdp3 + +namespace bts::spartan { + +template <> +struct Sided; + +} diff --git a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.h b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.h new file mode 100644 index 000000000..af9782268 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/BookStats.h @@ -0,0 +1,38 @@ +#pragma once +#include +#include "domain/Quantity.h" +#include "domain/book/Book.h" + +namespace bts::spartan { + +class BookSlice; + +} + +namespace bts::spartan::mdp3 { + +class Price; + +/** + * The per-side stats in each csv row written to the output stream. + */ +struct BookStats { + BookStats(); + BookStats(BookSide); + + const BookSide &book() const; + void book(BookSide); + Quantity total_qty() const; + Price avg_price() const; + Price variance() const; + + BookSlice get_slice(uint32_t slice_num, uint32_t block_size); + + std::ostream & + to_csv(std::ostream &out, uint32_t block_size, uint32_t num_blocks); + + private: + BookSide _book; +}; + +} diff --git a/src/server/sparkd/cmds/spartan/domain/Side.cc b/src/server/sparkd/cmds/spartan/domain/Side.cc new file mode 100644 index 000000000..6ab8d512d --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/Side.cc @@ -0,0 +1,15 @@ +#include "Side.h" + +namespace bts::spartan { + +template +inline const Data &Sided::get(Side side) const { + return side == Side::Buy ? bid : ask; +} + +template +inline Data &Sided::get(Side side) { + return side == Side::Buy ? bid : ask; +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/Side.h b/src/server/sparkd/cmds/spartan/domain/Side.h index 9d3820b35..1d3cf391f 100644 --- a/src/server/sparkd/cmds/spartan/domain/Side.h +++ b/src/server/sparkd/cmds/spartan/domain/Side.h @@ -1,13 +1,27 @@ #pragma once -#include "lib/domain_model/Security.pb.h" #include "gateway/detail/gen/src/SideReq.h" - +#include "lib/domain_model/Security.pb.h" #include namespace bts::spartan { -enum class Side { - Buy = 0, Sell = 1 +enum class Side { Buy = 0, Sell = 1 }; + +/** + * A logical place to store a pair of data instances for bid/ask. + */ +template +struct Sided { + inline Sided() {} + inline Sided(Data bid, Data ask) : bid(bid), ask(ask) {} + + Data bid; + Data ask; + + Data &get(Side); + const Data &get(Side) const; + // inline Data &get(Side s) { return s == Side::Buy ? bid : ask; } + // inline const Data &get(Side) const { return s == Side::Buy ? bid : ask; } }; inline constexpr Side other_side(Side s) { @@ -18,7 +32,7 @@ inline constexpr Side other_side(Side s) { } inline constexpr Side from_ratio(int ratio) { - if (ratio >0) + if (ratio > 0) return Side::Buy; else return Side::Sell; @@ -46,12 +60,14 @@ inline constexpr const char *Side_Name(Side s) { } inline ::il3::SideReq::Value il3_side(Side s) { - return (::il3::SideReq::Value) ((int)s+1); + return (::il3::SideReq::Value)((int)s + 1); } -inline std::ostream& operator<<(std::ostream& out, const Side& s) { +inline std::ostream &operator<<(std::ostream &out, const Side &s) { out << Side_Name(s); return out; } -} +} // namespace bts::spartan + +#include "Side.cc" diff --git a/src/server/sparkd/cmds/spartan/domain/book/BookMark.cc b/src/server/sparkd/cmds/spartan/domain/book/BookMark.cc new file mode 100644 index 000000000..d82fb3327 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/BookMark.cc @@ -0,0 +1,21 @@ +#include "BookMark.h" + +namespace bts::spartan { + +constexpr BookMark::BookMark() : _level(0), _offset(0) {} + +constexpr BookMark::BookMark(std::uint16_t level, mdp3::Quantity offset) + : _level(level), _offset(offset) {} + +constexpr BookMark::BookMark(const BookMark &other) + : _level(other.level()), _offset(other.offset()) {} + +constexpr std::uint16_t BookMark::level() const { return _level; } + +constexpr mdp3::Quantity BookMark::offset() const { return _offset; } + +inline std::uint16_t &BookMark::level() { return _level; } + +inline mdp3::Quantity &BookMark::offset() { return _offset; } + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/BookMark.cpp b/src/server/sparkd/cmds/spartan/domain/book/BookMark.cpp new file mode 100644 index 000000000..62c507f10 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/BookMark.cpp @@ -0,0 +1,34 @@ +#include "BookMark.h" + +namespace bts::spartan { + +bool operator==(const BookMark &a, const BookMark &b) { + return a.level() == b.level() && a.offset() == b.offset(); +} + +bool operator!=(const BookMark &a, const BookMark &b) { return !(a == b); } + +bool operator>(const BookMark &a, const BookMark &b) { + return a.level() > b.level() || + (a.level() == b.level() && a.offset() > b.offset()); +} + +bool operator>=(const BookMark &a, const BookMark &b) { + return a > b || a == b; +} + +bool operator<(const BookMark &a, const BookMark &b) { + return a.level() < b.level() || + (a.level() == b.level() && a.offset() < b.offset()); +} + +bool operator<=(const BookMark &a, const BookMark &b) { + return a < b || a == b; +} + +std::ostream &operator<<(std::ostream &out, const BookMark &bm) { + out << bm.level() << "+" << bm.offset().value(); + return out; +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/BookMark.h b/src/server/sparkd/cmds/spartan/domain/book/BookMark.h new file mode 100644 index 000000000..6906772b2 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/BookMark.h @@ -0,0 +1,45 @@ +#pragma once +#include "domain/Quantity.h" +#include + +namespace bts::spartan { +/** + * BookMark denotes a particular qty point in the book as a + * price level, and a qty offset. For example, given a book + * with 2 qty at price level 1, and 5 at price level 2, the + * BookMark for qty 4 would be: level=2, offset=1, as the 4th + * unit in the book (as a whole), is the 2nd unit on price level 2. + */ +class BookMark { + public: + constexpr BookMark(); + constexpr BookMark(std::uint16_t level, mdp3::Quantity offset); + constexpr BookMark(const BookMark &); + + constexpr std::uint16_t level() const; + constexpr mdp3::Quantity offset() const; + + std::uint16_t &level(); + mdp3::Quantity &offset(); + + private: + std::uint16_t _level; + mdp3::Quantity _offset; +}; + +/** + * It really only makes sense to compare BookMarks within the context of the + * same Book. They represent a qty distnace into that Book, by a level, and a + * qty offset. + */ +bool operator==(const BookMark &a, const BookMark &b); +bool operator!=(const BookMark &a, const BookMark &b); +bool operator>(const BookMark &a, const BookMark &b); +bool operator>=(const BookMark &a, const BookMark &b); +bool operator<(const BookMark &a, const BookMark &b); +bool operator<=(const BookMark &a, const BookMark &b); +std::ostream &operator<<(std::ostream &out, const BookMark &bm); + +} // namespace bts::spartan + +#include "BookMark.cc" diff --git a/src/server/sparkd/cmds/spartan/domain/book/BookSlice.cpp b/src/server/sparkd/cmds/spartan/domain/book/BookSlice.cpp new file mode 100644 index 000000000..41767a071 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/BookSlice.cpp @@ -0,0 +1,24 @@ +#include "BookSlice.h" + +namespace bts::spartan { + +BookSlice::BookSlice() + : start(0, mdp3::Quantity(0)), stop(0, mdp3::Quantity(0)) {} + +BookSlice::BookSlice(BookMark start, BookMark stop) + : start(start), stop(stop) {} + +bool BookSlice::is_empty() const { return start == stop; } + +bool operator==(const BookSlice &a, const BookSlice &b) { + return a.start == b.start && a.stop == b.stop; +} + +bool operator!=(const BookSlice &a, const BookSlice &b) { return !(a == b); } + +std::ostream &operator<<(std::ostream &out, const BookSlice &bm) { + out << bm.start << " -> " << bm.stop; + return out; +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/BookSlice.h b/src/server/sparkd/cmds/spartan/domain/book/BookSlice.h new file mode 100644 index 000000000..75ad54b95 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/BookSlice.h @@ -0,0 +1,26 @@ +#pragma once +#include "../Quantity.h" +#include "BookMark.h" +#include + +namespace bts::spartan { + +/** + * A BookSlice represents a subsection of the Book, as the volume of the book + * that is between 2 BookMarks. + */ +class BookSlice { + public: + BookSlice(); + BookSlice(BookMark start, BookMark stop); + + bool is_empty() const; + + BookMark start, stop; +}; + +bool operator==(const BookSlice &a, const BookSlice &b); +bool operator!=(const BookSlice &a, const BookSlice &b); +std::ostream &operator<<(std::ostream &out, const BookSlice &bm); + +} diff --git a/src/server/sparkd/cmds/spartan/domain/book/book_utils.cpp b/src/server/sparkd/cmds/spartan/domain/book/book_utils.cpp index aa68fa323..20cc5058b 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/book_utils.cpp +++ b/src/server/sparkd/cmds/spartan/domain/book/book_utils.cpp @@ -232,34 +232,4 @@ void compute_synthetic_book( from_small_book(book_out, sbook_out); } -// BookMark operators -bool operator==(const BookMark &a, const BookMark &b) { - return a.level == b.level && a.offset == b.offset; -} -bool operator!=(const BookMark &a, const BookMark &b) { return !(a == b); } -bool operator>(const BookMark &a, const BookMark &b) { - return a.level > b.level || (a.level == b.level && a.offset > b.offset); -} -bool operator>=(const BookMark &a, const BookMark &b) { - return a > b || a == b; -} -bool operator<(const BookMark &a, const BookMark &b) { - return a.level < b.level || (a.level == b.level && a.offset < b.offset); -} -bool operator<=(const BookMark &a, const BookMark &b) { - return a < b || a == b; -} -std::ostream &operator<<(std::ostream &out, const BookMark &bm) { - out << bm.level << "+" << bm.offset.value(); - return out; -} -// BookSlice operators -bool operator==(const BookSlice &a, const BookSlice &b) { - return a.start == b.start && a.stop == b.stop; -} -bool operator!=(const BookSlice &a, const BookSlice &b) { return !(a == b); } -std::ostream &operator<<(std::ostream &out, const BookSlice &bm) { - out << bm.start << " -> " << bm.stop; - return out; -} } // namespace bts::spartan::mdp3::book_utils diff --git a/src/server/sparkd/cmds/spartan/domain/book/book_utils.h b/src/server/sparkd/cmds/spartan/domain/book/book_utils.h index 221ecf9c3..86cb87387 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/book_utils.h +++ b/src/server/sparkd/cmds/spartan/domain/book/book_utils.h @@ -1,8 +1,11 @@ #pragma once +#include "BookMark.h" +#include "BookSlice.h" +#include "back_testing/common/mdp3_common.h" +#include "domain/Side.h" #include "lib/md/IntPrice.h" #include "lib/md/PriceSize.h" #include "lib/orderman/orderman_utils/PriceComp.h" -#include "back_testing/common/mdp3_common.h" #include #include #include @@ -10,59 +13,6 @@ #include namespace bts::spartan::mdp3::book_utils { -/** - * A logical place to store a pair of data instances for bid/ask. - */ -template -struct Sided { - Sided() {} - Sided(Data bid, Data ask) : bid(bid), ask(ask) {} - Data bid, ask; -}; - -/** - * BookMark denotes a particular qty point in the book as a - * price level, and a qty offset. For example, given a book - * with 2 qty at price level 1, and 5 at price level 2, the - * BookMark for qty 4 would be: level=2, offset=1, as the 4th - * unit in the book (as a whole), is the 2nd unit on price level 2. - */ -struct BookMark { - BookMark() : level(0), offset(0) {} - BookMark(uint16_t level, Quantity offset) - : level(level), offset(offset) {} - uint16_t level; - Quantity offset; -}; - -/** - * It really only makes sense to compare BookMarks within the context of the - * same Book. They represent a qty distnace into that Book, by a level, and a - * qty offset. - */ -bool operator==(const BookMark &a, const BookMark &b); -bool operator!=(const BookMark &a, const BookMark &b); -bool operator>(const BookMark &a, const BookMark &b); -bool operator>=(const BookMark &a, const BookMark &b); -bool operator<(const BookMark &a, const BookMark &b); -bool operator<=(const BookMark &a, const BookMark &b); -std::ostream &operator<<(std::ostream &out, const BookMark &bm); - -/** - * A BookSlice represents a subsection of the Book, as the volume of the book - * that is between 2 BookMarks. - */ -struct BookSlice { - BookSlice() : start(0, mdp3::Quantity(0)), stop(0, Quantity(0)) {} - BookSlice(BookMark start, BookMark stop) : start(start), stop(stop) {} - - bool is_empty() const { return start == stop; } - BookMark start, stop; -}; - -bool operator==(const BookSlice &a, const BookSlice &b); -bool operator!=(const BookSlice &a, const BookSlice &b); -std::ostream &operator<<(std::ostream &out, const BookSlice &bm); inline std::ostream & fmt_price_level(std::ostream &out, Price price, Quantity qty) { @@ -177,7 +127,6 @@ inline bool has_min_qty( return false; } - bool remove_qty(SmallBook &book, Quantity qty); Quantity volume(const SmallBook &book); @@ -246,20 +195,21 @@ void compute_synthetic_book( const std::vector> &leg_mkts, uint32_t depth); + /** Determines whether or not the specified book has at least 'mark.level' * number of price levels, and has more than 'mark.quantity' quantity at the * price level 'mark.level.' */ template bool is_beyond_book(const TBook &book, const BookMark &mark) { - if (mark.level >= book.size() || book[mark.level].quantity.value() == 0) + if (mark.level() >= book.size() || book[mark.level()].quantity.value() == 0) return true; // return if the mark is on the last level (i.e., // the next level qty == 0), and the offset // is >= the qty at that level. - return (mark.level == book.size() - 1 || - book[mark.level + 1].quantity.value() == 0) && - mark.offset.value() >= book[mark.level].quantity.value(); + return (mark.level() == book.size() - 1 || + book[mark.level() + 1].quantity == 0) && + mark.offset() >= book[mark.level()].quantity; } template @@ -268,12 +218,12 @@ inline bool is_populated(const TBook &book, uint16_t level) { } /** * Determines if a BookMark is valid for a particular Book, meaning - * BookMark.level is less than the last level of the book AND BookMark.offset - * does not exceed the quantity at that level. + * Bookmark::level() is less than the last level of the book AND + * Bookmark::offset() does not exceed the quantity at that level. */ template bool is_valid(const TBook &book, const BookMark &mark) { - return is_beyond_book(book, mark) || book[mark.level].quantity > mark.offset; + return is_beyond_book(book, mark) || book[mark.level()].quantity > mark.offset(); } void to_small_book(const BookSide &book, SmallBook &book_out); @@ -334,19 +284,15 @@ slice_book(const TBook &book, const BookSlice &slice, SmallBook &book_out) { if (is_beyond_book(book, slice.start)) return; book_out.emplace_back( - book[slice.start.level].price, - Quantity( - book[slice.start.level].quantity.value() - - slice.start.offset.value())); - for (uint16_t i = 1; i < slice.stop.level - 1 && is_populated(book, i); i++) + book[slice.start.level()].price, + book[slice.start.level()].quantity - slice.start.offset()); + for (uint16_t i = 1; i < slice.stop.level() - 1 && is_populated(book, i); i++) book_out.emplace_back(book[i].price, book[i].quantity); - if (is_populated(book, slice.stop.level) && - book[slice.stop.level].quantity > slice.stop.offset) + if (is_populated(book, slice.stop.level()) && + book[slice.stop.level()].quantity > slice.stop.offset()) book_out.emplace_back( - book[slice.stop.level].price, - Quantity( - book[slice.stop.level].quantity.value() - - slice.stop.offset.value())); + book[slice.stop.level()].price, + book[slice.stop.level()].quantity - slice.stop.offset()); } /** From 01d9af0bb24b89803c24492cf66e3e8c23e7c081 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 23 Feb 2021 15:12:54 -0600 Subject: [PATCH 021/100] Remove Price::abs method's price param, since it's non-static --- src/server/sparkd/cmds/spartan/domain/Price.cc | 8 ++++---- src/server/sparkd/cmds/spartan/domain/Price.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/sparkd/cmds/spartan/domain/Price.cc b/src/server/sparkd/cmds/spartan/domain/Price.cc index 7886cb89f..438018b93 100644 --- a/src/server/sparkd/cmds/spartan/domain/Price.cc +++ b/src/server/sparkd/cmds/spartan/domain/Price.cc @@ -50,11 +50,11 @@ constexpr std::int8_t Price::exponent() { return -9; } constexpr std::int64_t Price::mantissa() const { return _mantissa; } -constexpr Price Price::abs(Price p) const { - if (p._mantissa >= 0) - return p; +constexpr Price Price::abs() const { + if (_mantissa >= 0) + return *this; else - return Price{-p._mantissa}; + return Price{-_mantissa}; } inline Price Price::square() const { diff --git a/src/server/sparkd/cmds/spartan/domain/Price.h b/src/server/sparkd/cmds/spartan/domain/Price.h index c96ea9eee..ad79cfc59 100644 --- a/src/server/sparkd/cmds/spartan/domain/Price.h +++ b/src/server/sparkd/cmds/spartan/domain/Price.h @@ -19,7 +19,7 @@ class Price { static constexpr Price zero(); static constexpr Price nan(); - constexpr Price abs(Price p) const; + constexpr Price abs() const; Price square() const; constexpr bool is_nan() const; constexpr bool is_better(Side s, Price p2) const; From 6b9b8ac40393338b3bafd9933932eac796411814 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 23 Feb 2021 15:28:27 -0600 Subject: [PATCH 022/100] Add ++/-- operators to Quantity --- .../sparkd/cmds/spartan/domain/Quantity.cc | 17 +++++++++++++++++ .../sparkd/cmds/spartan/domain/Quantity.h | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/src/server/sparkd/cmds/spartan/domain/Quantity.cc b/src/server/sparkd/cmds/spartan/domain/Quantity.cc index 9f27ee74f..c0a3a9ba2 100644 --- a/src/server/sparkd/cmds/spartan/domain/Quantity.cc +++ b/src/server/sparkd/cmds/spartan/domain/Quantity.cc @@ -75,6 +75,23 @@ QTY_INT32_BIN_REF_OP(*=) QTY_INT32_BIN_REF_OP(/=) QTY_INT32_BIN_REF_OP(%=) + +constexpr Quantity operator++(Quantity &qty, int) { + return Quantity(qty.value()++); +} +constexpr Quantity operator--(Quantity &qty, int) { + return Quantity(qty.value()--); +} + +inline Quantity &operator++(Quantity &qty) { + qty.value()++; + return qty; +} +inline Quantity &operator--(Quantity &qty) { + qty.value()--; + return qty; +} + #undef QTY_QTY_BIN_OP #undef QTY_QTY_BIN_REF_OP #undef QTY_INT32_BIN_OP diff --git a/src/server/sparkd/cmds/spartan/domain/Quantity.h b/src/server/sparkd/cmds/spartan/domain/Quantity.h index 0ad5e49cc..0cb1f3063 100644 --- a/src/server/sparkd/cmds/spartan/domain/Quantity.h +++ b/src/server/sparkd/cmds/spartan/domain/Quantity.h @@ -45,6 +45,11 @@ constexpr Quantity operator*(Quantity, Quantity); constexpr Quantity operator/(Quantity, Quantity); constexpr Quantity operator%(Quantity, Quantity); +constexpr Quantity operator++(Quantity &, int); +constexpr Quantity operator--(Quantity &, int); +Quantity &operator++(Quantity &); +Quantity &operator--(Quantity &); + Quantity &operator+=(Quantity &, Quantity); Quantity &operator-=(Quantity &, Quantity); Quantity &operator*=(Quantity &, Quantity); From 91925f9ec6ef78e8fd8915bd6aa74b070ded879a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 23 Feb 2021 15:06:40 -0600 Subject: [PATCH 023/100] style: Run clang format on a few files --- .../matcher/FifoMatcherContext.cpp | 31 ++++++++-------- .../matcher/FifoMergedSecurityMatcher.cpp | 33 ++++++++--------- .../matcher/FifoMergedSecurityMatcher.h | 5 ++- .../cmds/spartan/domain/book/book_utils.h | 36 +++++++++---------- 4 files changed, 55 insertions(+), 50 deletions(-) diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp index 6e14795ea..e60785e69 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp @@ -67,9 +67,7 @@ FifoMatcherContext::~FifoMatcherContext() {} // security accessors /////////////////////// bool FifoMatcherContext::add_security( - SecurityID sec_id, - const std::string &symbol, - const LegVec &legs) { + SecurityID sec_id, const std::string &symbol, const LegVec &legs) { auto curr = _me->matchers.find(sec_id); if (curr == _me->matchers.end()) { _me->symbols.insert(std::make_pair(sec_id, symbol)); @@ -150,14 +148,14 @@ FifoMergedSecurityMatcher *FifoMatcherContext::_get_matcher(SecurityID sec_id) { return m == _me->matchers.end() ? nullptr : m->second; } -const FifoMergedSecurityMatcher * -FifoMatcherContext::_get_matcheri(SecurityID sec_id) const { +const FifoMergedSecurityMatcher *FifoMatcherContext::_get_matcheri( + SecurityID sec_id) const { auto m = _me->matchers.find(sec_id); return m == _me->matchers.end() ? nullptr : m->second; } -FifoMergedSecurityMatcher * -FifoMatcherContext::_get_or_add_matcher(SecurityID sec_id) { +FifoMergedSecurityMatcher *FifoMatcherContext::_get_or_add_matcher( + SecurityID sec_id) { auto m = _me->matchers.find(sec_id); if (m == _me->matchers.end()) { auto *new_m = new FifoMergedSecurityMatcher( @@ -206,8 +204,8 @@ void FifoMatcherContext::on_order_change( /////////////////////// // diagnostic /////////////////////// -std::optional -FifoMatcherContext::has_same_orders(SecurityID sec, const Orders &orders) { +std::optional FifoMatcherContext::has_same_orders( + SecurityID sec, const Orders &orders) { return _get_matcher(sec)->matcher()->has_same_orders(orders); } @@ -256,7 +254,10 @@ void FifoMatcherContext::_reset( } } -void FifoMatcherContext::reset(SecurityID sec, std::vector orders, std::vector *effects) { +void FifoMatcherContext::reset( + SecurityID sec, + std::vector orders, + std::vector *effects) { _reset(sec, orders.begin(), orders.end(), effects); } @@ -290,11 +291,13 @@ void FifoMatcherContext::print_all_bbos(std::ostream &out) { void FifoMatcherContext::_ensure_sync_implied_candidates() { if (!_me->implied_candidates_dirty) return; - // For each security, just remove the existing implied matchers and generate them again. - // While this isn't the most efficient implementation (it could be optimized to add/remove - // implied matchers incrementally), it is the simplest. + // For each security, just remove the existing implied matchers and generate + // them again. While this isn't the most efficient implementation (it could + // be optimized to add/remove implied matchers incrementally), it is the + // simplest. for (auto p : _me->matchers) { - std::vector candidates = _me->implied_market_model.find_implied_markets(p.first); + std::vector candidates = + _me->implied_market_model.find_implied_markets(p.first); for (const auto &can : candidates) { auto *imatcher = p.second->add_implied_matcher(can); if (imatcher == nullptr) diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp index aaa060a1f..d4d1941ef 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp @@ -2,20 +2,21 @@ #include "FifoImpliedSecurityMatcher.h" #include "FifoSecurityMatcher.h" #include "FillDepot.h" +#include "back_testing/common/OrderModification.h" +#include "back_testing/common/order_utils.h" #include "common/MatcherOneof.h" #include "common/MatchingSession.h" +#include "domain/book/book_utils.h" #include "fill_factory.h" #include "lib/orderman/orderman_utils/PriceComp.h" -#include "back_testing/common/OrderModification.h" -#include "domain/book/book_utils.h" -#include "back_testing/common/order_utils.h" #include #include #include #include #include -#define _LOG(level, ...) LOG(OrderMan, level, "{} {}", _log_header(), fmt::format(__VA_ARGS__)) +#define _LOG(level, ...) \ + LOG(OrderMan, level, "{} {}", _log_header(), fmt::format(__VA_ARGS__)) #define DIAG(...) _LOG(Diag, __VA_ARGS__) #define INFO(...) _LOG(Info, __VA_ARGS__) #define WARN(...) _LOG(Info, __VA_ARGS__) @@ -57,17 +58,17 @@ struct LegMapComp { // should exhibit Log(n) lookups. Although technically lookups for such a // container are O(m)Log(n). If 'm' becomes large, a tree-based // implementation may become appropriate. -using ImpliedMatchers = boost::container::flat_map; +using ImpliedMatchers = boost::container:: + flat_map; struct FifoMergedSecurityMatcher::PImpl { PImpl(const FifoMergedSecurityMatcher::InitArgs &args) : security_id(args.security_id), ignore_ops_on_deleted_orders(args.ignore_ops_on_deleted_orders), - trace(args.trace), - implied_matching_status(true), + trace(args.trace), implied_matching_status(true), matcher(new FifoSecurityMatcher( - {args.security_id, 0, args.ignore_ops_on_deleted_orders, - nullptr, args.trace})), + {args.security_id, 0, args.ignore_ops_on_deleted_orders, nullptr, + args.trace})), implied_matchers() {} ~PImpl() { @@ -119,7 +120,8 @@ const FifoSecurityMatcher *FifoMergedSecurityMatcher::matcheri() const { return _me->matcher.get(); } -FifoImpliedSecurityMatcher * FifoMergedSecurityMatcher::add_implied_matcher(const LegMap & legs) { +FifoImpliedSecurityMatcher *FifoMergedSecurityMatcher::add_implied_matcher( + const LegMap &legs) { auto res = _me->implied_matchers.emplace(legs, nullptr); if (res.second) { res.first->second = new FifoImpliedSecurityMatcher(security_id()); @@ -282,8 +284,8 @@ ImpliedBookSide FifoMergedSecurityMatcher::implied_book(Side side) { auto &ib = std::get<0>(ib_tup); auto &index = std::get<1>(ib_tup); if (ib[index].price == curr.price) - curr.quantity = Quantity( - curr.quantity.value() + ib[index++].quantity.value()); + curr.quantity = + Quantity(curr.quantity.value() + ib[index++].quantity.value()); } rem_exhausted(); } @@ -369,12 +371,11 @@ Quantity FifoMergedSecurityMatcher::_fill( std::vector *effects, FillDepot &fills) { // - std::vector imatcher_vec; - for (auto& p : _me->implied_matchers) + std::vector imatcher_vec; + for (auto &p : _me->implied_matchers) imatcher_vec.push_back(p.second); auto oside = other_side(side); - MatchingSession match_session( - *_me->matcher, imatcher_vec, oside, price); + MatchingSession match_session(*_me->matcher, imatcher_vec, oside, price); auto match = match_session.get_next(); auto ord_desc = [&]() { return fmt_order(key, side, price, quantity); }; while (quantity.value() > 0 && diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.h b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.h index 3873cea73..137457371 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.h +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.h @@ -28,7 +28,10 @@ class FifoMergedSecurityMatcher { void implied_matching_status(bool value); bool implied_matching_status() const; void on_order_change( - const SmallOrderChange &, std::vector *, FillDepot &, AlgoEventID = no_algo_event()); + const SmallOrderChange &, + std::vector *, + FillDepot &, + AlgoEventID = no_algo_event()); FifoImpliedSecurityMatcher *add_implied_matcher(const LegMap &); FifoSecurityMatcher *matcher(); const FifoSecurityMatcher *matcheri() const; diff --git a/src/server/sparkd/cmds/spartan/domain/book/book_utils.h b/src/server/sparkd/cmds/spartan/domain/book/book_utils.h index 86cb87387..4d5fde3b7 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/book_utils.h +++ b/src/server/sparkd/cmds/spartan/domain/book/book_utils.h @@ -14,8 +14,8 @@ namespace bts::spartan::mdp3::book_utils { -inline std::ostream & -fmt_price_level(std::ostream &out, Price price, Quantity qty) { +inline std::ostream &fmt_price_level( + std::ostream &out, Price price, Quantity qty) { out << qty << " @ " << price; return out; } @@ -33,13 +33,11 @@ inline std::string fmt_price_level(Price price, Quantity qty) { return out.str(); } -inline std::string -fmt_price_level(const std::tuple &pl) { +inline std::string fmt_price_level(const std::tuple &pl) { return fmt_price_level(std::get<0>(pl), std::get<1>(pl)); } -inline std::string -fmt_price_level(Side side, Price price, Quantity qty) { +inline std::string fmt_price_level(Side side, Price price, Quantity qty) { std::stringstream out; fmt_price_level(out, side, price, qty); return out.str(); @@ -116,9 +114,9 @@ inline bool has_min_qty( if (qty.value() == 0) return true; bts_assert(qty.value() > 0); - while (first != last && - (limit_price.is_nan() || - (side == Side::Buy ? limit_price < first->price : limit_price > first->price))) { + while (first != last && (limit_price.is_nan() || + (side == Side::Buy ? limit_price < first->price + : limit_price > first->price))) { qty -= first->quantity; if (qty.value() <= first->quantity.value()) return true; @@ -223,7 +221,8 @@ inline bool is_populated(const TBook &book, uint16_t level) { */ template bool is_valid(const TBook &book, const BookMark &mark) { - return is_beyond_book(book, mark) || book[mark.level()].quantity > mark.offset(); + return is_beyond_book(book, mark) || + book[mark.level()].quantity > mark.offset(); } void to_small_book(const BookSide &book, SmallBook &book_out); @@ -257,8 +256,7 @@ BookMark get_mark(const TBook &book, Quantity qty) { * the third. */ template -inline BookSlice -get_slice(const TBook &book, Quantity start, Quantity stop) { +inline BookSlice get_slice(const TBook &book, Quantity start, Quantity stop) { // todo: optimize to avoid counting up to the first book mark twice. // The statr qty mark could be simply subtracted from the stop qty, // then only the difference need be counted, beginning from the start @@ -274,8 +272,8 @@ get_slice(const TBook &book, Quantity start, Quantity stop) { * @param book_out the book to which the slice is written. */ template -inline void -slice_book(const TBook &book, const BookSlice &slice, SmallBook &book_out) { +inline void slice_book( + const TBook &book, const BookSlice &slice, SmallBook &book_out) { bts_assert(is_valid(book, slice.start)); bts_assert(is_valid(book, slice.stop)); if (slice.start == slice.stop) @@ -286,7 +284,8 @@ slice_book(const TBook &book, const BookSlice &slice, SmallBook &book_out) { book_out.emplace_back( book[slice.start.level()].price, book[slice.start.level()].quantity - slice.start.offset()); - for (uint16_t i = 1; i < slice.stop.level() - 1 && is_populated(book, i); i++) + for (uint16_t i = 1; i < slice.stop.level() - 1 && is_populated(book, i); + i++) book_out.emplace_back(book[i].price, book[i].quantity); if (is_populated(book, slice.stop.level()) && book[slice.stop.level()].quantity > slice.stop.offset()) @@ -318,8 +317,7 @@ inline Price best_price(const BookSide &bk) { return bk[0].price; } * Get the best price in the book after the specified qty. */ template -inline Price -best_price_after_qty(Iter first, Iter last, Quantity qty) { +inline Price best_price_after_qty(Iter first, Iter last, Quantity qty) { while (first != last) { if (first->quantity.value() == 0) break; @@ -341,7 +339,7 @@ inline Price best_price_after_qty(const TBook &bk, Quantity qty) { } /** - * Count the total quantity in a book. + * Count the total quantity in a book. * * @tparam Iter the type of itearator used to iterate through the price levels. * @param first iterator pointing to the first element in the book. @@ -360,7 +358,7 @@ inline Quantity total_qty(Iter first, Iter last) { } /** - * Count the total quantity in a book. + * Count the total quantity in a book. * * @tparam Container the type of book (an iterable of price-levels). * @param first iterator pointing to the first element in the book. From ba53334a7c52e08070472dc1d0c8610b5124f2ea Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 22 Feb 2021 23:18:53 -0600 Subject: [PATCH 024/100] Introduce SyntheticBook class * Price levels are computed lazily * Once computed, a price level can be accessed in O(1) * Unit tests piggy back on rigorous existing unit tests in 'synthetic_book_computation' * Not integrated into the matcher, as that is non-trivial work, and the March 2021 roll is fast approaching --- src/lib/utils/MapUtils.cc | 28 +++ src/lib/utils/MapUtils.h | 13 ++ .../back_testing/algos/SniperModel.cpp | 18 +- .../feed_observers/SyntheticBookRecorder.cpp | 190 +++++++--------- .../feed_observers/SyntheticBookRecorder.h | 26 ++- .../sparkd/cmds/spartan/cmds/PolygonBooks.cpp | 37 +-- .../sparkd/cmds/spartan/domain/SidePrice.cc | 33 +++ .../sparkd/cmds/spartan/domain/SidePrice.cpp | 34 +++ .../sparkd/cmds/spartan/domain/SidePrice.h | 53 +++++ .../cmds/spartan/domain/book/MBPUpdate.cpp | 49 ++++ .../cmds/spartan/domain/book/MBPUpdate.h | 35 +++ .../spartan/domain/book/PriceLevelUpdate.h | 12 + .../cmds/spartan/domain/book/SyntheticBook.cc | 9 + .../spartan/domain/book/SyntheticBook.cpp | 111 +++++++++ .../cmds/spartan/domain/book/SyntheticBook.h | 71 ++++++ .../domain/book/SyntheticBookLevel.cpp | 50 +++++ .../spartan/domain/book/SyntheticBookLevel.h | 42 ++++ .../domain/book/SyntheticBook_Iterator.cpp | 211 ++++++++++++++++++ .../domain/book/SyntheticBook_Iterator.h | 68 ++++++ .../spartan/domain/book/SyntheticBook_Leg.cpp | 21 ++ .../spartan/domain/book/SyntheticBook_Leg.h | 33 +++ .../domain/book/SyntheticBook_LegCursor.cpp | 157 +++++++++++++ .../domain/book/SyntheticBook_LegCursor.h | 96 ++++++++ .../book/tests/synthetic_book_tests.cpp | 67 +++++- .../polygons/PolygonOpportunityFinder.cpp | 49 ++-- .../utils/sql/adapters/polygon_defs.cpp | 15 +- .../spartan/utils/sql/adapters/polygon_defs.h | 14 +- 27 files changed, 1343 insertions(+), 199 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/domain/SidePrice.cc create mode 100644 src/server/sparkd/cmds/spartan/domain/SidePrice.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/SidePrice.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/PriceLevelUpdate.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cc create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.h create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.h diff --git a/src/lib/utils/MapUtils.cc b/src/lib/utils/MapUtils.cc index 4b9cb35bb..f8bc50ee2 100644 --- a/src/lib/utils/MapUtils.cc +++ b/src/lib/utils/MapUtils.cc @@ -19,4 +19,32 @@ inline V *MapUtils::find_value(std::unordered_map &umap, K key) { return &(it->second); } +template +inline const V &MapUtils::assert_find_value(const std::unordered_map &umap, K key) { + auto it = umap.find(key); + bts_assert(it != umap.end()); + return it->second; +} + +template +inline V &MapUtils::assert_find_value(std::unordered_map &umap, K key) { + auto it = umap.find(key); + bts_assert(it != umap.end()); + return it->second; +} + +template +inline const V &MapUtils::assert_find_value(const boost::container::flat_map &umap, K key) { + auto it = umap.find(key); + bts_assert(it != umap.end()); + return it->second; +} + +template +inline V &MapUtils::assert_find_value(boost::container::flat_map &umap, K key) { + auto it = umap.find(key); + bts_assert(it != umap.end()); + return it->second; +} + } // namespace bts diff --git a/src/lib/utils/MapUtils.h b/src/lib/utils/MapUtils.h index 8ef5cfbae..5f47dbdef 100644 --- a/src/lib/utils/MapUtils.h +++ b/src/lib/utils/MapUtils.h @@ -1,4 +1,5 @@ #pragma once +#include #include namespace bts { @@ -9,6 +10,18 @@ struct MapUtils { template static V *find_value(std::unordered_map &, K); + + template + static const V &assert_find_value(const std::unordered_map &, K); + + template + static V &assert_find_value(std::unordered_map &, K); + + template + static const V &assert_find_value(const boost::container::flat_map &, K); + + template + static V &assert_find_value(boost::container::flat_map &, K); }; } // namespace bts diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp index 6e4f8e1d5..190044d7b 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp @@ -1,11 +1,11 @@ #include "SniperModel.h" +#include "domain/book/SyntheticBook.h" #include "back_testing/sim/ISim.h" #include "back_testing/sim/PandL.h" #include "back_testing/sim/sim_common.h" #include "domain/SecurityDefinition.h" #include "domain/polygons/polygon_utils.h" -#include "domain/book/book_utils.h" #include "back_testing/common/mdp3_utils.h" #include @@ -341,21 +341,17 @@ void SniperModel::eval(std::vector const &targets) { } bool SniperModel::within_safety_margin(Target const &t) const { - BookSide synth_book; - using LegInfo = std::tuple; - std::vector leg_mkts; + SyntheticBook synth_book; for (auto &leg : t.polygon.parts) { - auto &leg_mkt = leg_mkts.emplace_back(); - std::get<0>(leg_mkt) = Quantity{leg.ratio}; - std::get<1>(leg_mkt) = {}; auto leg_book_side = other_side(side_from_ratio(leg.ratio)); - std::get<2>(leg_mkt) = me->books[leg.sec_id].book.mbp_side(leg_book_side); + synth_book.add_leg(LegDefinition { + leg.sec_id, + other_side(side_from_ratio(leg.ratio)), + Quantity(leg.ratio) + }, &me->books[leg.sec_id].book.mbp_side(leg_book_side)); } - book_utils::compute_synthetic_book( - synth_book, leg_mkts, BookSide::max_depth()); - auto cumm_qty = 0ul; auto min_price = me->min_cumm_edge; diff --git a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp index 2be964f51..e4df9e1ee 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.cpp @@ -1,5 +1,7 @@ #include "SyntheticBookRecorder.h" +#include "domain/book/MBPUpdate.h" #include "domain/book/book_utils.h" +#include "lib/utils/MapUtils.h" #include "utils/sql/sql_utils.h" #include #include @@ -7,47 +9,30 @@ namespace bts::spartan::mdp3 { -using _LegDef = std::tuple; - -using SyntheticDefinitionMap = - std::unordered_map>; - -using ReverseLegMap = - std::unordered_map>; - -using BookMap = std:: - unordered_map>; +using SyntheticDefinitionMap = std::unordered_map; +using EventUpdate = std::unordered_map; +using SyntheticBookHistory = std::map; +using ReverseLegMap = std::unordered_map>; +using BookMap = std::unordered_map>; // leg sec id, event id (last change), leg qty, leg price mult, bids, asks -using LegBookVec = std::vector>; +using LegBookVec = + std::vector>; -SmallBook to_small_book(const BookSide &bk) { - SmallBook rv; - for (const auto &pl : bk) - rv.emplace_back(pl.price, pl.quantity); - return rv; -} - -ReverseLegMap -build_reverse_leg_map(const SyntheticDefinitionMap &synthetic_defs) { +ReverseLegMap build_reverse_leg_map( + const SyntheticDefinitionMap &synthetic_defs) { ReverseLegMap rlm; for (const auto &sd_p : synthetic_defs) { - for (auto leg_tup : sd_p.second) { - rlm.emplace(std::get<0>(leg_tup), std::unordered_set()) + for (auto leg_def : sd_p.second) { + rlm.emplace(leg_def.security_id, std::unordered_set()) .first->second.insert(sd_p.first); } } return rlm; } -const std::vector<_LegDef> & -get_legs(SecurityID synth_id, const SyntheticDefinitionMap &synth_defs) { +const LegVec &get_legs( + SecurityID synth_id, const SyntheticDefinitionMap &synth_defs) { auto it = synth_defs.find(synth_id); bts_assert(it != synth_defs.end()); return it->second; @@ -56,37 +41,21 @@ get_legs(SecurityID synth_id, const SyntheticDefinitionMap &synth_defs) { // updates book entries for securities in the source sequence, // then returns the set of affected polygons template -void update_books( - size_t event_id, - Iter first, - Iter last, - BookMap &books, - const SyntheticDefinitionMap &) { +void update_books(size_t event_id, Iter first, Iter last, BookMap &books) { while (first != last) { const SecuritySnapshot *s = *first; books.insert_or_assign( - s->security_id(), - std::make_tuple( - event_id, to_small_book(s->book_side(Side::Buy)), - to_small_book(s->book_side(Side::Sell)))); + s->security_id(), std::make_tuple(event_id, s->book())); first++; } } -const std::unordered_set * -synthetic_owners(SecurityID leg_id, const ReverseLegMap &reverse_legs) { - auto it = reverse_legs.find(leg_id); - if (it == reverse_legs.end()) - return nullptr; - return &it->second; -} - template -std::unordered_set -synthetic_owners(TIter first, TIter last, const ReverseLegMap &reverse_legs) { +std::unordered_set synthetic_owners( + TIter first, TIter last, const ReverseLegMap &reverse_legs) { std::unordered_set all_owners; while (first != last) { - const auto *leg_owners = synthetic_owners(*first, reverse_legs); + const auto *leg_owners = MapUtils::find_value(reverse_legs, *first); if (leg_owners != nullptr) { for (auto id : *leg_owners) all_owners.insert(id); @@ -96,33 +65,15 @@ synthetic_owners(TIter first, TIter last, const ReverseLegMap &reverse_legs) { return all_owners; } -// returns tuple of bids, asks -std::tuple -get_book_tuple(SecurityID id, const BookMap &books) { - auto bk_it = books.find(id); - if (bk_it == books.end()) - return {0, SmallBook(), SmallBook()}; - return bk_it->second; -} - -LegBookVec -get_leg_books(const std::vector<_LegDef> &leg_defs, const BookMap &books) { - LegBookVec rv; - for (auto [lsid, lqty] : leg_defs) { - auto [eid, bids, asks] = get_book_tuple(lsid, books); - rv.emplace_back(eid, lsid, lqty, Price{}, bids, asks); - } - return rv; -} - SyntheticMBPUpdate::SyntheticMBPUpdate() {} + SyntheticMBPUpdate::SyntheticMBPUpdate( SecurityID synthetic_id, std::map leg_book_eids, - SmallBook bids, - SmallBook asks) - : synthetic_id(synthetic_id), leg_book_eids(leg_book_eids), bids(bids), - asks(asks) {} + SyntheticBook bids, + SyntheticBook asks) + : synthetic_id(synthetic_id), leg_book_eids(leg_book_eids), + bids(std::move(bids)), asks(std::move(asks)) {} struct SyntheticBookRecorder::PImpl { PImpl(SyntheticDefinitionMap synthetic_defs) @@ -137,14 +88,21 @@ struct SyntheticBookRecorder::PImpl { const BookMap &books() const { return _books; } BookMap &mbooks() { return _books; } const ReverseLegMap &reverse_legs() const { return _reverse_legs; } - const std::map> & + const std::map> & synthetic_book_history() const { return _synthetic_book_history; } - std::map> & + std::map> & msynthetic_book_history() { return _synthetic_book_history; } + const std::unordered_map> & + synthetic_books() const { + return _synthetic_books; + } + std::unordered_map> &synthetic_books() { + return _synthetic_books; + } private: SyntheticDefinitionMap _synthetic_defs; @@ -154,7 +112,9 @@ struct SyntheticBookRecorder::PImpl { // so they can be referenced to build the complete synthetic book // whenever a particular leg's book changes for any synthetic BookMap _books; - std::map> _synthetic_book_history; + std::map> + _synthetic_book_history; + std::unordered_map> _synthetic_books; }; SyntheticBookRecorder::SyntheticBookRecorder( @@ -171,60 +131,60 @@ void on_securities_changed( const SyntheticDefinitionMap &synth_defs, const ReverseLegMap &reverse_legs, BookMap &books, - std::map> &synth_book_history) { - update_books(event_id, first, last, books, synth_defs); - // Why won't this compile?! - // auto affected_sec_ids = - // ranges::views::transform(first, last, [](const SecuritySnapshot* s) { - // return s->security_id(); }); - // oh well, just map the sec ids to a vector for now. - std::vector affected_sec_ids; + std::unordered_map> &synth_books, + SyntheticBookHistory &synth_book_history) { + update_books(event_id, first, last, books); + std::map leg_book_eid_map; + auto &event_upd = + synth_book_history.emplace(event_id, EventUpdate()).first->second; + // using EventUpdate = std::unordered_map; while (first != last) { - affected_sec_ids.emplace_back((*first)->security_id()); + auto sec_id = (*first)->security_id(); + auto *affected_synths = MapUtils::find_value(reverse_legs, sec_id); + if (affected_synths == nullptr) + continue; + const auto &bk = (*first)->book(); + for (auto synth_id : *affected_synths) { + Sided &sb = + MapUtils::assert_find_value(synth_books, synth_id); + // update bids + auto bid_upd = MBPUpdate::deduce( + Side::Buy, sb.bid.find_leg(sec_id).book(), bk[Side::Buy]); + sb.bid.on_update(sec_id, bid_upd); + // update asks + auto ask_upd = MBPUpdate::deduce( + Side::Sell, sb.ask.find_leg(sec_id).book(), bk[Side::Sell]); + sb.ask.on_update(sec_id, ask_upd); + event_upd[synth_id].leg_book_eids[sec_id] = event_id; + } first++; } - auto affected_synth_ids = synthetic_owners( - affected_sec_ids.begin(), affected_sec_ids.end(), reverse_legs); - auto &event_bks = - synth_book_history.emplace(event_id, std::vector()) - .first->second; - for (auto id : affected_synth_ids) { - const auto &legs = get_legs(id, synth_defs); - auto leg_books = get_leg_books(legs, books); - SmallBook bids, asks; - std::vector> - leg_books_no_eid; - std::map leg_book_eid_map; - for (auto [eid, lsid, lqty, lprice, lbids, lasks] : leg_books) { - // seems like there should be a clever way to remove 1 element from a - // tuple. oh well, for now, this will have to do (drop element 0: event - // id). - leg_books_no_eid.emplace_back(lqty, lprice, lbids, lasks); - leg_book_eid_map.emplace(lsid, eid); + for (auto &[synth_id, synth_upd] : event_upd) { + const auto &legs = MapUtils::assert_find_value(synth_defs, synth_id); + for (auto &l : legs) { + auto it = synth_upd.leg_book_eids.find(l.security_id); + if (it == synth_upd.leg_book_eids.end()) + it->second = std::get<0>(books[l.security_id]); } - book_utils::compute_synthetic_books( - bids, asks, leg_books_no_eid, BookSide::max_depth()); - // todo: replace 2nd 'id' param with the responsible leg's id - // (first, need to decide how to handle events where more than one - // leg is responsible for the synth mbp update) - event_bks.emplace_back(id, leg_book_eid_map, bids, asks); } } void SyntheticBookRecorder::on_recovery_complete(const InitialSnapshot &snap) { on_securities_changed( 0, snap.begin(), snap.end(), _me->synthetic_defs(), _me->reverse_legs(), - _me->mbooks(), _me->msynthetic_book_history()); + _me->mbooks(), _me->synthetic_books(), _me->msynthetic_book_history()); } void SyntheticBookRecorder::on_event_end(const FeedEvent &ev) { on_securities_changed( - ev.event_id, ev.begin(), - ev.end(), _me->synthetic_defs(), _me->reverse_legs(), - _me->mbooks(), _me->msynthetic_book_history()); + ev.event_id, ev.begin(), ev.end(), _me->synthetic_defs(), + _me->reverse_legs(), _me->mbooks(), _me->synthetic_books(), + _me->msynthetic_book_history()); } -const std::map> & + +const std::map> & SyntheticBookRecorder::result() const { return _me->synthetic_book_history(); } + } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.h b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.h index 499b31151..8731820cc 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.h +++ b/src/server/sparkd/cmds/spartan/back_testing/feed_observers/SyntheticBookRecorder.h @@ -1,23 +1,26 @@ #pragma once -#include "back_testing/matcher/FifoMatcherContext.h" -#include "domain/SecuritySnapshot.h" #include "back_testing/common/mdp3_common.h" -#include "back_testing/feed_observers/FeedObserver.h" #include "back_testing/common/mdp3_utils.h" +#include "back_testing/feed_observers/FeedObserver.h" #include "back_testing/feed_observers/IcebergFinder.h" +#include "back_testing/matcher/FifoMatcherContext.h" +#include "domain/LegDefinition.h" +#include "domain/SecuritySnapshot.h" +#include "domain/book/SyntheticBook.h" #include #include #include #include namespace bts::spartan::mdp3 { + struct SyntheticMBPUpdate { SyntheticMBPUpdate(); SyntheticMBPUpdate( SecurityID synthetic_id, std::map leg_book_eids, - SmallBook bids, - SmallBook asks); + SyntheticBook bids, + SyntheticBook asks); SecurityID synthetic_id; // Note: a map is used (instead of other containers like @@ -25,22 +28,21 @@ struct SyntheticMBPUpdate { // and to reduce the risk of misuse that might accompany using a vector (like // accidentally adding a duplicate entry for one of the legs) std::map leg_book_eids; - SmallBook bids; - SmallBook asks; + SyntheticBook bids; + SyntheticBook asks; }; struct SyntheticBookRecorder : FeedObserver { - SyntheticBookRecorder(std::unordered_map< - SecurityID, - std::vector>> - synthetic_def); + SyntheticBookRecorder(std::unordered_map synthetic_def); ~SyntheticBookRecorder(); void on_recovery_complete(InitialSnapshot const &snap) override; void on_event_end(FeedEvent const &ev) override; - const std::map> &result() const; + const std::map> & + result() const; private: struct PImpl; std::unique_ptr _me; }; + } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/cmds/PolygonBooks.cpp b/src/server/sparkd/cmds/spartan/cmds/PolygonBooks.cpp index 33a2f61fd..e90ad0257 100644 --- a/src/server/sparkd/cmds/spartan/cmds/PolygonBooks.cpp +++ b/src/server/sparkd/cmds/spartan/cmds/PolygonBooks.cpp @@ -1,8 +1,9 @@ #include "PolygonBooks.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "domain/book/Book.h" -#include "back_testing/feed_observers/SyntheticBookRecorder.h" #include "back_testing/common/mdp3_utils.h" +#include "back_testing/feed_observers/SyntheticBookRecorder.h" +#include "domain/book/Book.h" +#include "domain/book/SyntheticBook.h" +#include "lib/orderman/orderman_utils/Formatter.h" #include "utils/FileUtils.h" #include "utils/sql/adapters/polygon_defs.h" #include "utils/sql/sql_utils.h" @@ -25,10 +26,10 @@ struct PolygonBooks::Args { std::string out_csv; }; -PolygonBooks::PolygonBooks() : - CLI::App( - "Generate a csv file of book updates for polygons", "polygon-books"), - _args(new PolygonBooks::Args()) { +PolygonBooks::PolygonBooks() + : CLI::App( + "Generate a csv file of book updates for polygons", "polygon-books"), + _args(new PolygonBooks::Args()) { add_option("pcap,--pcap", _args->pcap)->required(); add_option("data-base,--db,--data-base", _args->db)->required(); add_option("security-ids,--security-ids", _args->security_ids)->required(); @@ -53,18 +54,19 @@ PolygonBooks::PolygonBooks() : INFO( "generating polygon books for pids: {}", orderman::Formatter::fmt_values(ids)); - mdp3::SyntheticBookRecorder sbr( - spartan::sql::adapters::polygon_defs::read_sql( - _args->db.c_str(), ids)); + auto synths = spartan::sql::adapters::polygon_defs::read_sql(_args->db.c_str(), ids); + mdp3::SyntheticBookRecorder sbr(synths); mdp3::observe_channel(_args->pcap, sbr); // don't prepend a comma before calling 'append_book' (it does that // internally) auto append_book = [](std::ofstream &out, - const mdp3::SmallBook &bk) -> std::ofstream & { + const SyntheticBook &bk) -> std::ofstream & { uint32_t i = 0; - bts_assert(bk.size() <= 10); - for (; i < bk.size(); i++) - out << "," << bk[i].price << "," << bk[i].quantity.value(); + for (auto it = bk.begin(); + it != bk.end() && i < mdp3::BookSide::max_depth(); i++) { + out << "," << it->price << "," << it->quantity.value(); + it++; + } while (i++ < mdp3::BookSide::max_depth()) out << ",NaN,0"; return out; @@ -104,10 +106,11 @@ PolygonBooks::PolygonBooks() : }; add_bk_cols("bid"); add_bk_cols("ask"); - for (const auto &p : sbr.result()) { - for (const auto &upd : p.second) { + + for (const auto &[eid, synth_rows] : sbr.result()) { + for (const auto &[synth_id, upd] : synth_rows) { ofs << std::endl; - ofs << p.first << "," << upd.synthetic_id.value(); + ofs << eid << "," << synth_id; append_leg_book_eids(ofs, upd); append_book(ofs, upd.bids); append_book(ofs, upd.asks); diff --git a/src/server/sparkd/cmds/spartan/domain/SidePrice.cc b/src/server/sparkd/cmds/spartan/domain/SidePrice.cc new file mode 100644 index 000000000..91c816be4 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/SidePrice.cc @@ -0,0 +1,33 @@ +#include "SidePrice.h" + +namespace bts::spartan { + +#define BINARY_OP(op) \ + inline SidePrice operator op( \ + const SidePrice &lhs, const SidePrice &rhs) { \ + return SidePrice(lhs.value() op rhs.value()); \ + } +BINARY_OP(+) +BINARY_OP(-) +BINARY_OP(/) +BINARY_OP(*) +#undef BINARY_OP + +#define BINARY_REF_OP(op) \ + inline SidePrice &operator op( \ + SidePrice &lhs, const SidePrice &rhs) { \ + lhs.value() op rhs.value(); \ + return lhs; \ + } + +BINARY_REF_OP(+=) +BINARY_REF_OP(-=) +BINARY_REF_OP(/=) +BINARY_REF_OP(*=) +#undef BINARY_REF_OP + +inline SidePrice operator-(const SidePrice &qty) { + return SidePrice(mdp3::Price(-qty.value())); +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/SidePrice.cpp b/src/server/sparkd/cmds/spartan/domain/SidePrice.cpp new file mode 100644 index 000000000..185010083 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/SidePrice.cpp @@ -0,0 +1,34 @@ +#include "SidePrice.h" + +namespace bts::spartan { + +SidePrice::SidePrice() : _value() {} +SidePrice::SidePrice(mdp3::Price value) : _value(value) {} +SidePrice::SidePrice(mdp3::Price value, Side side) + : _value(side == Side::Buy ? value : -value) {} + +constexpr Side SidePrice::side() const { + return _value < 0 ? Side::Sell : Side::Buy; +} + +mdp3::Price SidePrice::norm() const { return _value.abs(); } +mdp3::Price SidePrice::value() const { return _value; } +mdp3::Price &SidePrice::value() { return _value; } + +template <> +mdp3::Price SidePrice::in_terms_of(mdp3::Price value) { + return value; +} + +template <> +mdp3::Price SidePrice::in_terms_of(mdp3::Price value) { + return -value; +} + +template <> +mdp3::Price SidePrice::in_terms_of(mdp3::Price); + +template <> +mdp3::Price SidePrice::in_terms_of(mdp3::Price); + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/SidePrice.h b/src/server/sparkd/cmds/spartan/domain/SidePrice.h new file mode 100644 index 000000000..6e6e23f33 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/SidePrice.h @@ -0,0 +1,53 @@ +#pragma once +#include "Price.h" +#include "Side.h" + +namespace bts::spartan { + +/** + * A numeric abstraction that treats side as a function of numeric sign + */ +struct SidePrice { + SidePrice(); + SidePrice(mdp3::Price); + SidePrice(mdp3::Price, Side); + /** + * Infers the side from the sign of the underlying value + * + * @returns Sell if the value is negative, otherwise Buy + */ + constexpr Side side() const; + /** + * Gets the [signed] value + */ + mdp3::Price value() const; + /** + * Gets the [signed] value + */ + mdp3::Price &value(); + /** + * Gets the [unsigned] norm of the value + */ + mdp3::Price norm() const; + + template + static mdp3::Price in_terms_of(mdp3::Price); + private: + mdp3::Price _value; +}; + +SidePrice operator+(const SidePrice &, const SidePrice &); +SidePrice operator-(const SidePrice &, const SidePrice &); +SidePrice operator*(const SidePrice &, const SidePrice &); +SidePrice operator/(const SidePrice &, const SidePrice &); + +SidePrice operator-(const SidePrice &); + +SidePrice& operator+=(SidePrice &, const SidePrice &); +SidePrice& operator-=(SidePrice &, const SidePrice &); +SidePrice& operator*=(SidePrice &, const SidePrice &); +SidePrice& operator/=(SidePrice &, const SidePrice &); + +} // namespace bts::spartan + +#include "SidePrice.cc" diff --git a/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.cpp b/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.cpp new file mode 100644 index 000000000..0e61005b9 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.cpp @@ -0,0 +1,49 @@ +#include "MBPUpdate.h" +#include "domain/order/Order.h" + +namespace bts::spartan { + +MBPUpdate MBPUpdate::deduce( + Side side, const mdp3::BookSide &old_book, const mdp3::BookSide &new_book) { + return MBPUpdate{side, &old_book, &new_book}; +} + +MBPUpdate MBPUpdate::deduce( + Side side, + mdp3::Price old_price, + mdp3::Quantity old_quantity, + mdp3::Price new_price, + mdp3::Quantity new_quantity) { + MBPUpdate upd; + if (old_price == new_price) { + auto &pl_upd = upd.level_updates.emplace_back(); + pl_upd.price = new_price; + pl_upd.qty_delta = new_quantity - old_quantity; + } else if (old_price.is_better(side, new_price)) { + // The price-level updates are sorted by price (best price first). + auto &old_price_upd = upd.level_updates.emplace_back(); + old_price_upd.price = old_price; + old_price_upd.qty_delta = -old_quantity; + auto &new_price_upd = upd.level_updates.emplace_back(); + new_price_upd.price = new_price; + new_price_upd.qty_delta = new_quantity; + } else { + // The price-level updates are sorted by price (best price first). + auto &new_price_upd = upd.level_updates.emplace_back(); + new_price_upd.price = new_price; + new_price_upd.qty_delta = new_quantity; + auto &old_price_upd = upd.level_updates.emplace_back(); + old_price_upd.price = old_price; + old_price_upd.qty_delta = -old_quantity; + } + return upd; +} + +MBPUpdate MBPUpdate::deduce( + const mdp3::Order &old_order, const mdp3::Order &new_order) { + return deduce( + new_order.side, old_order.price, old_order.quantity, new_order.price, + new_order.quantity); +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.h b/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.h new file mode 100644 index 000000000..0d662b294 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/MBPUpdate.h @@ -0,0 +1,35 @@ +#pragma once +#include "Book.h" +#include "PriceLevelUpdate.h" +#include "domain/Side.h" +#include + +namespace bts::spartan { + +namespace mdp3 { +struct Order; +} + +struct MBPUpdate { + Side side; + const mdp3::BookSide *old_book = nullptr; + const mdp3::BookSide *new_book = nullptr; + std::vector level_updates{}; + + static MBPUpdate deduce( + Side side, + const mdp3::BookSide &old_book, + const mdp3::BookSide &new_book); + + static MBPUpdate deduce( + Side side, + mdp3::Price old_price, + mdp3::Quantity old_quantity, + mdp3::Price new_price, + mdp3::Quantity new_quantity); + + static MBPUpdate deduce( + const mdp3::Order &old_order, const mdp3::Order &new_order); +}; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/PriceLevelUpdate.h b/src/server/sparkd/cmds/spartan/domain/book/PriceLevelUpdate.h new file mode 100644 index 000000000..da70bfd98 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/PriceLevelUpdate.h @@ -0,0 +1,12 @@ +#pragma once +#include "../Price.h" +#include "../Quantity.h" + +namespace bts::spartan { + +struct PriceLevelUpdate { + mdp3::Price price; + mdp3::Quantity qty_delta; +}; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cc b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cc new file mode 100644 index 000000000..9f31d3ec8 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cc @@ -0,0 +1,9 @@ +#include "SyntheticBook.h" + +namespace bts::spartan { + +constexpr std::size_t SyntheticBook::size() const noexcept { + return SyntheticBook_Iterator::NUM_LEVELS; +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cpp b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cpp new file mode 100644 index 000000000..2e0eb6fa6 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.cpp @@ -0,0 +1,111 @@ +#include "SyntheticBook.h" +#include "BookMark.h" +#include "MBPUpdate.h" +#include "SyntheticBook_LegCursor.h" +#include "book_utils.h" +#include "lib/utils/MapUtils.h" +#include +#include +#include + +namespace bts::spartan { + +using _Iterators = boost::container::small_vector; + +struct SyntheticBook::PImpl { + SyntheticBook_LegMap legs{}; + // All iterators (reguardless of when they are created) share the same + // 'known_levels' instance. Each level need only be computed once (lazily, + // by whichever iterator advances to a particular level first), then it is + // added to 'known_levels' where all other iterators can access it, thus + // avoiding duplicate work. + // + // Another benefit of using a shared 'known_levels' + // cache is that the SyntheticBook (this class's owner) can invalidate the + // known_levels for every iterator at once. If the mbp changes, simply clear + // all price levels w/ a price that is equal to or worse than the one that + // changed. For example, there is no need to recompute the top of the book + // because a price level behind it changed. + SyntheticBookLevelsPtr known_levels = + std::make_shared(); +}; + +SyntheticBook::SyntheticBook() : _me(new SyntheticBook::PImpl()) {} + +SyntheticBook::SyntheticBook(const SyntheticBook &other) + : _me(new SyntheticBook::PImpl{ + other._me->legs, SyntheticBookLevelsPtr(new SyntheticBookLevels( + *other._me->known_levels))}) {} + +SyntheticBook::SyntheticBook(SyntheticBook &&other) + : _me(new SyntheticBook::PImpl()) { + _me->legs = std::move(other._me->legs); + _me->known_levels = std::move(other._me->known_levels); +} + +SyntheticBook::~SyntheticBook() {} + +SyntheticBook_Iterator SyntheticBook::begin() const { + SyntheticBook_LegCursors cursors; + for (const auto &p : _me->legs) + cursors.emplace_back(&p.second); + SyntheticBook_Iterator iter(cursors, _me->known_levels); + return iter; +} + +const SyntheticBook_LegMap &SyntheticBook::legs() const { return _me->legs; } + +const SyntheticBook_Leg &SyntheticBook::find_leg(SecurityID sec_id) const { + return MapUtils::assert_find_value(_me->legs, sec_id); +} + +SyntheticBook_Iterator SyntheticBook::end() const { + return SyntheticBook_Iterator::end(); +} + +SyntheticBook_Iterator SyntheticBook::quantity_end() { + // todo + return end(); +} + +mdp3::Quantity SyntheticBook::volume() const { + mdp3::Quantity vol(0); + for (auto it = begin(); it != end() && it->quantity != 0; it++) + vol += it->quantity; + return vol; +} + +mdp3::BookLevel &SyntheticBook::operator[](std::size_t index) { + auto iter = begin(); + return *(iter + index); +} + +void SyntheticBook::add_leg(LegDefinition leg, const mdp3::BookSide *book) { + _me->legs.insert_or_assign(leg.security_id, SyntheticBook_Leg(leg, book)); +} + +void SyntheticBook::on_update(SecurityID sec, const MBPUpdate &upd) { + for (const auto &lev : upd.level_updates) + on_update(sec, lev); +} + +void SyntheticBook::on_update(SecurityID sec, const PriceLevelUpdate &upd) { + if (_me->known_levels->empty()) + return; + auto &leg = MapUtils::assert_find_value(_me->legs, sec); + auto leg_side = leg.def().side; + const auto &leg_bk = leg.book(); + for (auto it = _me->known_levels->begin(); it != _me->known_levels->end(); + it++) { + auto leg_it = it->leg_positions().find(sec); + bts_assert(leg_it != it->leg_positions().end()); + const auto &lev = leg_bk[leg_it->second.level()]; + if (lev.price.is_better_or_equal(leg_side, upd.price)) { + // invalidate known_levels from this level to the end + _me->known_levels->erase(it, _me->known_levels->end()); + break; + } + } +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.h b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.h new file mode 100644 index 000000000..c09e76c11 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook.h @@ -0,0 +1,71 @@ +#pragma once +#include "../LegDefinition.h" +#include "../Quantity.h" +#include "../SecurityID.h" +#include "Book.h" +#include "SyntheticBook_Iterator.h" +#include "SyntheticBook_Leg.h" +#include "SyntheticBook_LegCursor.h" +#include "book_utils.h" +#include +#include + +namespace bts::spartan { + +struct MBPUpdate; +struct PriceLevelUpdate; + +class SyntheticBook { + public: + SyntheticBook(); + SyntheticBook(const SyntheticBook &); + SyntheticBook(SyntheticBook &&); + ~SyntheticBook(); + + /** + * Gets an iterator pointing to the first index/price level + */ + SyntheticBook_Iterator begin() const; + /** + * Gets an iterator pointing to the last index. Note that this is not + * necessarily the first price level with zero quantity. + */ + SyntheticBook_Iterator end() const; + /** + * Gets an iterator pointing to the first price level with zero quantity. + * This will force all price levels to be computed (such compuatations are + * otherwise lazy). + */ + SyntheticBook_Iterator quantity_end(); + /** + * Adds a leg to the synthetic book + */ + void add_leg(LegDefinition, const mdp3::BookSide *); + /** + * Gets the leg map (keyed by security id) + */ + const SyntheticBook_LegMap &legs() const; + const SyntheticBook_Leg &find_leg(SecurityID) const; + /** + * Invalidates synthetic price levels that would be impacted by particular + * mbp changes + */ + void on_update(SecurityID, const MBPUpdate &upd); + void on_update(SecurityID, const PriceLevelUpdate &upd); + /** + * Gets the total volume in the synthetic book + */ + mdp3::Quantity volume() const; + + constexpr std::size_t size() const noexcept; + + mdp3::BookLevel &operator[](std::size_t); + + private: + struct PImpl; + std::unique_ptr _me; +}; + +} // namespace bts::spartan + +#include "SyntheticBook.cc" diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.cpp b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.cpp new file mode 100644 index 000000000..678bebd49 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.cpp @@ -0,0 +1,50 @@ +#include "SyntheticBookLevel.h" +#include "../Price.h" +#include "../Quantity.h" +#include "BookLevel.h" +#include "BookMark.h" + +namespace bts::spartan { + +struct SyntheticBookLevel::PImpl { + mdp3::BookLevel level{mdp3::Price::nan()}; + SyntheticBookLevel::LegPositions leg_positions{}; +}; + +SyntheticBookLevel::SyntheticBookLevel() + : _me(new SyntheticBookLevel::PImpl()) {} + +SyntheticBookLevel::SyntheticBookLevel(SyntheticBookLevel &&other) noexcept + : _me(std::move(other._me)) {} + +SyntheticBookLevel::SyntheticBookLevel(const SyntheticBookLevel &other) + : _me(new SyntheticBookLevel::PImpl{ + other._me->level, other._me->leg_positions}) {} + +SyntheticBookLevel::~SyntheticBookLevel() {} + +const mdp3::BookLevel &SyntheticBookLevel::level() const { return _me->level; } + +mdp3::BookLevel &SyntheticBookLevel::level() { return _me->level; } + +const SyntheticBookLevel::LegPositions & +SyntheticBookLevel::leg_positions() const { + return _me->leg_positions; +} + +SyntheticBookLevel::LegPositions &SyntheticBookLevel::leg_positions() { + return _me->leg_positions; +} + +SyntheticBookLevel& SyntheticBookLevel::operator=(const SyntheticBookLevel &other) { + _me->level = other._me->level; + _me->leg_positions = other._me->leg_positions; + return *this; +} + +SyntheticBookLevel& SyntheticBookLevel::operator=(SyntheticBookLevel &&other) { + _me = std::move(other._me); + return *this; +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.h b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.h new file mode 100644 index 000000000..09e5e4e38 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBookLevel.h @@ -0,0 +1,42 @@ +#pragma once +#include "../SecurityID.h" +#include +#include +#include +#include + +namespace bts::spartan { + +namespace mdp3 { +class BookLevel; +} + +class BookMark; + +class SyntheticBookLevel { + public: + SyntheticBookLevel(); + SyntheticBookLevel(SyntheticBookLevel &&) noexcept; + SyntheticBookLevel(const SyntheticBookLevel &); + ~SyntheticBookLevel(); + + using LegPositions = boost::container::flat_map; + + const mdp3::BookLevel &level() const; + mdp3::BookLevel &level(); + + const LegPositions &leg_positions() const; + LegPositions &leg_positions(); + + SyntheticBookLevel &operator=(const SyntheticBookLevel &); + SyntheticBookLevel &operator=(SyntheticBookLevel &&); + + private: + struct PImpl; + std::unique_ptr _me; +}; + +using SyntheticBookLevels = std::vector; +using SyntheticBookLevelsPtr = std::shared_ptr; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.cpp b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.cpp new file mode 100644 index 000000000..0d06c8e1a --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.cpp @@ -0,0 +1,211 @@ +#include "SyntheticBook_Iterator.h" +#include "../SidePrice.h" +#include "Book.h" +#include "BookLevel.h" +#include "BookMark.h" +#include "book_utils.h" +#include +#include + +namespace bts::spartan { + +using namespace bts::spartan::mdp3; + +using _Cursors = boost::container::small_vector; + +// struct _PriceLevel { +// _PriceLevel() : synth_level({mdp3::Price::nan()}), leg_cursors() {} + +// _PriceLevel(mdp3::BookLevel synth_level, _Cursors leg_cursors) +// : synth_level( +// {synth_level.price, synth_level.quantity, +// synth_level.n_orders}), +// leg_cursors(leg_cursors) {} + +// _PriceLevel(const _PriceLevel &other) +// : synth_level( +// {other.synth_level.price, other.synth_level.quantity, +// other.synth_level.n_orders}), +// leg_cursors(other.leg_cursors) {} + +// mdp3::BookLevel synth_level; +// _Cursors leg_cursors; +// }; + +static mdp3::Quantity get_limiting_qty(SyntheticBook_LegCursors legs) { + if (legs.empty()) + return Quantity(0); + mdp3::Quantity limiting_qty(std::numeric_limits::max()); + for (auto &l : legs) { + auto lev = l.curr_level(); + if (lev.quantity < limiting_qty) + limiting_qty = lev.quantity; + } + return limiting_qty; +} + +static SyntheticBookLevel advance(SyntheticBook_LegCursors &legs) { + SyntheticBookLevel curr_level; + if (legs.empty()) + return curr_level; + mdp3::Quantity limiting_qty = get_limiting_qty(legs); + curr_level.level().quantity = limiting_qty; + if (limiting_qty == 0) { + curr_level.level().price = mdp3::Price::nan(); + } else { + curr_level.level().price = mdp3::Price::zero(); + // The current price level is the sum of each leg's unit cost (i.e., + // marginal cost * leg qty for each leg). + for (auto &l : legs) { + curr_level.level().price += + SidePrice(l.compute_next(Quantity(1), true), l.leg()->def().side) + .value(); + if (curr_level.level().quantity > 1) + l.compute_next(curr_level.level().quantity - 1, true); + } + } + return curr_level; +} + +struct SyntheticBook_Iterator::PImpl { + // Allow this many increments before forcing the levels to be calculated + // (levels are otherwise computed lazily, when the deref op is called) + const std::uint16_t level_buffer_size = 10; + + PImpl(SyntheticBook_LegCursors legs, SyntheticBookLevelsPtr known_levels) + : legs(legs), known_levels(known_levels) {} + + PImpl(const PImpl &other) + : legs(other.legs), known_levels(other.known_levels) {} + + mdp3::BookLevel &curr_level() { + ensure_curr_level(); + return (known_levels->begin() + cursor)->level(); + } + + bool is_over_extended() const { + return cursor >= (legs.size() + level_buffer_size); + } + + void increment_cursor(std::int32_t value) { + cursor += value; + if (is_over_extended()) + ensure_curr_level(); + } + + SyntheticBook_LegCursors legs; + SyntheticBookLevelsPtr known_levels; + std::uint16_t cursor = 0; + + private: + void ensure_curr_level() { + while (known_levels->size() <= cursor) { + // auto old_legs = legs; + // known_levels->emplace_back(advance(legs), old_legs); + known_levels->emplace_back(advance(legs)); + } + } +}; + +SyntheticBook_Iterator SyntheticBook_Iterator::end() { + return SyntheticBook_Iterator( + SyntheticBookLevelsPtr(new SyntheticBookLevels())); +} + +SyntheticBook_Iterator::SyntheticBook_Iterator( + SyntheticBookLevelsPtr known_levels) + : _me(new SyntheticBook_Iterator::PImpl( + SyntheticBook_LegCursors(), known_levels)) { + _me->cursor = NUM_LEVELS; +} + +SyntheticBook_Iterator::SyntheticBook_Iterator( + SyntheticBook_LegCursors legs, SyntheticBookLevelsPtr known_levels) + : _me(new SyntheticBook_Iterator::PImpl(legs, known_levels)) {} + +SyntheticBook_Iterator::SyntheticBook_Iterator( + const SyntheticBook_Iterator &other) + : _me(new SyntheticBook_Iterator::PImpl(*other._me)) {} + +SyntheticBook_Iterator::~SyntheticBook_Iterator() {} + +SyntheticBook_Iterator &SyntheticBook_Iterator::operator=( + const SyntheticBook_Iterator &other) { + _me->cursor = other._me->cursor; + _me->known_levels = other._me->known_levels; + return *this; +} + +SyntheticBook_Iterator::const_reference +SyntheticBook_Iterator::operator*() const { + return _me->curr_level(); +} + +SyntheticBook_Iterator::reference SyntheticBook_Iterator::operator*() { + return _me->curr_level(); +} + +SyntheticBook_Iterator::const_pointer +SyntheticBook_Iterator::operator->() const { + return &_me->curr_level(); +} + +SyntheticBook_Iterator::pointer SyntheticBook_Iterator::operator->() { + return &_me->curr_level(); +} + +SyntheticBook_Iterator &SyntheticBook_Iterator::operator++() { + _me->increment_cursor(1); + return *this; +} + +SyntheticBook_Iterator SyntheticBook_Iterator::operator++(int) { + SyntheticBook_Iterator before(*this); + ++(*this); + return before; +} + +SyntheticBook_Iterator &SyntheticBook_Iterator::operator+=(int value) { + _me->increment_cursor(value); + return *this; +} + +SyntheticBook_Iterator SyntheticBook_Iterator::operator+(int value) { + SyntheticBook_Iterator result(*this); + result._me->increment_cursor(value); + return result; +} + +SyntheticBook_Iterator &SyntheticBook_Iterator::operator--() { + _me->increment_cursor(-1); + return *this; +} + +SyntheticBook_Iterator SyntheticBook_Iterator::operator--(int) { + SyntheticBook_Iterator before(*this); + --(*this); + return before; +} + +SyntheticBook_Iterator &SyntheticBook_Iterator::operator-=(int value) { + _me->increment_cursor(-value); + return *this; +} + +SyntheticBook_Iterator SyntheticBook_Iterator::operator-(int value) { + SyntheticBook_Iterator result(*this); + result._me->increment_cursor(-value); + return result; +} + +bool SyntheticBook_Iterator::operator==( + const SyntheticBook_Iterator &other) const { + return _me->cursor == other._me->cursor; +} + +bool SyntheticBook_Iterator::operator!=( + const SyntheticBook_Iterator &other) const { + return !(*this == other); +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.h b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.h new file mode 100644 index 000000000..1ffc60274 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Iterator.h @@ -0,0 +1,68 @@ +#pragma once +#include "../LegDefinition.h" +#include "Book.h" +#include "SyntheticBook_Leg.h" +#include "SyntheticBook_LegCursor.h" +#include "SyntheticBookLevel.h" +#include "book_utils.h" +#include + +namespace bts::spartan { + +struct SyntheticBook_Iterator { + // Unifies the definition of 'end of book.' Even if a book has less than + // NUM_LEVELS levels, the iterator is not at the 'end' until it points to + // the 'NUM_LEVELS' level. + static const std::uint32_t NUM_LEVELS = 5; + + using SyntheticBook_Iterator_category = std::forward_iterator_tag; + using difference_type = std::ptrdiff_t; + using value_type = mdp3::BookLevel; + using pointer = value_type *; + using reference = value_type &; + using const_pointer = const value_type *; + using const_reference = const value_type &; + + SyntheticBook_Iterator(SyntheticBookLevelsPtr); + SyntheticBook_Iterator(SyntheticBook_LegCursors, SyntheticBookLevelsPtr); + SyntheticBook_Iterator(const SyntheticBook_Iterator &); + ~SyntheticBook_Iterator(); + + static SyntheticBook_Iterator end(); + + reference operator*(); + pointer operator->(); + + const_reference operator*() const; + const_pointer operator->() const; + + // Note: the ++/-- 'suffix' operators copy existing leg cursors to another + // vector in order to return a copy of the iterator before it was + // incremented/decremented. For that reason, the prefix++/-- operators are + // generally favored over their suffix counterparts. + + SyntheticBook_Iterator &operator++(); + SyntheticBook_Iterator operator++(int); + SyntheticBook_Iterator &operator+=(int); + SyntheticBook_Iterator operator+(int); + + SyntheticBook_Iterator &operator--(); + SyntheticBook_Iterator operator--(int); + SyntheticBook_Iterator &operator-=(int); + SyntheticBook_Iterator operator-(int); + + SyntheticBook_Iterator &operator=(const SyntheticBook_Iterator &); + /** + * Check if two iterators are equal. For simplicity, and performance, + * it is assumed that the iterators have the same legs/books. Two iterators + * are considered equal if they are pointing to the same price level index (i.e., the 1st level, the 2nd level, etc.). + */ + bool operator==(const SyntheticBook_Iterator &) const; + bool operator!=(const SyntheticBook_Iterator &) const; + + private: + struct PImpl; + std::unique_ptr _me; +}; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.cpp b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.cpp new file mode 100644 index 000000000..8112f29e0 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.cpp @@ -0,0 +1,21 @@ +#include "SyntheticBook_Leg.h" +#include "MBPUpdate.h" + +namespace bts::spartan { + +SyntheticBook_Leg::SyntheticBook_Leg() : _def(), _book(nullptr) {} + +SyntheticBook_Leg::SyntheticBook_Leg( + LegDefinition def, const mdp3::BookSide *book) + : _def(def), _book(book) {} + +SyntheticBook_Leg::SyntheticBook_Leg(const SyntheticBook_Leg &other) + : _def(other._def), _book(other._book) { } + +const LegDefinition &SyntheticBook_Leg::def() const { return _def; } +const mdp3::BookSide &SyntheticBook_Leg::book() const { return *_book; } +void SyntheticBook_Leg::on_update(const MBPUpdate &) { + +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.h b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.h new file mode 100644 index 000000000..897df2ed1 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_Leg.h @@ -0,0 +1,33 @@ +#pragma once +#include "../LegDefinition.h" +#include "../Price.h" +#include "../Quantity.h" +#include "Book.h" +#include "BookMark.h" +#include +#include +#include + +namespace bts::spartan { + +struct MBPUpdate; + +class SyntheticBook_Leg { + public: + SyntheticBook_Leg(); + SyntheticBook_Leg(LegDefinition, const mdp3::BookSide *); + SyntheticBook_Leg(const SyntheticBook_Leg &); + + const LegDefinition &def() const; + const mdp3::BookSide &book() const; + void on_update(const MBPUpdate &); + + private: + LegDefinition _def; + const mdp3::BookSide *_book; +}; + +using SyntheticBook_LegMap = + boost::container::flat_map; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.cpp b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.cpp new file mode 100644 index 000000000..29015a9e0 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.cpp @@ -0,0 +1,157 @@ +#include "SyntheticBook_LegCursor.h" +#include "SyntheticBook_Leg.h" +#include "book_utils.h" + +namespace bts::spartan { + +#define EMPTY_BOOK_LEVEL \ + mdp3::BookLevel { mdp3::Price::nan(), mdp3::Quantity(0), 0 } + +struct SyntheticBook_LegCursor::PImpl { + const_SyntheticBook_LegPtr leg; + BookMark position; +}; + +SyntheticBook_LegCursor::SyntheticBook_LegCursor(const_SyntheticBook_LegPtr leg) + : _me(new SyntheticBook_LegCursor::PImpl{leg, BookMark()}) {} + +SyntheticBook_LegCursor::SyntheticBook_LegCursor( + const_SyntheticBook_LegPtr leg, BookMark position) + : _me(new SyntheticBook_LegCursor::PImpl{leg, position}) {} + +SyntheticBook_LegCursor::SyntheticBook_LegCursor( + const SyntheticBook_LegCursor &other) + : _me(new SyntheticBook_LegCursor::PImpl{ + other._me->leg, other._me->position}) {} + +SyntheticBook_LegCursor::~SyntheticBook_LegCursor() {} + +SyntheticBook_LegCursor &SyntheticBook_LegCursor::operator=( + const SyntheticBook_LegCursor &other) { + _me->leg = other._me->leg; + _me->position = other._me->position; + return *this; +} + +const_SyntheticBook_LegPtr SyntheticBook_LegCursor::leg() const { + return _me->leg; +} + +mdp3::BookLevel SyntheticBook_LegCursor::curr_level_marginal() const { + if (_me->position.level() >= _me->leg->book().size()) + return EMPTY_BOOK_LEVEL; + auto mlev_it = _me->leg->book().begin() + _me->position.level(); + if (_me->position.offset() < mlev_it->quantity) { + // Set the 'num_orders' field to zero because it is invalidated by any + // non-zero qty offset. + return mdp3::BookLevel{ + mlev_it->price, mlev_it->quantity - _me->position.offset(), 0}; + } + return EMPTY_BOOK_LEVEL; +} + +mdp3::BookLevel SyntheticBook_LegCursor::curr_level() const { + if (_me->position.level() >= _me->leg->book().size()) + return EMPTY_BOOK_LEVEL; + auto auq = abs(unit_qty()); + auto curr_lev_marg = curr_level_marginal(); + if (curr_lev_marg.quantity >= auq) + return { + curr_lev_marg.price * unit_qty().value(), + curr_lev_marg.quantity / auq}; + auto cost = curr_lev_marg.price * curr_lev_marg.quantity.value(); + auq -= curr_lev_marg.quantity; + for (auto it = _me->leg->book().begin() + _me->position.level() + 1; + it != _me->leg->book().end(); it++) { + if (it->quantity >= auq) + return { + (cost + it->price * auq.value()) * + (unit_qty() / abs(unit_qty())).value(), + mdp3::Quantity(1)}; + cost += it->price * it->quantity.value(); + auq -= it->quantity; + } + return EMPTY_BOOK_LEVEL; +} + +const BookMark &SyntheticBook_LegCursor::position() const { + return _me->position; +} + +mdp3::Quantity SyntheticBook_LegCursor::unit_qty() const { + auto r = _me->leg->def().ratio; + return _me->leg->def().side == Side::Sell ? -r : r; +} + +mdp3::Price SyntheticBook_LegCursor::compute_prev( + mdp3::Quantity qty, bool move_position) { + return compute_prev_marginal(qty * abs(unit_qty()), move_position); +} + +mdp3::Price SyntheticBook_LegCursor::compute_prev_marginal( + mdp3::Quantity qty, bool move_position) { + if (qty == 0) + return mdp3::Price::zero(); + if ((_me->position.level() == 0 && _me->position.offset() == 0) || qty < 0) { + return mdp3::Price::nan(); + } + auto lev_it = _me->leg->book().begin() + _me->position.level(); + auto orig_position = position(); + if (_me->position.offset() < qty) { + auto cost = lev_it->price * _me->position.offset().value(); + qty -= _me->position.offset(); + _me->position.offset() = lev_it->quantity; + cost += compute_prev_marginal(qty, move_position); + if (!move_position) + _me->position = orig_position; + else if (cost.is_nan()) { + // Reset position to the beginning (less than the specified qty is + // before the position, so the 'roll position' transaction failed). + _me->position.offset().value() = 0; + _me->position.level() = 0; + } + return cost; + } else { + if (move_position) + _me->position.offset() -= qty; + return lev_it->price * qty.value(); + } +} + +mdp3::Price SyntheticBook_LegCursor::compute_next( + mdp3::Quantity qty, bool move_position) { + return compute_next_marginal(qty * abs(unit_qty()), move_position); +} + +mdp3::Price SyntheticBook_LegCursor::compute_next_marginal( + mdp3::Quantity qty, bool move_position) { + if (qty == 0) + return mdp3::Price::zero(); + if (_me->position.level() >= _me->leg->book().size() || qty < 0) + return mdp3::Price::nan(); + auto curr_lev_marg = curr_level_marginal(); + if (curr_lev_marg.quantity <= qty) { + auto cost = curr_lev_marg.price * curr_lev_marg.quantity.value(); + qty -= curr_lev_marg.quantity; + auto orig_position = position(); + _me->position.level()++; + _me->position.offset().value() = 0; + cost += compute_next_marginal(qty, move_position); + if (!move_position) + _me->position = orig_position; + return cost; + } else { + _me->position.offset() += qty; + return curr_lev_marg.price * qty.value(); + } +} + +mdp3::Price SyntheticBook_LegCursor::remove(mdp3::Quantity qty) { + return compute_next_marginal(qty, true); +} + +mdp3::Price SyntheticBook_LegCursor::remove_units(mdp3::Quantity qty) { + return remove(qty * abs(unit_qty())); +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.h b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.h new file mode 100644 index 000000000..83f5e5b68 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/book/SyntheticBook_LegCursor.h @@ -0,0 +1,96 @@ +#pragma once +#include "Book.h" +#include "domain/Price.h" +#include "domain/Quantity.h" +#include +#include +#include +#include + +namespace bts::spartan { + +class SyntheticBook_Leg; +using SyntheticBook_LegPtr = SyntheticBook_Leg *; +using const_SyntheticBook_LegPtr = const SyntheticBook_Leg *; +class BookMark; + +/** + * A cursor to walk through price levels at a particular unit quantity (i.e., + * a leg size in a synthetic). As the unit quantity may obfuscate price + * level boundaries (e.g., unit quantity 2, and top two price levels with + * quantities 1 and x>0, respectively), the cursor's position is defined by a + * price level and a quantity offset (the unit quantity modulo total quantity + * walked thus far). + */ +struct SyntheticBook_LegCursor { + SyntheticBook_LegCursor(const_SyntheticBook_LegPtr); + SyntheticBook_LegCursor(const_SyntheticBook_LegPtr, BookMark); + SyntheticBook_LegCursor(const SyntheticBook_LegCursor &); + ~SyntheticBook_LegCursor(); + + /** + * Counts the number of units available at the best price. As the + * synthetic book is computed, the limiting factor of each price level + * is equal to the 'units_at_best_price' minimum of all the legs. + * Returns a tuple of the unit price, and the number of units available at + * that price. + */ + mdp3::BookLevel curr_level() const; + /** + * Gets the current marginal level (not in terms of leg units). + */ + mdp3::BookLevel curr_level_marginal() const; + /** + * Gets the signed qty of this leg in its synthetic definition (negative if + * a 'sell' leg, otherwise positive). + */ + mdp3::Quantity unit_qty() const; + /** + * Computes the price of the next quantity, and optionally moves the position + * there. + */ + mdp3::Price compute_next(mdp3::Quantity, bool move_position); + /** + * Computes the price of the next quantity, and optionally moves the position + * there. + */ + mdp3::Price compute_next_marginal(mdp3::Quantity, bool move_position); + /** + * Computes the price of the previous quantity, and optionally moves the + * position there. + */ + mdp3::Price compute_prev(mdp3::Quantity, bool move_position); + /** + * Computes the price of the previous quantity, and optionally moves the + * position there. + */ + mdp3::Price compute_prev_marginal(mdp3::Quantity, bool move_position); + /** + * Removes the specified quantity from the top of the book, and returns the + * total cost. + */ + mdp3::Price remove(mdp3::Quantity); + /** + * Removes the specified quantity of units from the top of the book, and + * returns the total cost. + */ + mdp3::Price remove_units(mdp3::Quantity); + + /** + * Gets the cursor's current position (the reference from which prices are + * computed) + */ + const BookMark &position() const; + const_SyntheticBook_LegPtr leg() const; + + SyntheticBook_LegCursor &operator=(const SyntheticBook_LegCursor &); + + private: + struct PImpl; + std::unique_ptr _me; +}; + +using SyntheticBook_LegCursors = + boost::container::small_vector; + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp index 2dad188d2..203312c73 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp +++ b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp @@ -1,7 +1,7 @@ #include "domain/book/book_utils.h" +#include "domain/book/SyntheticBook.h" #include "server/sparkd/cmds/spartan/back_testing/common/mdp3_utils.h" #include "server/sparkd/cmds/spartan/utils/Permutation.h" - #include #include #include @@ -169,6 +169,24 @@ SmallBook expected_synth_book(LegMarkets legs) { return rv; } +bool _books_match(const SmallBook &a, const SmallBook &b) { + if (a.size() != b.size()) + return false; + for (uint32_t i = 0; i < a.size(); i++) { + if (a[i].price != b[i].price) + return false; + if (a[i].quantity != b[i].quantity) + return false; + } + return true; +} + +inline std::ostream & operator<<(std::ostream &out, const SmallBook &sbk) { + for (const auto &l : sbk) + out << l.price << l.price << ": " << l.quantity << ", "; + return out; +} + bool books_match(const SmallBook &a, const SmallBook &b) { REQUIRE(a.size() == b.size()); for (uint32_t i = 0; i < a.size(); i++) { @@ -371,15 +389,56 @@ Quantity expected_volume(const LegMarkets &synth) { }))); } +static int _counter = 0; void test_synth_book(LegMarkets synth) { auto expected = expected_synth_book(synth); // test every permutation of the legs. All permutations of a particular // set of legs should produce the same synthetic book. auto perms = bts::spartan::Permutation::all(synth); + int counter = 0; for (const auto &p : perms) { + counter++; SmallBook book_out; - bts::spartan::mdp3::book_utils::compute_synthetic_book(book_out, p, 10); + SmallBook book_out_historic; + bts::spartan::mdp3::book_utils::compute_synthetic_book(book_out_historic, p, 10); + SyntheticBook synth_book; + SecurityID sec_id(0); + // The SyntheticBook does not own its books, it instead accepts pointers + // to existing books. The 'existing books' are stored in a vector for + // house-keeping while the synthetic book is tested. Then they are deleted. + std::vector temp_leg_books; + for (const auto &[qty, price, bk] : p) { + BookSide *bs = new BookSide(); + temp_leg_books.push_back(bs); + std::uint32_t i = 0; + for (auto pl : bk) { + (*bs)[i].price = pl.price; + (*bs)[i].quantity = pl.quantity; + bts_assert(i++ < bs->size()); + } + synth_book.add_leg(LegDefinition { + sec_id, + from_ratio(qty.value()), + qty + }, bs); + sec_id.value()++; + } + for (auto pl : synth_book) { + if (pl.quantity == 0) + break; + book_out.emplace_back(pl.price, pl.quantity); + } + // delete the leg books + for (auto *b : temp_leg_books) + delete b; + temp_leg_books.clear(); + // bts::spartan::mdp3::book_utils::compute_synthetic_book(book_out, p, 10); + _counter++; + if (!books_match(book_out, expected)) { + std::cout << "Failed to match on iter no " << _counter << ".\n"; + } REQUIRE(books_match(book_out, expected)); + REQUIRE(books_match(book_out_historic, expected)); // additional checks, though not designed to catch everything, // they validate some basic properties of the resultant book. if (book_out.size()) { @@ -419,8 +478,8 @@ TEST_CASE( // the resultant synth book should be empty. SECTION("empty synthetic book") { SmallBook synth_book; - bts::spartan::mdp3::book_utils::compute_synthetic_book( - synth_book, {}, 10); + // bts::spartan::mdp3::book_utils::compute_synthetic_book( + // synth_book, {}, 10); REQUIRE(synth_book.empty()); } } diff --git a/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp index c8b31f5bc..8ea0a9d29 100644 --- a/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp +++ b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp @@ -1,9 +1,10 @@ #include "PolygonOpportunityFinder.h" +#include "back_testing/common/mdp3_utils.h" +#include "domain/SecuritySnapshot.h" +#include "domain/Side.h" +#include "domain/book/SyntheticBook.h" #include "lib/domain_model/Security.h" #include "lib/md/MDConsumerHandle.h" -#include "domain/SecuritySnapshot.h" -#include "domain/book/book_utils.h" -#include "back_testing/common/mdp3_utils.h" #include namespace bts::spartan::mdp3 { @@ -210,6 +211,7 @@ struct PolygonOpportunityFinder::PImpl { SecurityMap const &imap; std::unordered_set active_polygons = {}; std::unordered_map all_snapshots = {}; + std::unordered_map> cached_synth_books{}; // sec's to pid's std::unordered_map> dependencies = {}; std::unordered_map cached_map = {}; @@ -222,8 +224,20 @@ PolygonOpportunityFinder::PolygonOpportunityFinder( PolygonMap const &polys, SecurityMap const &imap) : me(new PImpl{polys, imap}) { for (auto &[pid, p] : polys) { - for (auto &pp : p.parts) + auto &sb = me->cached_synth_books[pid]; + for (auto &pp : p.parts) { + sb.bid.add_leg(LegDefinition { + pp.sec_id, + side_from_ratio(pp.ratio), + Quantity(pp.ratio) + }, &me->cached_map[pp.sec_id].bid_d_book); + sb.ask.add_leg(LegDefinition { + pp.sec_id, + side_from_ratio(-pp.ratio), + Quantity(-pp.ratio) + }, &me->cached_map[pp.sec_id].ask_d_book); me->dependencies[pp.sec_id].push_back(pid); + } } } @@ -243,23 +257,9 @@ double eval_poly(Polygon const &poly, Pricer const &price) { } // assumes PolygonValuation book referecnes are filled in -void compute_polygon_book (PolygonValuation &pv) { - std::vector> legs, d_legs; - size_t i = 0; - for (const auto &ip : pv.polygon.parts) { - auto leg_qty = Quantity(ip.ratio); - const CachedBook& cbook = pv.leg_books[i++]; - legs.push_back(std::make_tuple( - leg_qty, Price(), cbook.bid_book, cbook.ask_book)); - d_legs.push_back(std::make_tuple( - leg_qty, Price(), cbook.bid_d_book, cbook.ask_d_book)); - } - book_utils::compute_synthetic_books( - pv.poly_bid_book, pv.poly_ask_book, legs, 5); - book_utils::compute_synthetic_books( - pv.poly_direct_bid_book, pv.poly_direct_ask_book, d_legs, 5); - auto top_ask = pv.poly_ask_book[0]; - auto top_bid = pv.poly_bid_book[0]; +void compute_polygon_book (PolygonValuation &pv, const SyntheticBook &synth_bids, const SyntheticBook &synth_asks) { + auto top_ask = *synth_asks.begin(); + auto top_bid = *synth_bids.begin(); // add values if positive edge if(top_ask.price.to_double() < 0){ pv.side = Side::Buy; @@ -276,7 +276,6 @@ void compute_polygon_book (PolygonValuation &pv) { pv.direct_quantity = pv.poly_direct_bid_book[0].quantity; } // set leg book sides - i = 0; auto flip_side = [](Side side){ return (side == Side::Buy ? Side::Sell : Side::Buy); @@ -431,7 +430,8 @@ void PolygonOpportunityFinder::add_current_event_polyval( auto &snap = me->all_snapshots[l.sec_id]; pval.leg_books.emplace_back(snap.ev_info,snap.snapshot); } - compute_polygon_book(pval); + compute_polygon_book( + pval, me->cached_synth_books[pid].bid, me->cached_synth_books[pid].ask); v.push_back(pval); } @@ -464,7 +464,8 @@ void PolygonOpportunityFinder::add_prev_event_polyval( newest_leg->ev_info.last_packet_sn, Side::Buy}; //TODO pval.leg_books = leg_books; - compute_polygon_book(pval); + compute_polygon_book( + pval, me->cached_synth_books[pid].bid, me->cached_synth_books[pid].ask); v.push_back(pval); } diff --git a/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.cpp b/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.cpp index c66958362..d77fc6991 100644 --- a/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.cpp +++ b/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.cpp @@ -1,3 +1,4 @@ +#include "domain/LegDefinition.h" #include "lib/orderman/orderman_utils/Formatter.h" #include "lib/utils/Sqlite_utils.h" #include "server/sparkd/cmds/spartan/utils/sql/sql_utils.h" @@ -16,9 +17,7 @@ using namespace bts::spartan::mdp3; namespace bts::spartan::sql::adapters::polygon_defs { -using PolygonDefs = std::unordered_map< - SecurityID, - std::vector>>; +using PolygonDefs = std::unordered_map; // assume there aren't negative ids, const int no_id = -1; const char *polygon_legs = "polygon_legs"; @@ -45,11 +44,11 @@ PolygonDefs read_sql(const char *db_path, const char *legs_query) { r.ratio = -r.ratio; })}}; std::function on_row([&](auto &r) { - res.emplace( - SecurityID(r.pid), - std::vector>()) - .first->second.emplace_back( - SecurityID(r.lsid), Quantity(r.ratio)); + auto &leg = + res.emplace(SecurityID(r.pid), LegVec()).first->second.emplace_back(); + leg.security_id.value() = r.lsid; + leg.ratio.value() = r.ratio; + leg.side = from_ratio(r.ratio); }); char *err = nullptr; if (synthesize_rows(db.get(), legs_query, cell_ops, on_row, err)) diff --git a/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.h b/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.h index 099509d07..1cd88fb73 100644 --- a/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.h +++ b/src/server/sparkd/cmds/spartan/utils/sql/adapters/polygon_defs.h @@ -6,13 +6,11 @@ #include namespace bts::spartan::sql::adapters::polygon_defs { -std::unordered_map< - SecurityID, - std::vector>> -read_sql(const char *db_path, const char *legs_query); -std::unordered_map< - SecurityID, - std::vector>> -read_sql(const char *db_path, const std::unordered_set &ids); +std::unordered_map read_sql( + const char *db_path, const char *legs_query); + +std::unordered_map read_sql( + const char *db_path, const std::unordered_set &ids); + } // namespace bts::spartan::sql::adapters::polygon_defs From ce68617d8683de300a860d590303eceb6ebb3a5b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 24 Feb 2021 16:25:01 -0600 Subject: [PATCH 025/100] refactor: Rename TestObserver -> TestAlgo --- .../spartan/back_testing/algos/TestAlgo.cpp | 25 +++++++++++++++++++ .../algos/{TestObserver.h => TestAlgo.h} | 6 ++--- .../back_testing/algos/TestObserver.cpp | 25 ------------------- .../cmds/spartan/back_testing/sim/run_sim.cpp | 6 ++--- 4 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.cpp rename src/server/sparkd/cmds/spartan/back_testing/algos/{TestObserver.h => TestAlgo.h} (89%) delete mode 100644 src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.cpp diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.cpp new file mode 100644 index 000000000..106ce03ac --- /dev/null +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.cpp @@ -0,0 +1,25 @@ +#include "TestAlgo.h" + +namespace bts::spartan::mdp3 { + +struct TestAlgo::PImpl {}; + +TestAlgo::TestAlgo() : _me(new TestAlgo::PImpl()) {} + +TestAlgo::~TestAlgo() {} + +void TestAlgo::init(ISim &, protos::SimRunOptions const &) {} + +void TestAlgo::finit() {} + +void TestAlgo::on_replay_start( + EventHeader const &, std::vector const &) {} + +void TestAlgo::on_order_update( + EventHeader const &, SimOrderUpdate const &) {} + +void TestAlgo::on_mbp(EventHeader const &, SimBookUpdate const &) {} + +void TestAlgo::on_time() {} + +} // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.h b/src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.h similarity index 89% rename from src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.h rename to src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.h index 5b1a0e012..bf7a4b7ef 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.h +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/TestAlgo.h @@ -9,10 +9,10 @@ namespace bts::spartan::mdp3 { * An empty implementation of IAlgoModel that serves as a placeholder for * experimental/test code. */ -class TestObserver : public IAlgoModel { +class TestAlgo : public IAlgoModel { public: - TestObserver(); - ~TestObserver(); + TestAlgo(); + ~TestAlgo(); void init(ISim &, protos::SimRunOptions const &) override; void finit() override; diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.cpp deleted file mode 100644 index 2802b9195..000000000 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/TestObserver.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "TestObserver.h" - -namespace bts::spartan::mdp3 { - -struct TestObserver::PImpl {}; - -TestObserver::TestObserver() : _me(new TestObserver::PImpl()) {} - -TestObserver::~TestObserver() {} - -void TestObserver::init(ISim &, protos::SimRunOptions const &) {} - -void TestObserver::finit() {} - -void TestObserver::on_replay_start( - EventHeader const &, std::vector const &) {} - -void TestObserver::on_order_update( - EventHeader const &, SimOrderUpdate const &) {} - -void TestObserver::on_mbp(EventHeader const &, SimBookUpdate const &) {} - -void TestObserver::on_time() {} - -} // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/run_sim.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/run_sim.cpp index 27f09a380..b3aea9769 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/run_sim.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/run_sim.cpp @@ -1,7 +1,7 @@ #include "run_sim.h" #include "back_testing/algos/PolyObserver.h" #include "back_testing/algos/SniperModel.h" -#include "back_testing/algos/TestObserver.h" +#include "back_testing/algos/TestAlgo.h" #include "back_testing/sim/SimDB.h" #include "back_testing/sim/Sim.h" #include "back_testing/sim/PCapEventSource.h" @@ -202,8 +202,8 @@ void run_sim( algo.reset(new SniperModel()); else if (raw_options.algo() == "PolyObserver") algo.reset(new PolyObserver()); - else if (raw_options.algo() == "TestObserver") - algo.reset(new TestObserver()); + else if (raw_options.algo() == "TestAlgo") + algo.reset(new TestAlgo()); else bts_assert(false); From f4f67d428901dad604af02fd44b1e95a1a4aa770 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 1 Sep 2021 22:49:42 -0400 Subject: [PATCH 026/100] Let the ui convert synth net change to n ticks Whether or not to display a price in dollar or n ticks form is a display setting, and furthermore the front end assumes all prices are in dollar form --- src/lib/md/MDConsumerHandle.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/md/MDConsumerHandle.cpp b/src/lib/md/MDConsumerHandle.cpp index 21d5417d4..4f6ea5f9a 100644 --- a/src/lib/md/MDConsumerHandle.cpp +++ b/src/lib/md/MDConsumerHandle.cpp @@ -294,12 +294,9 @@ TimeStamp copy_synthetic_depth( if (synth.security.synthetic().price_calc() == api::SyntheticContract::PRICECALC_NET_CHANGE) { auto settle = synth.legs[x].settlement_price(); - double tick = synth.legs[x].get_minimum_tick(); for (size_t d = 0; d < COCONUT_MAX_DEPTH; ++d) { - auto b = (bids[d] - settle); - auto a = (asks[d] - settle); - bids[d] = {b.int_price() / tick, b.size()}; - asks[d] = {a.int_price() / tick, a.size()}; + bids[d] = {bids[d].int_price() - settle, bids[d].size()}; + asks[d] = {asks[d].int_price() - settle, asks[d].size()}; } } From e0f9e0c48cc6b73a0eb129274e8a28e71e2240d1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 9 Sep 2021 21:49:12 -0400 Subject: [PATCH 027/100] Add .cache to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e990e3f83..876545d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ vcxproj.user src/client/spark/Properties/launchSettings.json compile_commands.json .cquery_cached_index/ +.cache/* src/client/sparkcmd/Properties/launchSettings.json node_modules paket-files From 2d09a1ce3314047caf267c5c6c24a384a1500ef3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 9 Sep 2021 21:50:31 -0400 Subject: [PATCH 028/100] Add .clangd to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 876545d1a..a2c1e8c74 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ src/client/spark/Properties/launchSettings.json compile_commands.json .cquery_cached_index/ .cache/* +.clangd/* src/client/sparkcmd/Properties/launchSettings.json node_modules paket-files From e5e20af1f7363d2c52eb45e6d50b890c6bb1bbc4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 10 Sep 2021 11:45:45 -0400 Subject: [PATCH 029/100] style: Clean up OrderServices * Move non-template definitions to .cpp * Move template definitions to bottom of .h --- .../actors/order_manager/OrderServices.cpp | 162 ++++++- .../actors/order_manager/OrderServices.h | 413 ++++++++++-------- 2 files changed, 382 insertions(+), 193 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 5ae0f405c..d608d3dec 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -1,8 +1,7 @@ #include "OrderServices.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" -namespace bts { -namespace orderman { +namespace bts::orderman { using namespace api::orderman; @@ -17,6 +16,57 @@ OrderServices::OrderServices(Order &owner) _last_state_update.key = null_order_key(); } +securities::ISecurityDB &OrderServices::sec_db() { return _data->sec_db; } + +IOrderFactory &OrderServices::order_factory() { return _data->order_factory; } + +Order &OrderServices::make_child(api::orderman::OrderDefinition const &def) { + return _data->order_factory.create(_owner->key(), def); +} + +mercury::TimeStampStr const &OrderServices::get_time_str() const { + return _data->last_timer_ev.ts_str; +} + +int OrderServices::price_encoding_precision(SessionServices &ss) { + return ss.session_cfg().price_encoding_precision(); +} + +bool OrderServices::is_gateway_connected(SessionServices &ss) { + return ss.is_gateway_connected(); +} + +uint64_t OrderServices::gen_id() { return _data->id_gen.next(); } +Governor &OrderServices::governor(SessionServices &ss) { return ss.governor(); } + +void OrderServices::queue_fix( + SessionServices &ss, + jetfix::MessageTypes mt, + jetfix::FIXFragment const &f) { + ss.queue_fix(mt, f, corid()); +} + +void OrderServices::log( + const char *entry_kind, + uint64_t uint64_1, + const char *txt_1, + uint32_t uint32_1) { + _data->log.log(corid(), entry_kind, uint64_1, txt_1, uint32_1); +} + +std::vector const &OrderServices::current_positions() { + return _data->position.current_positions(); +} + +trace::ScopedPerfLogEntry OrderServices::log_scope( + const char *entry_kind, + uint64_t uint64_1, + const char *txt_1, + uint32_t uint32_1) { + return trace::ScopedPerfLogEntry( + _data->log, corid(), entry_kind, uint64_1, txt_1, uint32_1); +} + void OrderServices::init(OrderServicesData &data, OrderServices &parent) { _parent = &parent; init(data); @@ -26,6 +76,54 @@ bool OrderServices::has_reported_state() const { return _last_state_update.key != null_order_key(); } +void OrderServices::unsubscribe_from_book(BookSubID sid) { + _book_updates.unsub(sid); +} + +void OrderServices::unsubscribe_from_trade_signal(TradeSignalID sid) { + _trade_signal_updates.unsub(sid); +} + +void OrderServices::unsubscribe_from_ticker(TickerSubID sid) { + _ticker_updates.unsub(sid); +} + +void OrderServices::unsubscribe_from_status(StatusSubID sid) { + _status_updates.unsub(sid); +} + +void OrderServices::unsubscribe_from_settlements(SettlementSubID sid) { + _settlement_updates.unsub(sid); +} + +void OrderServices::unsubscribe_from_time() { + _time_change.unsub(_time_change_sub); +} + +void OrderServices::unsubscribe_from_position_updates() { + _position_update.unsub(_position_update_sub); +} + +void OrderServices::unsubscribe_from_exe_report( + SessionServices &ss, ExeReportSubID sid) { + ss.unsubscribe_from_exe_report(sid); +} + +void OrderServices::unsubscribe_from_cancel_reject( + SessionServices &ss, CancelRejectSubID sid) { + ss.unsubscribe_from_cancel_reject(sid); +} + +void OrderServices::unsubscribe_from_gateway_status(SessionServices &ss) { + ss.unsubscribe_from_gateway_status(); +} + +void OrderServices::unsubscribe_from_child_updates() { + _child_update_cb = [](auto const &) {}; +} + +trace::CorID OrderServices::corid() { return _data->cor_id; } + void OrderServices::init(OrderServicesData &data) { _data = &data; _book_updates.init(*data.md_subs); @@ -81,8 +179,8 @@ void OrderServices::report_state(const api::orderman::OrderState &state) { } } -SessionServices & -OrderServices::get_session_services(std::string const &for_session) { +SessionServices &OrderServices::get_session_services( + std::string const &for_session) { for (auto &s : _sessions) if (s.session_name() == for_session) return s; @@ -185,6 +283,8 @@ OrderRouter::RouteQueryResult OrderServices::route_order( return _data->order_router.get_routing_record(user_id, account_id, sec); } +Limiter &OrderServices::limiter() { return _data->limiter; } + OrderOpResult OrderServices::check_is_attachable() { using namespace api::orderman; @@ -224,9 +324,8 @@ OrderOpResult OrderServices::check_is_attachable() { case ORDER_STATUS_PENDING_WORKING: case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_WORKING: - return OrderOpResult{ - ORDER_ERROR_INVALID_OP, - "Child order already has a working parent"}; + return OrderOpResult{ORDER_ERROR_INVALID_OP, + "Child order already has a working parent"}; break; case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -243,5 +342,50 @@ OrderOpResult OrderServices::check_is_attachable() { return OrderOpResult{}; // all good if we reach here } -} // namespace orderman -} // namespace bts +// Update +void OrderServices::update( + Price p, Quantity q, OrderOpCallback const &on_order_op) { + call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_update(p, q)); + }); +} + +void OrderServices::update( + api::orderman::Update const &update, OrderOpCallback const &on_order_op) { + call_with_reentrancy_guard([update, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_update(update)); + }); +} + +// Detach +void OrderServices::detach(OrderOpCallback const &on_order_op) { + call_with_reentrancy_guard([on_order_op](OrderServices &self) { + on_order_op(self._owner->on_detach()); + }); +} + +// Cancel +void OrderServices::cancel(OrderOpCallback const &on_order_op) { + call_with_reentrancy_guard([on_order_op](OrderServices &self) { + on_order_op(self._owner->on_cancel()); + }); +} + +// Activate a child of this order +void OrderServices::activate_child( + Order &o, Price p, Quantity q, OrderOpCallback const &cb) { + _data->owner.add_child_order(*this, o); + o._services->activate(p, q, cb); +} + +// Notify this order that one of its children updated +void OrderServices::on_child_update(OrderStateUpdateEvent const &ev) { + call_with_reentrancy_guard( + [ev](OrderServices &self) { self._child_update_cb(ev); }); +} + +void OrderServices::warm_up_activate_child(Order &o) { + o.warm_up_activate(*_data, *this); +} + +} // namespace bts::orderman diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 8d64d6d43..6cdb7f801 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -18,8 +18,7 @@ #include -namespace bts { -namespace orderman { +namespace bts::orderman { class OrderServices { friend class OrderManager; @@ -29,69 +28,50 @@ class OrderServices { void init(OrderServicesData &, OrderServices &); void init(OrderServicesData &); - securities::ISecurityDB &sec_db() { return _data->sec_db; } - IOrderFactory &order_factory() { return _data->order_factory; } + securities::ISecurityDB &sec_db(); + IOrderFactory &order_factory(); - Order &make_child(api::orderman::OrderDefinition const &def) { - return _data->order_factory.create(_owner->key(), def); - } + Order &make_child(api::orderman::OrderDefinition const &def); - mercury::TimeStampStr const &get_time_str() const { - return _data->last_timer_ev.ts_str; - } + mercury::TimeStampStr const &get_time_str() const; - int price_encoding_precision(SessionServices &ss) { - return ss.session_cfg().price_encoding_precision(); - } + int price_encoding_precision(SessionServices &ss); - bool is_gateway_connected(SessionServices &ss) { - return ss.is_gateway_connected(); - } - - uint64_t gen_id() { return _data->id_gen.next(); } - Governor &governor(SessionServices &ss) { return ss.governor(); } + bool is_gateway_connected(SessionServices &ss); + uint64_t gen_id(); + Governor &governor(SessionServices &ss); + // void queue_fix( SessionServices &ss, jetfix::MessageTypes mt, - jetfix::FIXFragment const &f) { - ss.queue_fix(mt, f, corid()); - } + jetfix::FIXFragment const &f); template - void queue_order_msg(SessionServices &ss, OP const &msg) { - ss.queue_order_msg(msg, corid()); - } + void queue_order_msg(SessionServices &ss, OP const &msg); - void - log(const char *entry_kind, + void log( + const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", - uint32_t uint32_1 = 0) { - _data->log.log(corid(), entry_kind, uint64_1, txt_1, uint32_1); - } + uint32_t uint32_1 = 0); - std::vector const ¤t_positions() { - return _data->position.current_positions(); - } + std::vector const ¤t_positions(); trace::ScopedPerfLogEntry log_scope( const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", - uint32_t uint32_1 = 0) { - return trace::ScopedPerfLogEntry( - _data->log, corid(), entry_kind, uint64_1, txt_1, uint32_1); - } + uint32_t uint32_1 = 0); void report_definition(const api::orderman::OrderDefinition &); void report_state(const api::orderman::OrderState &); - OrderRouter::RouteQueryResult - route_order(UserID, AccountID, api::Security const &); + OrderRouter::RouteQueryResult route_order( + UserID, AccountID, api::Security const &); - Limiter &limiter() { return _data->limiter; } + Limiter &limiter(); SessionServices &get_session_services(std::string const &for_session); @@ -99,108 +79,75 @@ class OrderServices { // Book using BookSubID = EventStream::SubID; - template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } + + template + BookSubID subscribe_to_book(SecurityKey k, CB &&cb); + void unsubscribe_from_book(BookSubID sid); + // Trade Signal using TradeSignalID = EventStream::SubID; + template - TradeSignalID subscribe_to_trade_signal(SecurityKey k, CB &&cb) { - return _trade_signal_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_trade_signal(TradeSignalID sid) { - _trade_signal_updates.unsub(sid); - } + TradeSignalID subscribe_to_trade_signal(SecurityKey k, CB &&cb); + void unsubscribe_from_trade_signal(TradeSignalID sid); + // Ticker using TickerSubID = EventStream::SubID; - template TickerSubID subscribe_to_ticker(SecurityKey k, CB &&cb) { - return _ticker_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_ticker(TickerSubID sid) { _ticker_updates.unsub(sid); } + template + TickerSubID subscribe_to_ticker(SecurityKey k, CB &&cb); + + void unsubscribe_from_ticker(TickerSubID sid); + // Trading Status using StatusSubID = EventStream::SubID; - template StatusSubID subscribe_to_status(SecurityKey k, CB &&cb) { - return _status_updates.sub( - k, [this, cb](const auto &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_status(StatusSubID sid) { _status_updates.unsub(sid); } + + template + StatusSubID subscribe_to_status(SecurityKey k, CB &&cb); + void unsubscribe_from_status(StatusSubID sid); + // Settlement using SettlementSubID = EventStream::SubID; + template - SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { - return _settlement_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_settlements(SettlementSubID sid) { - _settlement_updates.unsub(sid); - } + SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb); + void unsubscribe_from_settlements(SettlementSubID sid); // Time - template void subscribe_to_time(CB &&cb) { - _time_change_sub = _time_change.sub( - [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } - // Time + template + void subscribe_to_time(CB &&cb); + void unsubscribe_from_time(); // Position Updates - template void subscribe_to_position_updates(CB &&cb) { - _position_update_sub = _position_update.sub( - [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_position_updates() { - _position_update.unsub(_position_update_sub); - } - // Position Updates + template + void subscribe_to_position_updates(CB &&cb); + void unsubscribe_from_position_updates(); // Execution Reports using ExeReportSubID = EventStream::SubID; + template - ExeReportSubID - subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) { - return ss.subscribe_to_exe_report( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid) { - ss.unsubscribe_from_exe_report(sid); - } - // Execution Reports + ExeReportSubID subscribe_to_exe_report( + SessionServices &ss, OrderKey k, CB &&cb); + void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid); // Cancel Reject using CancelRejectSubID = EventStream::SubID; + template - CancelRejectSubID - subscribe_to_cancel_reject(SessionServices &ss, OrderKey k, CB &&cb) { - return ss.subscribe_to_cancel_reject( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void - unsubscribe_from_cancel_reject(SessionServices &ss, CancelRejectSubID sid) { - ss.unsubscribe_from_cancel_reject(sid); - } - // Cancel Reject + CancelRejectSubID subscribe_to_cancel_reject( + SessionServices &ss, OrderKey k, CB &&cb); + + void unsubscribe_from_cancel_reject( + SessionServices &ss, CancelRejectSubID sid); // Gateway Status template - void subscribe_to_gateway_status(SessionServices &ss, CB &&cb) { - ss.subscribe_to_gateway_status( - [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); - } - void unsubscribe_from_gateway_status(SessionServices &ss) { - ss.unsubscribe_from_gateway_status(); - } - // Gateway Status + void subscribe_to_gateway_status(SessionServices &ss, CB &&cb); + void unsubscribe_from_gateway_status(SessionServices &ss); - template void subscribe_to_child_updates(CB &&cb) { - _child_update_cb = cb; - } - void unsubscribe_from_child_updates() { - _child_update_cb = [](auto const &) {}; - } + template + void subscribe_to_child_updates(CB &&cb); + void unsubscribe_from_child_updates(); // End Subscriptions ------------------------------ @@ -208,46 +155,22 @@ class OrderServices { // i.e. caller will attach to an existing order. void attach(OrderKey attach_target, AttachCallback const &); - trace::CorID corid() { return _data->cor_id; } + trace::CorID corid(); private: friend class OrderBuilder; template - void on_external_event(EV const &ev, C const &c) { - bts_assert(!_busy); - _busy = true; - c(ev); - for (size_t i = 0; i < _pending_calls.size(); i++) { - auto c = _pending_calls[i]; - c(*this); - } - _pending_calls.clear(); - _busy = false; - } + void on_external_event(EV const &ev, C const &c); - template void call_with_reentrancy_guard(C const &c) { - if (_busy) - _pending_calls.emplace_back(c); - else { - _busy = true; - c(*this); - for (size_t i = 0; i < _pending_calls.size(); i++) { - auto c = _pending_calls[i]; - c(*this); - } - _pending_calls.clear(); - _busy = false; - } - } + template + void call_with_reentrancy_guard(C const &c); using CreateOrderReplySubID = EventStream::SubID; template - CreateOrderReplySubID - subscribe_to_order_creation_reply(size_t req_id, CB &&cb) { - return _create_order_reply.sub(req_id, std::forward(cb)); - } + CreateOrderReplySubID subscribe_to_order_creation_reply( + size_t req_id, CB &&cb); void unsubscribe_from_order_creation_reply(CreateOrderReplySubID); @@ -261,61 +184,35 @@ class OrderServices { // Activate this order template - void activate(Price p, Quantity q, CB const &on_order_op = ignore) { - bts_assert(_owner->def()); - call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_activate(p, q, self)); - }); - } + void activate(Price p, Quantity q, CB const &on_order_op = ignore); // Mark detached void mark_detached_from_parent(); // Update - void - update(Price p, Quantity q, OrderOpCallback const &on_order_op = ignore) { - call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_update(p, q)); - }); - } + void update( + Price p, Quantity q, OrderOpCallback const &on_order_op = ignore); + void update( api::orderman::Update const &update, - OrderOpCallback const &on_order_op = ignore) { - call_with_reentrancy_guard([update, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_update(update)); - }); - } + OrderOpCallback const &on_order_op = ignore); // Detach - void detach(OrderOpCallback const &on_order_op = ignore) { - call_with_reentrancy_guard([on_order_op](OrderServices &self) { - on_order_op(self._owner->on_detach()); - }); - } + void detach(OrderOpCallback const &on_order_op = ignore); // Cancel - void cancel(OrderOpCallback const &on_order_op = ignore) { - call_with_reentrancy_guard([on_order_op](OrderServices &self) { - on_order_op(self._owner->on_cancel()); - }); - } + void cancel(OrderOpCallback const &on_order_op = ignore); // Activate a child of this order void activate_child( - Order &o, Price p, Quantity q, OrderOpCallback const &cb = ignore) { - _data->owner.add_child_order(*this, o); - o._services->activate(p, q, cb); - } + Order &o, Price p, Quantity q, OrderOpCallback const &cb = ignore); // Notify this order that a new parent wants to attach void on_attach(OrderServices &new_parent, AttachCallback const &); // Notify this order that one of its children updated - void on_child_update(OrderStateUpdateEvent const &ev) { - call_with_reentrancy_guard( - [ev](OrderServices &self) { self._child_update_cb(ev); }); - } + void on_child_update(OrderStateUpdateEvent const &ev); - void warm_up_activate_child(Order &o) { o.warm_up_activate(*_data, *this); } + void warm_up_activate_child(Order &o); OrderOpResult check_is_attachable(); bool has_reported_state() const; @@ -342,5 +239,153 @@ class OrderServices { _position_update_sub; EventStream _create_order_reply; }; // namespace orderman -} // namespace orderman -} // namespace bts + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +inline void OrderServices::queue_order_msg(SessionServices &ss, OP const &msg) { + ss.queue_order_msg(msg, corid()); +} + +// Subscriptions ------------------------------ + +// Book +template +inline OrderServices::BookSubID OrderServices::subscribe_to_book( + SecurityKey k, CB &&cb) { + return _book_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} + +// Trade Signal +using TradeSignalID = EventStream::SubID; +template +inline TradeSignalID OrderServices::subscribe_to_trade_signal( + SecurityKey k, CB &&cb) { + return _trade_signal_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} + +// Ticker +using TickerSubID = EventStream::SubID; +template +inline TickerSubID OrderServices::subscribe_to_ticker(SecurityKey k, CB &&cb) { + return _ticker_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} + +// Trading Status +using StatusSubID = EventStream::SubID; +template +inline StatusSubID OrderServices::subscribe_to_status(SecurityKey k, CB &&cb) { + return _status_updates.sub( + k, [this, cb](const auto &ev) { this->on_external_event(ev, cb); }); +} + +// Settlement +using SettlementSubID = EventStream::SubID; +template +inline SettlementSubID OrderServices::subscribe_to_settlements( + SecurityKey k, CB &&cb) { + return _settlement_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} + +// Time +template +inline void OrderServices::subscribe_to_time(CB &&cb) { + _time_change_sub = _time_change.sub( + [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} +// Time + +// Position Updates +template +inline void OrderServices::subscribe_to_position_updates(CB &&cb) { + _position_update_sub = _position_update.sub( + [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} +// Position Updates + +// Execution Reports +using ExeReportSubID = EventStream::SubID; +template +inline ExeReportSubID OrderServices::subscribe_to_exe_report( + SessionServices &ss, OrderKey k, CB &&cb) { + return ss.subscribe_to_exe_report( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} +// Execution Reports + +// Cancel Reject +using CancelRejectSubID = EventStream::SubID; +template +inline CancelRejectSubID OrderServices::subscribe_to_cancel_reject( + SessionServices &ss, OrderKey k, CB &&cb) { + return ss.subscribe_to_cancel_reject( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} +// Cancel Reject + +// Gateway Status +template +inline void OrderServices::subscribe_to_gateway_status( + SessionServices &ss, CB &&cb) { + ss.subscribe_to_gateway_status( + [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); +} +// Gateway Status + +template +inline void OrderServices::subscribe_to_child_updates(CB &&cb) { + _child_update_cb = cb; +} + +template +inline void OrderServices::on_external_event(EV const &ev, C const &c) { + bts_assert(!_busy); + _busy = true; + c(ev); + for (size_t i = 0; i < _pending_calls.size(); i++) { + auto c = _pending_calls[i]; + c(*this); + } + _pending_calls.clear(); + _busy = false; +} + +template +inline void OrderServices::call_with_reentrancy_guard(C const &c) { + if (_busy) + _pending_calls.emplace_back(c); + else { + _busy = true; + c(*this); + for (size_t i = 0; i < _pending_calls.size(); i++) { + auto c = _pending_calls[i]; + c(*this); + } + _pending_calls.clear(); + _busy = false; + } +} + +template +inline OrderServices::CreateOrderReplySubID +OrderServices::subscribe_to_order_creation_reply(size_t req_id, CB &&cb) { + return _create_order_reply.sub(req_id, std::forward(cb)); +} + +// Activate this order +template +inline void OrderServices::activate( + Price p, Quantity q, CB const &on_order_op) { + bts_assert(_owner->def()); + call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_activate(p, q, self)); + }); +} + +} // namespace bts::orderman From aee394a792647ccb9a95a944c59812c645174433 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:09:27 -0400 Subject: [PATCH 030/100] refactor (flatten): Move Governor.h out of own dir --- src/lib/orderman/{governor => }/Governor.h | 0 src/lib/orderman/actors/order_manager/OrderServices.h | 2 +- src/lib/orderman/actors/order_manager/OrderServicesData.h | 2 +- src/lib/orderman/actors/order_manager/SessionServices.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/lib/orderman/{governor => }/Governor.h (100%) diff --git a/src/lib/orderman/governor/Governor.h b/src/lib/orderman/Governor.h similarity index 100% rename from src/lib/orderman/governor/Governor.h rename to src/lib/orderman/Governor.h diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 6cdb7f801..2433e7f93 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -9,7 +9,7 @@ #include "lib/orderman/events/FilledPositionEvent.h" #include "lib/orderman/events/StatusUpdateEvent.h" #include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/governor/Governor.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index bdc7e1829..894bd63f9 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -32,7 +32,7 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/TradeSignalEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/governor/Governor.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/Puid.h" diff --git a/src/lib/orderman/actors/order_manager/SessionServices.h b/src/lib/orderman/actors/order_manager/SessionServices.h index 6461b007c..36ca69440 100644 --- a/src/lib/orderman/actors/order_manager/SessionServices.h +++ b/src/lib/orderman/actors/order_manager/SessionServices.h @@ -6,7 +6,7 @@ #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/governor/Governor.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" From 7e2b21602a4d3dd0762879947b02a8a1f13dd644 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:13:19 -0400 Subject: [PATCH 031/100] refactor: Move Governor defs to .cpp --- src/lib/orderman/Governor.cpp | 30 ++++++++++++++++++++++++++++++ src/lib/orderman/Governor.h | 32 ++++++-------------------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 src/lib/orderman/Governor.cpp diff --git a/src/lib/orderman/Governor.cpp b/src/lib/orderman/Governor.cpp new file mode 100644 index 000000000..680628073 --- /dev/null +++ b/src/lib/orderman/Governor.cpp @@ -0,0 +1,30 @@ +#include "Governor.h" + +namespace bts::orderman { + +Governor::Governor( + uint32_t max_msgs_window, uint32_t window_duration_msecs, TimeStamp now) + : _max_msgs_window(max_msgs_window), + _window_duration_msecs(window_duration_msecs), _start_of_window(now), + _msgs_in_window(0) {} + +bool Governor::can_send(TimeStamp now) const { + if (in_window_(now)) + return _msgs_in_window < _max_msgs_window; + else + return true; +} + +void Governor::record_sent(TimeStamp now) { + if (!in_window_(now)) { + _start_of_window = now; + _msgs_in_window = 0; + } + _msgs_in_window++; +} + +bool Governor::in_window_(TimeStamp now) const { + return ms_diff(now, _start_of_window) <= _window_duration_msecs; +} + +} // namespace bts::orderman diff --git a/src/lib/orderman/Governor.h b/src/lib/orderman/Governor.h index f47bd9089..ece8f2805 100644 --- a/src/lib/orderman/Governor.h +++ b/src/lib/orderman/Governor.h @@ -1,40 +1,21 @@ #pragma once - #include "lib/utils/bts_chrono.h" #include -namespace bts { -namespace orderman { +namespace bts::orderman { class Governor { public: Governor( uint32_t max_msgs_window, uint32_t window_duration_msecs, - TimeStamp now = Timer::now()) - : _max_msgs_window(max_msgs_window), - _window_duration_msecs(window_duration_msecs), _start_of_window(now), - _msgs_in_window(0) {} + TimeStamp now = Timer::now()); - bool can_send(TimeStamp now = Timer::now()) const { - if (in_window(now)) - return _msgs_in_window < _max_msgs_window; - else - return true; - } - - void record_sent(TimeStamp now = Timer::now()) { - if (!in_window(now)) { - _start_of_window = now; - _msgs_in_window = 0; - } - _msgs_in_window++; - } + bool can_send(TimeStamp now = Timer::now()) const; + void record_sent(TimeStamp now = Timer::now()); private: - bool in_window(TimeStamp now) const { - return ms_diff(now, _start_of_window) <= _window_duration_msecs; - } + bool in_window_(TimeStamp now) const; uint32_t _max_msgs_window; uint32_t _window_duration_msecs; @@ -42,5 +23,4 @@ class Governor { uint64_t _msgs_in_window; }; -} // namespace orderman -} // namespace bts +} // namespace bts::orderman From 903e59a81447c69ecffe159d817dcac66fb32dca Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:24:13 -0400 Subject: [PATCH 032/100] refactor: Move order msg classes to own files --- src/lib/orderman/CancelOrderMsg.h | 16 ++++++++ src/lib/orderman/CancelReplaceOrderMsg.h | 12 ++++++ src/lib/orderman/CreateOrderMsg.h | 20 ++++++++++ src/lib/orderman/OrderMsg.h | 12 ++++++ src/lib/orderman/actors/IExecutionGateway.h | 44 ++++----------------- 5 files changed, 67 insertions(+), 37 deletions(-) create mode 100644 src/lib/orderman/CancelOrderMsg.h create mode 100644 src/lib/orderman/CancelReplaceOrderMsg.h create mode 100644 src/lib/orderman/CreateOrderMsg.h create mode 100644 src/lib/orderman/OrderMsg.h diff --git a/src/lib/orderman/CancelOrderMsg.h b/src/lib/orderman/CancelOrderMsg.h new file mode 100644 index 000000000..97b13c899 --- /dev/null +++ b/src/lib/orderman/CancelOrderMsg.h @@ -0,0 +1,16 @@ +#pragma once +#include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts::orderman { + +struct CancelOrderMsg { + OrderKey key; + ExchangeOrderID64 exchange_order_id; + api::orderman::ManualOrderIndicator manual_order_indicator; + api::Security const *security; + api::orderman::RoutingRecord const *routing_record; + api::Side side; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/CancelReplaceOrderMsg.h b/src/lib/orderman/CancelReplaceOrderMsg.h new file mode 100644 index 000000000..b3b314e02 --- /dev/null +++ b/src/lib/orderman/CancelReplaceOrderMsg.h @@ -0,0 +1,12 @@ +#pragma once +#include "lib/orderman/CreateOrderMsg.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts::orderman { + +struct CancelReplaceOrderMsg { + CreateOrderMsg create_fields; + ExchangeOrderID64 exchange_order_id; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/CreateOrderMsg.h b/src/lib/orderman/CreateOrderMsg.h new file mode 100644 index 000000000..90f05d315 --- /dev/null +++ b/src/lib/orderman/CreateOrderMsg.h @@ -0,0 +1,20 @@ +#pragma once +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts::orderman { + +struct CreateOrderMsg { + OrderKey key; + Price price; + Quantity quantity; + api::Security const *security; + api::Side side; + Price stop_px; + Quantity display_quantity; + api::orderman::NativeOrderType order_type; + api::orderman::TimeInForce time_in_force; + api::orderman::ManualOrderIndicator manual_order_indicator; + api::orderman::RoutingRecord const *routing_record; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/OrderMsg.h b/src/lib/orderman/OrderMsg.h new file mode 100644 index 000000000..0b53488c0 --- /dev/null +++ b/src/lib/orderman/OrderMsg.h @@ -0,0 +1,12 @@ +#pragma once +#include "lib/orderman/CancelOrderMsg.h" +#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "lib/orderman/CreateOrderMsg.h" +#include + +namespace bts::orderman { + +using OrderMsg = + std::variant; + +} // namespace bts::orderman diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/actors/IExecutionGateway.h index 28612ada5..ed8023375 100644 --- a/src/lib/orderman/actors/IExecutionGateway.h +++ b/src/lib/orderman/actors/IExecutionGateway.h @@ -5,54 +5,25 @@ #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/md/SecurityOracle.h" #include "lib/mercury/events/Update.h" +#include "lib/orderman/OrderMsg.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_no_copy.h" #include #include -namespace bts { -namespace trace { +namespace bts::trace { struct CorID; class PerfLog; -} // namespace trace -namespace orderman { +} // namespace bts::trace + +namespace bts::orderman { + class NewSecuritiesEvent; class NewAdminDataEvent; class ExecutionReport; class CancelReject; -struct CreateOrderMsg { - OrderKey key; - Price price; - Quantity quantity; - api::Security const *security; - api::Side side; - Price stop_px; - Quantity display_quantity; - api::orderman::NativeOrderType order_type; - api::orderman::TimeInForce time_in_force; - api::orderman::ManualOrderIndicator manual_order_indicator; - api::orderman::RoutingRecord const *routing_record; -}; - -struct CancelReplaceOrderMsg { - CreateOrderMsg create_fields; - ExchangeOrderID64 exchange_order_id; -}; - -struct CancelOrderMsg { - OrderKey key; - ExchangeOrderID64 exchange_order_id; - api::orderman::ManualOrderIndicator manual_order_indicator; - api::Security const *security; - api::orderman::RoutingRecord const *routing_record; - api::Side side; -}; - -using OrderMsg = - std::variant; - using OnGwStatusChange = std::function; using OnExeReport = std::function; @@ -86,5 +57,4 @@ class ExecutionGatewayFactory { md::SecurityOracle); }; -} // namespace orderman -} // namespace bts +} // namespace bts::orderman From 014effef908277f7248ca672438ac58d9610a0c1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:36:05 -0400 Subject: [PATCH 033/100] refactor: Move IExchangeGateways to gateways dir --- src/lib/orderman/actors/ilink3/IL3GW.h | 22 +++++++++---------- .../actors/order_manager/OrderServicesData.h | 4 ++-- .../GLBXExecutionGateway.cpp | 0 .../GLBXExecutionGateway.h | 0 .../GLBXiLink3ExecutionGateway.cpp | 4 ++-- .../GLBXiLink3ExecutionGateway.h | 0 .../ICEExecutionGateway.cpp | 0 .../ICEExecutionGateway.h | 0 .../IExecutionGateway.cpp | 6 ++--- .../{actors => gateways}/IExecutionGateway.h | 0 .../orders/glbx/iLink3OrderEncoder.cpp | 2 +- 11 files changed, 18 insertions(+), 20 deletions(-) rename src/lib/orderman/{actors => gateways}/GLBXExecutionGateway.cpp (100%) rename src/lib/orderman/{actors => gateways}/GLBXExecutionGateway.h (100%) rename src/lib/orderman/{actors => gateways}/GLBXiLink3ExecutionGateway.cpp (98%) rename src/lib/orderman/{actors => gateways}/GLBXiLink3ExecutionGateway.h (100%) rename src/lib/orderman/{actors => gateways}/ICEExecutionGateway.cpp (100%) rename src/lib/orderman/{actors => gateways}/ICEExecutionGateway.h (100%) rename src/lib/orderman/{actors => gateways}/IExecutionGateway.cpp (81%) rename src/lib/orderman/{actors => gateways}/IExecutionGateway.h (100%) diff --git a/src/lib/orderman/actors/ilink3/IL3GW.h b/src/lib/orderman/actors/ilink3/IL3GW.h index f18b1871f..0c10e4884 100644 --- a/src/lib/orderman/actors/ilink3/IL3GW.h +++ b/src/lib/orderman/actors/ilink3/IL3GW.h @@ -1,22 +1,20 @@ #pragma once +#include "IL3Connection.h" +#include "IL3ConnectionHandler.h" +#include "IL3GeneratedFwd.h" +#include "IL3Parser.h" +#include "TimeKeeper.h" +#include "generated/MessageHeader.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/orderman/actors/ilink3/RawMsg.h" +#include "lib/orderman/gateways/IExecutionGateway.h" +#include "lib/orderman/orderman_utils/CancelReject.h" #include #include #include #include #include -#include "../IExecutionGateway.h" -#include "IL3Connection.h" -#include "IL3ConnectionHandler.h" -#include "TimeKeeper.h" - -#include "IL3GeneratedFwd.h" -#include "IL3Parser.h" -#include "generated/MessageHeader.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/actors/ilink3/RawMsg.h" -#include "lib/orderman/orderman_utils/CancelReject.h" - #define MID_SESSION_REPLAY namespace bts { diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 894bd63f9..436efc334 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -9,7 +9,7 @@ #include "lib/md/SecurityOracle.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/actors/IExecutionGateway.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/actors/order_manager/PositionIndex.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" @@ -32,7 +32,7 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/TradeSignalEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/Governor.h" +#include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/Puid.h" diff --git a/src/lib/orderman/actors/GLBXExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXExecutionGateway.cpp similarity index 100% rename from src/lib/orderman/actors/GLBXExecutionGateway.cpp rename to src/lib/orderman/gateways/GLBXExecutionGateway.cpp diff --git a/src/lib/orderman/actors/GLBXExecutionGateway.h b/src/lib/orderman/gateways/GLBXExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/GLBXExecutionGateway.h rename to src/lib/orderman/gateways/GLBXExecutionGateway.h diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp similarity index 98% rename from src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp rename to src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index dc55cdbe1..c644ea55b 100644 --- a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -1,16 +1,16 @@ -#include "lib/orderman/actors/GLBXiLink3ExecutionGateway.h" +#include "GLBXiLink3ExecutionGateway.h" #include "lib/config/config.h" #include "lib/config/protos/orderman_cfg.pb.h" #include "lib/domain_model/Security.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/store/session_name.h" -#include "lib/orderman/actors/GLBXExecutionGateway.h" #include "lib/orderman/actors/ilink3/IL3GW.h" #include "lib/orderman/actors/ilink3/IL3MessageFramer.h" #include "lib/orderman/actors/ilink3/IL3Reactor.h" #include "lib/orderman/actors/ilink3/IL3SecDB.h" #include "lib/orderman/actors/ilink3/SessionStore.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/gateways/GLBXExecutionGateway.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h rename to src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/gateways/ICEExecutionGateway.cpp similarity index 100% rename from src/lib/orderman/actors/ICEExecutionGateway.cpp rename to src/lib/orderman/gateways/ICEExecutionGateway.cpp diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/gateways/ICEExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/ICEExecutionGateway.h rename to src/lib/orderman/gateways/ICEExecutionGateway.h diff --git a/src/lib/orderman/actors/IExecutionGateway.cpp b/src/lib/orderman/gateways/IExecutionGateway.cpp similarity index 81% rename from src/lib/orderman/actors/IExecutionGateway.cpp rename to src/lib/orderman/gateways/IExecutionGateway.cpp index f03c728ef..0a0b6451c 100644 --- a/src/lib/orderman/actors/IExecutionGateway.cpp +++ b/src/lib/orderman/gateways/IExecutionGateway.cpp @@ -1,8 +1,8 @@ #include "IExecutionGateway.h" -#include "GLBXExecutionGateway.h" -#include "ICEExecutionGateway.h" -#include "lib/orderman/actors/GLBXiLink3ExecutionGateway.h" +#include "lib/orderman/gateways/GLBXExecutionGateway.h" +#include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" #include "lib/utils/ValueWrapper.h" #include diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/gateways/IExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/IExecutionGateway.h rename to src/lib/orderman/gateways/IExecutionGateway.h diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp index e6d58cdbe..c079d2040 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp +++ b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp @@ -2,7 +2,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" -#include "lib/orderman/actors/IExecutionGateway.h" +#include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" From cc81fd32446a1f0d6946b88981f09e32a2148169 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:49:54 -0400 Subject: [PATCH 034/100] refactor (flatten): Move ilink3 dir to lib/orderman --- .../gateways/GLBXiLink3ExecutionGateway.cpp | 10 +++++----- .../orderman/{actors => }/ilink3/IL3Connection.h | 0 .../{actors => }/ilink3/IL3ConnectionHandler.cpp | 0 .../{actors => }/ilink3/IL3ConnectionHandler.h | 0 .../orderman/{actors => }/ilink3/IL3Dispatcher.h | 0 src/lib/orderman/{actors => }/ilink3/IL3GW.cpp | 0 src/lib/orderman/{actors => }/ilink3/IL3GW.h | 2 +- .../orderman/{actors => }/ilink3/IL3GeneratedFull.h | 0 .../orderman/{actors => }/ilink3/IL3GeneratedFwd.h | 0 .../orderman/{actors => }/ilink3/IL3MessageFramer.h | 0 src/lib/orderman/{actors => }/ilink3/IL3Parser.cpp | 2 +- src/lib/orderman/{actors => }/ilink3/IL3Parser.h | 0 src/lib/orderman/{actors => }/ilink3/IL3Reactor.cpp | 0 src/lib/orderman/{actors => }/ilink3/IL3Reactor.h | 0 .../orderman/{actors => }/ilink3/IL3ReceiveBuffer.h | 0 src/lib/orderman/{actors => }/ilink3/IL3SecDB.h | 0 .../orderman/{actors => }/ilink3/ILink3Utils.cpp | 0 src/lib/orderman/{actors => }/ilink3/ILink3Utils.h | 0 src/lib/orderman/{actors => }/ilink3/RawMsg.h | 0 .../orderman/{actors => }/ilink3/SessionStore.cpp | 4 ++-- src/lib/orderman/{actors => }/ilink3/SessionStore.h | 0 src/lib/orderman/{actors => }/ilink3/TimeKeeper.h | 0 .../{actors => }/ilink3/generated/AvgPxInd.h | 0 .../{actors => }/ilink3/generated/BooleanFlag.h | 0 .../{actors => }/ilink3/generated/BooleanNULL.h | 0 .../ilink3/generated/BusinessReject521.h | 0 .../ilink3/generated/ClearingAcctType.h | 0 .../{actors => }/ilink3/generated/CmtaGiveUpCD.h | 0 .../ilink3/generated/CustOrdHandlInst.h | 0 .../ilink3/generated/CustOrderCapacity.h | 0 .../orderman/{actors => }/ilink3/generated/DATA.h | 0 .../{actors => }/ilink3/generated/DKReason.h | 0 .../{actors => }/ilink3/generated/Decimal32NULL.h | 0 .../{actors => }/ilink3/generated/Decimal64NULL.h | 0 .../{actors => }/ilink3/generated/Establish503.h | 0 .../ilink3/generated/EstablishmentAck504.h | 0 .../ilink3/generated/EstablishmentReject505.h | 0 .../{actors => }/ilink3/generated/ExecAckStatus.h | 0 .../{actors => }/ilink3/generated/ExecInst.h | 0 .../{actors => }/ilink3/generated/ExecMode.h | 0 .../{actors => }/ilink3/generated/ExecReason.h | 0 .../{actors => }/ilink3/generated/ExecTypTrdCxl.h | 0 .../{actors => }/ilink3/generated/ExecutionAck539.h | 0 .../ilink3/generated/ExecutionReportCancel534.h | 0 .../generated/ExecutionReportElimination524.h | 0 .../ilink3/generated/ExecutionReportModify531.h | 0 .../ilink3/generated/ExecutionReportNew522.h | 0 .../ilink3/generated/ExecutionReportReject523.h | 0 .../ilink3/generated/ExecutionReportStatus532.h | 0 .../ExecutionReportTradeAddendumOutright548.h | 0 .../ExecutionReportTradeAddendumSpread549.h | 0 .../ExecutionReportTradeAddendumSpreadLeg550.h | 0 .../generated/ExecutionReportTradeOutright525.h | 0 .../generated/ExecutionReportTradeSpread526.h | 0 .../generated/ExecutionReportTradeSpreadLeg527.h | 0 .../{actors => }/ilink3/generated/ExpCycle.h | 0 .../orderman/{actors => }/ilink3/generated/FTI.h | 0 .../{actors => }/ilink3/generated/GroupSize.h | 0 .../{actors => }/ilink3/generated/KeepAliveLapsed.h | 0 .../{actors => }/ilink3/generated/ListUpdAct.h | 0 .../{actors => }/ilink3/generated/ManualOrdInd.h | 0 .../{actors => }/ilink3/generated/ManualOrdIndReq.h | 0 .../ilink3/generated/MassActionOrdTyp.h | 0 .../ilink3/generated/MassActionResponse.h | 0 .../{actors => }/ilink3/generated/MassActionScope.h | 0 .../{actors => }/ilink3/generated/MassCancelTIF.h | 0 .../{actors => }/ilink3/generated/MassCxlReqTyp.h | 0 .../{actors => }/ilink3/generated/MassQuote517.h | 0 .../{actors => }/ilink3/generated/MassQuoteAck545.h | 0 .../ilink3/generated/MassStatusOrdTyp.h | 0 .../ilink3/generated/MassStatusReqTyp.h | 0 .../{actors => }/ilink3/generated/MassStatusTIF.h | 0 .../ilink3/generated/MaturityMonthYear.h | 0 .../{actors => }/ilink3/generated/MessageHeader.h | 0 .../{actors => }/ilink3/generated/Negotiate500.h | 0 .../ilink3/generated/NegotiationReject502.h | 0 .../ilink3/generated/NegotiationResponse501.h | 0 .../ilink3/generated/NewOrderCross544.h | 0 .../ilink3/generated/NewOrderSingle514.h | 0 .../{actors => }/ilink3/generated/NotApplied513.h | 0 .../{actors => }/ilink3/generated/OFMOverrideReq.h | 0 .../{actors => }/ilink3/generated/OrdStatusTrd.h | 0 .../{actors => }/ilink3/generated/OrdStatusTrdCxl.h | 0 .../ilink3/generated/OrderCancelReject535.h | 0 .../ilink3/generated/OrderCancelReplaceReject536.h | 0 .../ilink3/generated/OrderCancelReplaceRequest515.h | 0 .../ilink3/generated/OrderCancelRequest516.h | 0 .../{actors => }/ilink3/generated/OrderEventType.h | 0 .../ilink3/generated/OrderMassActionReport558.h | 0 .../ilink3/generated/OrderMassActionReport562.h | 0 .../ilink3/generated/OrderMassActionRequest529.h | 0 .../ilink3/generated/OrderMassStatusRequest530.h | 0 .../{actors => }/ilink3/generated/OrderStatus.h | 0 .../ilink3/generated/OrderStatusRequest533.h | 0 .../{actors => }/ilink3/generated/OrderType.h | 0 .../{actors => }/ilink3/generated/OrderTypeReq.h | 0 .../orderman/{actors => }/ilink3/generated/PRICE9.h | 0 .../{actors => }/ilink3/generated/PRICENULL9.h | 0 .../{actors => }/ilink3/generated/PartyDetailRole.h | 0 .../generated/PartyDetailsDefinitionRequest518.h | 0 .../generated/PartyDetailsDefinitionRequestAck519.h | 0 .../ilink3/generated/PartyDetailsListReport538.h | 0 .../ilink3/generated/PartyDetailsListRequest537.h | 0 .../{actors => }/ilink3/generated/QuoteAckStatus.h | 0 .../{actors => }/ilink3/generated/QuoteCancel528.h | 0 .../ilink3/generated/QuoteCancelAck547.h | 0 .../ilink3/generated/QuoteCancelAck563.h | 0 .../{actors => }/ilink3/generated/QuoteCxlStatus.h | 0 .../{actors => }/ilink3/generated/QuoteCxlTyp.h | 0 .../{actors => }/ilink3/generated/QuoteTyp.h | 0 .../{actors => }/ilink3/generated/README.txt | 0 .../{actors => }/ilink3/generated/RFQSide.h | 0 .../{actors => }/ilink3/generated/ReqResult.h | 0 .../ilink3/generated/RequestForQuote543.h | 0 .../ilink3/generated/RequestForQuoteAck546.h | 0 .../ilink3/generated/Retransmission509.h | 0 .../ilink3/generated/RetransmitReject510.h | 0 .../ilink3/generated/RetransmitRequest508.h | 0 .../orderman/{actors => }/ilink3/generated/SLEDS.h | 0 .../orderman/{actors => }/ilink3/generated/SMPI.h | 0 .../{actors => }/ilink3/generated/SecRspTyp.h | 0 .../ilink3/generated/SecurityDefinitionRequest560.h | 0 .../generated/SecurityDefinitionResponse561.h | 0 .../{actors => }/ilink3/generated/Sequence506.h | 0 .../{actors => }/ilink3/generated/ShortSaleType.h | 0 .../{actors => }/ilink3/generated/SideNULL.h | 0 .../{actors => }/ilink3/generated/SideReq.h | 0 .../{actors => }/ilink3/generated/SideTimeInForce.h | 0 .../{actors => }/ilink3/generated/SplitMsg.h | 0 .../{actors => }/ilink3/generated/Terminate507.h | 0 .../{actors => }/ilink3/generated/TimeInForce.h | 0 .../{actors => }/ilink3/generated/TradeAddendum.h | 0 .../{actors => }/ilink3/generated/generate.sh | 0 .../{actors => }/ilink3/generated/ilinkbinary.xml | 0 .../ilink3/generated/sbe-all-1.17.0.jar | Bin .../{actors => }/ilink3/test/IL3TestExchange.h | 0 .../{actors => }/ilink3/test/ILinkGWTests.cpp | 0 src/server/sparkd/cmds/CMECert.cpp | 10 ++++------ 138 files changed, 13 insertions(+), 15 deletions(-) rename src/lib/orderman/{actors => }/ilink3/IL3Connection.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3ConnectionHandler.cpp (100%) rename src/lib/orderman/{actors => }/ilink3/IL3ConnectionHandler.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3Dispatcher.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3GW.cpp (100%) rename src/lib/orderman/{actors => }/ilink3/IL3GW.h (99%) rename src/lib/orderman/{actors => }/ilink3/IL3GeneratedFull.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3GeneratedFwd.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3MessageFramer.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3Parser.cpp (99%) rename src/lib/orderman/{actors => }/ilink3/IL3Parser.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3Reactor.cpp (100%) rename src/lib/orderman/{actors => }/ilink3/IL3Reactor.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3ReceiveBuffer.h (100%) rename src/lib/orderman/{actors => }/ilink3/IL3SecDB.h (100%) rename src/lib/orderman/{actors => }/ilink3/ILink3Utils.cpp (100%) rename src/lib/orderman/{actors => }/ilink3/ILink3Utils.h (100%) rename src/lib/orderman/{actors => }/ilink3/RawMsg.h (100%) rename src/lib/orderman/{actors => }/ilink3/SessionStore.cpp (98%) rename src/lib/orderman/{actors => }/ilink3/SessionStore.h (100%) rename src/lib/orderman/{actors => }/ilink3/TimeKeeper.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/AvgPxInd.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/BooleanFlag.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/BooleanNULL.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/BusinessReject521.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ClearingAcctType.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/CmtaGiveUpCD.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/CustOrdHandlInst.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/CustOrderCapacity.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/DATA.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/DKReason.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Decimal32NULL.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Decimal64NULL.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Establish503.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/EstablishmentAck504.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/EstablishmentReject505.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecAckStatus.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecInst.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecMode.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecReason.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecTypTrdCxl.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionAck539.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportCancel534.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportElimination524.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportModify531.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportNew522.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportReject523.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportStatus532.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeAddendumOutright548.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeAddendumSpread549.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeOutright525.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeSpread526.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExecutionReportTradeSpreadLeg527.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ExpCycle.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/FTI.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/GroupSize.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/KeepAliveLapsed.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ListUpdAct.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ManualOrdInd.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ManualOrdIndReq.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassActionOrdTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassActionResponse.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassActionScope.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassCancelTIF.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassCxlReqTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassQuote517.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassQuoteAck545.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassStatusOrdTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassStatusReqTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MassStatusTIF.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MaturityMonthYear.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/MessageHeader.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Negotiate500.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/NegotiationReject502.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/NegotiationResponse501.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/NewOrderCross544.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/NewOrderSingle514.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/NotApplied513.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OFMOverrideReq.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrdStatusTrd.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrdStatusTrdCxl.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderCancelReject535.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderCancelReplaceReject536.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderCancelReplaceRequest515.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderCancelRequest516.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderEventType.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderMassActionReport558.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderMassActionReport562.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderMassActionRequest529.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderMassStatusRequest530.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderStatus.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderStatusRequest533.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderType.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/OrderTypeReq.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PRICE9.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PRICENULL9.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PartyDetailRole.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PartyDetailsDefinitionRequest518.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PartyDetailsDefinitionRequestAck519.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PartyDetailsListReport538.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/PartyDetailsListRequest537.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteAckStatus.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteCancel528.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteCancelAck547.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteCancelAck563.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteCxlStatus.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteCxlTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/QuoteTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/README.txt (100%) rename src/lib/orderman/{actors => }/ilink3/generated/RFQSide.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ReqResult.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/RequestForQuote543.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/RequestForQuoteAck546.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Retransmission509.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/RetransmitReject510.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/RetransmitRequest508.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SLEDS.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SMPI.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SecRspTyp.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SecurityDefinitionRequest560.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SecurityDefinitionResponse561.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Sequence506.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ShortSaleType.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SideNULL.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SideReq.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SideTimeInForce.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/SplitMsg.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/Terminate507.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/TimeInForce.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/TradeAddendum.h (100%) rename src/lib/orderman/{actors => }/ilink3/generated/generate.sh (100%) rename src/lib/orderman/{actors => }/ilink3/generated/ilinkbinary.xml (100%) rename src/lib/orderman/{actors => }/ilink3/generated/sbe-all-1.17.0.jar (100%) rename src/lib/orderman/{actors => }/ilink3/test/IL3TestExchange.h (100%) rename src/lib/orderman/{actors => }/ilink3/test/ILinkGWTests.cpp (100%) diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index c644ea55b..550556743 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -4,13 +4,13 @@ #include "lib/domain_model/Security.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/store/session_name.h" -#include "lib/orderman/actors/ilink3/IL3GW.h" -#include "lib/orderman/actors/ilink3/IL3MessageFramer.h" -#include "lib/orderman/actors/ilink3/IL3Reactor.h" -#include "lib/orderman/actors/ilink3/IL3SecDB.h" -#include "lib/orderman/actors/ilink3/SessionStore.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/gateways/GLBXExecutionGateway.h" +#include "lib/orderman/ilink3/IL3GW.h" +#include "lib/orderman/ilink3/IL3MessageFramer.h" +#include "lib/orderman/ilink3/IL3Reactor.h" +#include "lib/orderman/ilink3/IL3SecDB.h" +#include "lib/orderman/ilink3/SessionStore.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include diff --git a/src/lib/orderman/actors/ilink3/IL3Connection.h b/src/lib/orderman/ilink3/IL3Connection.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3Connection.h rename to src/lib/orderman/ilink3/IL3Connection.h diff --git a/src/lib/orderman/actors/ilink3/IL3ConnectionHandler.cpp b/src/lib/orderman/ilink3/IL3ConnectionHandler.cpp similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3ConnectionHandler.cpp rename to src/lib/orderman/ilink3/IL3ConnectionHandler.cpp diff --git a/src/lib/orderman/actors/ilink3/IL3ConnectionHandler.h b/src/lib/orderman/ilink3/IL3ConnectionHandler.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3ConnectionHandler.h rename to src/lib/orderman/ilink3/IL3ConnectionHandler.h diff --git a/src/lib/orderman/actors/ilink3/IL3Dispatcher.h b/src/lib/orderman/ilink3/IL3Dispatcher.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3Dispatcher.h rename to src/lib/orderman/ilink3/IL3Dispatcher.h diff --git a/src/lib/orderman/actors/ilink3/IL3GW.cpp b/src/lib/orderman/ilink3/IL3GW.cpp similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3GW.cpp rename to src/lib/orderman/ilink3/IL3GW.cpp diff --git a/src/lib/orderman/actors/ilink3/IL3GW.h b/src/lib/orderman/ilink3/IL3GW.h similarity index 99% rename from src/lib/orderman/actors/ilink3/IL3GW.h rename to src/lib/orderman/ilink3/IL3GW.h index 0c10e4884..fcf787d7f 100644 --- a/src/lib/orderman/actors/ilink3/IL3GW.h +++ b/src/lib/orderman/ilink3/IL3GW.h @@ -6,7 +6,7 @@ #include "TimeKeeper.h" #include "generated/MessageHeader.h" #include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/actors/ilink3/RawMsg.h" +#include "lib/orderman/ilink3/RawMsg.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/orderman_utils/CancelReject.h" #include diff --git a/src/lib/orderman/actors/ilink3/IL3GeneratedFull.h b/src/lib/orderman/ilink3/IL3GeneratedFull.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3GeneratedFull.h rename to src/lib/orderman/ilink3/IL3GeneratedFull.h diff --git a/src/lib/orderman/actors/ilink3/IL3GeneratedFwd.h b/src/lib/orderman/ilink3/IL3GeneratedFwd.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3GeneratedFwd.h rename to src/lib/orderman/ilink3/IL3GeneratedFwd.h diff --git a/src/lib/orderman/actors/ilink3/IL3MessageFramer.h b/src/lib/orderman/ilink3/IL3MessageFramer.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3MessageFramer.h rename to src/lib/orderman/ilink3/IL3MessageFramer.h diff --git a/src/lib/orderman/actors/ilink3/IL3Parser.cpp b/src/lib/orderman/ilink3/IL3Parser.cpp similarity index 99% rename from src/lib/orderman/actors/ilink3/IL3Parser.cpp rename to src/lib/orderman/ilink3/IL3Parser.cpp index 05640690f..c5532ecc5 100644 --- a/src/lib/orderman/actors/ilink3/IL3Parser.cpp +++ b/src/lib/orderman/ilink3/IL3Parser.cpp @@ -6,7 +6,7 @@ #include "ILink3Utils.h" #include "lib/domain_model/Security.h" #include "lib/md/IntPrice.h" -#include "lib/orderman/actors/ilink3/IL3SecDB.h" +#include "lib/orderman/ilink3/IL3SecDB.h" #include "lib/orderman/orderman_utils/CancelReject.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orderman_utils/orderman_common.h" diff --git a/src/lib/orderman/actors/ilink3/IL3Parser.h b/src/lib/orderman/ilink3/IL3Parser.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3Parser.h rename to src/lib/orderman/ilink3/IL3Parser.h diff --git a/src/lib/orderman/actors/ilink3/IL3Reactor.cpp b/src/lib/orderman/ilink3/IL3Reactor.cpp similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3Reactor.cpp rename to src/lib/orderman/ilink3/IL3Reactor.cpp diff --git a/src/lib/orderman/actors/ilink3/IL3Reactor.h b/src/lib/orderman/ilink3/IL3Reactor.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3Reactor.h rename to src/lib/orderman/ilink3/IL3Reactor.h diff --git a/src/lib/orderman/actors/ilink3/IL3ReceiveBuffer.h b/src/lib/orderman/ilink3/IL3ReceiveBuffer.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3ReceiveBuffer.h rename to src/lib/orderman/ilink3/IL3ReceiveBuffer.h diff --git a/src/lib/orderman/actors/ilink3/IL3SecDB.h b/src/lib/orderman/ilink3/IL3SecDB.h similarity index 100% rename from src/lib/orderman/actors/ilink3/IL3SecDB.h rename to src/lib/orderman/ilink3/IL3SecDB.h diff --git a/src/lib/orderman/actors/ilink3/ILink3Utils.cpp b/src/lib/orderman/ilink3/ILink3Utils.cpp similarity index 100% rename from src/lib/orderman/actors/ilink3/ILink3Utils.cpp rename to src/lib/orderman/ilink3/ILink3Utils.cpp diff --git a/src/lib/orderman/actors/ilink3/ILink3Utils.h b/src/lib/orderman/ilink3/ILink3Utils.h similarity index 100% rename from src/lib/orderman/actors/ilink3/ILink3Utils.h rename to src/lib/orderman/ilink3/ILink3Utils.h diff --git a/src/lib/orderman/actors/ilink3/RawMsg.h b/src/lib/orderman/ilink3/RawMsg.h similarity index 100% rename from src/lib/orderman/actors/ilink3/RawMsg.h rename to src/lib/orderman/ilink3/RawMsg.h diff --git a/src/lib/orderman/actors/ilink3/SessionStore.cpp b/src/lib/orderman/ilink3/SessionStore.cpp similarity index 98% rename from src/lib/orderman/actors/ilink3/SessionStore.cpp rename to src/lib/orderman/ilink3/SessionStore.cpp index 6f0870074..c79bb8a61 100644 --- a/src/lib/orderman/actors/ilink3/SessionStore.cpp +++ b/src/lib/orderman/ilink3/SessionStore.cpp @@ -1,7 +1,7 @@ #include "SessionStore.h" #include "lib/jetfix/store/session_name.h" -#include "lib/orderman/actors/ilink3/IL3GW.h" -#include "lib/orderman/actors/ilink3/IL3SecDB.h" +#include "lib/orderman/ilink3/IL3GW.h" +#include "lib/orderman/ilink3/IL3SecDB.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/utils/base64.hpp" #include "lib/utils/bts_chrono.h" diff --git a/src/lib/orderman/actors/ilink3/SessionStore.h b/src/lib/orderman/ilink3/SessionStore.h similarity index 100% rename from src/lib/orderman/actors/ilink3/SessionStore.h rename to src/lib/orderman/ilink3/SessionStore.h diff --git a/src/lib/orderman/actors/ilink3/TimeKeeper.h b/src/lib/orderman/ilink3/TimeKeeper.h similarity index 100% rename from src/lib/orderman/actors/ilink3/TimeKeeper.h rename to src/lib/orderman/ilink3/TimeKeeper.h diff --git a/src/lib/orderman/actors/ilink3/generated/AvgPxInd.h b/src/lib/orderman/ilink3/generated/AvgPxInd.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/AvgPxInd.h rename to src/lib/orderman/ilink3/generated/AvgPxInd.h diff --git a/src/lib/orderman/actors/ilink3/generated/BooleanFlag.h b/src/lib/orderman/ilink3/generated/BooleanFlag.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/BooleanFlag.h rename to src/lib/orderman/ilink3/generated/BooleanFlag.h diff --git a/src/lib/orderman/actors/ilink3/generated/BooleanNULL.h b/src/lib/orderman/ilink3/generated/BooleanNULL.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/BooleanNULL.h rename to src/lib/orderman/ilink3/generated/BooleanNULL.h diff --git a/src/lib/orderman/actors/ilink3/generated/BusinessReject521.h b/src/lib/orderman/ilink3/generated/BusinessReject521.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/BusinessReject521.h rename to src/lib/orderman/ilink3/generated/BusinessReject521.h diff --git a/src/lib/orderman/actors/ilink3/generated/ClearingAcctType.h b/src/lib/orderman/ilink3/generated/ClearingAcctType.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ClearingAcctType.h rename to src/lib/orderman/ilink3/generated/ClearingAcctType.h diff --git a/src/lib/orderman/actors/ilink3/generated/CmtaGiveUpCD.h b/src/lib/orderman/ilink3/generated/CmtaGiveUpCD.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/CmtaGiveUpCD.h rename to src/lib/orderman/ilink3/generated/CmtaGiveUpCD.h diff --git a/src/lib/orderman/actors/ilink3/generated/CustOrdHandlInst.h b/src/lib/orderman/ilink3/generated/CustOrdHandlInst.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/CustOrdHandlInst.h rename to src/lib/orderman/ilink3/generated/CustOrdHandlInst.h diff --git a/src/lib/orderman/actors/ilink3/generated/CustOrderCapacity.h b/src/lib/orderman/ilink3/generated/CustOrderCapacity.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/CustOrderCapacity.h rename to src/lib/orderman/ilink3/generated/CustOrderCapacity.h diff --git a/src/lib/orderman/actors/ilink3/generated/DATA.h b/src/lib/orderman/ilink3/generated/DATA.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/DATA.h rename to src/lib/orderman/ilink3/generated/DATA.h diff --git a/src/lib/orderman/actors/ilink3/generated/DKReason.h b/src/lib/orderman/ilink3/generated/DKReason.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/DKReason.h rename to src/lib/orderman/ilink3/generated/DKReason.h diff --git a/src/lib/orderman/actors/ilink3/generated/Decimal32NULL.h b/src/lib/orderman/ilink3/generated/Decimal32NULL.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Decimal32NULL.h rename to src/lib/orderman/ilink3/generated/Decimal32NULL.h diff --git a/src/lib/orderman/actors/ilink3/generated/Decimal64NULL.h b/src/lib/orderman/ilink3/generated/Decimal64NULL.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Decimal64NULL.h rename to src/lib/orderman/ilink3/generated/Decimal64NULL.h diff --git a/src/lib/orderman/actors/ilink3/generated/Establish503.h b/src/lib/orderman/ilink3/generated/Establish503.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Establish503.h rename to src/lib/orderman/ilink3/generated/Establish503.h diff --git a/src/lib/orderman/actors/ilink3/generated/EstablishmentAck504.h b/src/lib/orderman/ilink3/generated/EstablishmentAck504.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/EstablishmentAck504.h rename to src/lib/orderman/ilink3/generated/EstablishmentAck504.h diff --git a/src/lib/orderman/actors/ilink3/generated/EstablishmentReject505.h b/src/lib/orderman/ilink3/generated/EstablishmentReject505.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/EstablishmentReject505.h rename to src/lib/orderman/ilink3/generated/EstablishmentReject505.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecAckStatus.h b/src/lib/orderman/ilink3/generated/ExecAckStatus.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecAckStatus.h rename to src/lib/orderman/ilink3/generated/ExecAckStatus.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecInst.h b/src/lib/orderman/ilink3/generated/ExecInst.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecInst.h rename to src/lib/orderman/ilink3/generated/ExecInst.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecMode.h b/src/lib/orderman/ilink3/generated/ExecMode.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecMode.h rename to src/lib/orderman/ilink3/generated/ExecMode.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecReason.h b/src/lib/orderman/ilink3/generated/ExecReason.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecReason.h rename to src/lib/orderman/ilink3/generated/ExecReason.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecTypTrdCxl.h b/src/lib/orderman/ilink3/generated/ExecTypTrdCxl.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecTypTrdCxl.h rename to src/lib/orderman/ilink3/generated/ExecTypTrdCxl.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionAck539.h b/src/lib/orderman/ilink3/generated/ExecutionAck539.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionAck539.h rename to src/lib/orderman/ilink3/generated/ExecutionAck539.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportCancel534.h b/src/lib/orderman/ilink3/generated/ExecutionReportCancel534.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportCancel534.h rename to src/lib/orderman/ilink3/generated/ExecutionReportCancel534.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportElimination524.h b/src/lib/orderman/ilink3/generated/ExecutionReportElimination524.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportElimination524.h rename to src/lib/orderman/ilink3/generated/ExecutionReportElimination524.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportModify531.h b/src/lib/orderman/ilink3/generated/ExecutionReportModify531.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportModify531.h rename to src/lib/orderman/ilink3/generated/ExecutionReportModify531.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportNew522.h b/src/lib/orderman/ilink3/generated/ExecutionReportNew522.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportNew522.h rename to src/lib/orderman/ilink3/generated/ExecutionReportNew522.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportReject523.h b/src/lib/orderman/ilink3/generated/ExecutionReportReject523.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportReject523.h rename to src/lib/orderman/ilink3/generated/ExecutionReportReject523.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportStatus532.h b/src/lib/orderman/ilink3/generated/ExecutionReportStatus532.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportStatus532.h rename to src/lib/orderman/ilink3/generated/ExecutionReportStatus532.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumOutright548.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumOutright548.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumSpread549.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumSpread549.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeOutright525.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeOutright525.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeOutright525.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeOutright525.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeSpread526.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeSpread526.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeSpread526.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeSpread526.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeSpreadLeg527.h b/src/lib/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExecutionReportTradeSpreadLeg527.h rename to src/lib/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h diff --git a/src/lib/orderman/actors/ilink3/generated/ExpCycle.h b/src/lib/orderman/ilink3/generated/ExpCycle.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ExpCycle.h rename to src/lib/orderman/ilink3/generated/ExpCycle.h diff --git a/src/lib/orderman/actors/ilink3/generated/FTI.h b/src/lib/orderman/ilink3/generated/FTI.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/FTI.h rename to src/lib/orderman/ilink3/generated/FTI.h diff --git a/src/lib/orderman/actors/ilink3/generated/GroupSize.h b/src/lib/orderman/ilink3/generated/GroupSize.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/GroupSize.h rename to src/lib/orderman/ilink3/generated/GroupSize.h diff --git a/src/lib/orderman/actors/ilink3/generated/KeepAliveLapsed.h b/src/lib/orderman/ilink3/generated/KeepAliveLapsed.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/KeepAliveLapsed.h rename to src/lib/orderman/ilink3/generated/KeepAliveLapsed.h diff --git a/src/lib/orderman/actors/ilink3/generated/ListUpdAct.h b/src/lib/orderman/ilink3/generated/ListUpdAct.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ListUpdAct.h rename to src/lib/orderman/ilink3/generated/ListUpdAct.h diff --git a/src/lib/orderman/actors/ilink3/generated/ManualOrdInd.h b/src/lib/orderman/ilink3/generated/ManualOrdInd.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ManualOrdInd.h rename to src/lib/orderman/ilink3/generated/ManualOrdInd.h diff --git a/src/lib/orderman/actors/ilink3/generated/ManualOrdIndReq.h b/src/lib/orderman/ilink3/generated/ManualOrdIndReq.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ManualOrdIndReq.h rename to src/lib/orderman/ilink3/generated/ManualOrdIndReq.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassActionOrdTyp.h b/src/lib/orderman/ilink3/generated/MassActionOrdTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassActionOrdTyp.h rename to src/lib/orderman/ilink3/generated/MassActionOrdTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassActionResponse.h b/src/lib/orderman/ilink3/generated/MassActionResponse.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassActionResponse.h rename to src/lib/orderman/ilink3/generated/MassActionResponse.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassActionScope.h b/src/lib/orderman/ilink3/generated/MassActionScope.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassActionScope.h rename to src/lib/orderman/ilink3/generated/MassActionScope.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassCancelTIF.h b/src/lib/orderman/ilink3/generated/MassCancelTIF.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassCancelTIF.h rename to src/lib/orderman/ilink3/generated/MassCancelTIF.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassCxlReqTyp.h b/src/lib/orderman/ilink3/generated/MassCxlReqTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassCxlReqTyp.h rename to src/lib/orderman/ilink3/generated/MassCxlReqTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassQuote517.h b/src/lib/orderman/ilink3/generated/MassQuote517.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassQuote517.h rename to src/lib/orderman/ilink3/generated/MassQuote517.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassQuoteAck545.h b/src/lib/orderman/ilink3/generated/MassQuoteAck545.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassQuoteAck545.h rename to src/lib/orderman/ilink3/generated/MassQuoteAck545.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassStatusOrdTyp.h b/src/lib/orderman/ilink3/generated/MassStatusOrdTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassStatusOrdTyp.h rename to src/lib/orderman/ilink3/generated/MassStatusOrdTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassStatusReqTyp.h b/src/lib/orderman/ilink3/generated/MassStatusReqTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassStatusReqTyp.h rename to src/lib/orderman/ilink3/generated/MassStatusReqTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/MassStatusTIF.h b/src/lib/orderman/ilink3/generated/MassStatusTIF.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MassStatusTIF.h rename to src/lib/orderman/ilink3/generated/MassStatusTIF.h diff --git a/src/lib/orderman/actors/ilink3/generated/MaturityMonthYear.h b/src/lib/orderman/ilink3/generated/MaturityMonthYear.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MaturityMonthYear.h rename to src/lib/orderman/ilink3/generated/MaturityMonthYear.h diff --git a/src/lib/orderman/actors/ilink3/generated/MessageHeader.h b/src/lib/orderman/ilink3/generated/MessageHeader.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/MessageHeader.h rename to src/lib/orderman/ilink3/generated/MessageHeader.h diff --git a/src/lib/orderman/actors/ilink3/generated/Negotiate500.h b/src/lib/orderman/ilink3/generated/Negotiate500.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Negotiate500.h rename to src/lib/orderman/ilink3/generated/Negotiate500.h diff --git a/src/lib/orderman/actors/ilink3/generated/NegotiationReject502.h b/src/lib/orderman/ilink3/generated/NegotiationReject502.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/NegotiationReject502.h rename to src/lib/orderman/ilink3/generated/NegotiationReject502.h diff --git a/src/lib/orderman/actors/ilink3/generated/NegotiationResponse501.h b/src/lib/orderman/ilink3/generated/NegotiationResponse501.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/NegotiationResponse501.h rename to src/lib/orderman/ilink3/generated/NegotiationResponse501.h diff --git a/src/lib/orderman/actors/ilink3/generated/NewOrderCross544.h b/src/lib/orderman/ilink3/generated/NewOrderCross544.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/NewOrderCross544.h rename to src/lib/orderman/ilink3/generated/NewOrderCross544.h diff --git a/src/lib/orderman/actors/ilink3/generated/NewOrderSingle514.h b/src/lib/orderman/ilink3/generated/NewOrderSingle514.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/NewOrderSingle514.h rename to src/lib/orderman/ilink3/generated/NewOrderSingle514.h diff --git a/src/lib/orderman/actors/ilink3/generated/NotApplied513.h b/src/lib/orderman/ilink3/generated/NotApplied513.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/NotApplied513.h rename to src/lib/orderman/ilink3/generated/NotApplied513.h diff --git a/src/lib/orderman/actors/ilink3/generated/OFMOverrideReq.h b/src/lib/orderman/ilink3/generated/OFMOverrideReq.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OFMOverrideReq.h rename to src/lib/orderman/ilink3/generated/OFMOverrideReq.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrdStatusTrd.h b/src/lib/orderman/ilink3/generated/OrdStatusTrd.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrdStatusTrd.h rename to src/lib/orderman/ilink3/generated/OrdStatusTrd.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrdStatusTrdCxl.h b/src/lib/orderman/ilink3/generated/OrdStatusTrdCxl.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrdStatusTrdCxl.h rename to src/lib/orderman/ilink3/generated/OrdStatusTrdCxl.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderCancelReject535.h b/src/lib/orderman/ilink3/generated/OrderCancelReject535.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderCancelReject535.h rename to src/lib/orderman/ilink3/generated/OrderCancelReject535.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderCancelReplaceReject536.h b/src/lib/orderman/ilink3/generated/OrderCancelReplaceReject536.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderCancelReplaceReject536.h rename to src/lib/orderman/ilink3/generated/OrderCancelReplaceReject536.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderCancelReplaceRequest515.h b/src/lib/orderman/ilink3/generated/OrderCancelReplaceRequest515.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderCancelReplaceRequest515.h rename to src/lib/orderman/ilink3/generated/OrderCancelReplaceRequest515.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderCancelRequest516.h b/src/lib/orderman/ilink3/generated/OrderCancelRequest516.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderCancelRequest516.h rename to src/lib/orderman/ilink3/generated/OrderCancelRequest516.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderEventType.h b/src/lib/orderman/ilink3/generated/OrderEventType.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderEventType.h rename to src/lib/orderman/ilink3/generated/OrderEventType.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderMassActionReport558.h b/src/lib/orderman/ilink3/generated/OrderMassActionReport558.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderMassActionReport558.h rename to src/lib/orderman/ilink3/generated/OrderMassActionReport558.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderMassActionReport562.h b/src/lib/orderman/ilink3/generated/OrderMassActionReport562.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderMassActionReport562.h rename to src/lib/orderman/ilink3/generated/OrderMassActionReport562.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderMassActionRequest529.h b/src/lib/orderman/ilink3/generated/OrderMassActionRequest529.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderMassActionRequest529.h rename to src/lib/orderman/ilink3/generated/OrderMassActionRequest529.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderMassStatusRequest530.h b/src/lib/orderman/ilink3/generated/OrderMassStatusRequest530.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderMassStatusRequest530.h rename to src/lib/orderman/ilink3/generated/OrderMassStatusRequest530.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderStatus.h b/src/lib/orderman/ilink3/generated/OrderStatus.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderStatus.h rename to src/lib/orderman/ilink3/generated/OrderStatus.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderStatusRequest533.h b/src/lib/orderman/ilink3/generated/OrderStatusRequest533.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderStatusRequest533.h rename to src/lib/orderman/ilink3/generated/OrderStatusRequest533.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderType.h b/src/lib/orderman/ilink3/generated/OrderType.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderType.h rename to src/lib/orderman/ilink3/generated/OrderType.h diff --git a/src/lib/orderman/actors/ilink3/generated/OrderTypeReq.h b/src/lib/orderman/ilink3/generated/OrderTypeReq.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/OrderTypeReq.h rename to src/lib/orderman/ilink3/generated/OrderTypeReq.h diff --git a/src/lib/orderman/actors/ilink3/generated/PRICE9.h b/src/lib/orderman/ilink3/generated/PRICE9.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PRICE9.h rename to src/lib/orderman/ilink3/generated/PRICE9.h diff --git a/src/lib/orderman/actors/ilink3/generated/PRICENULL9.h b/src/lib/orderman/ilink3/generated/PRICENULL9.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PRICENULL9.h rename to src/lib/orderman/ilink3/generated/PRICENULL9.h diff --git a/src/lib/orderman/actors/ilink3/generated/PartyDetailRole.h b/src/lib/orderman/ilink3/generated/PartyDetailRole.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PartyDetailRole.h rename to src/lib/orderman/ilink3/generated/PartyDetailRole.h diff --git a/src/lib/orderman/actors/ilink3/generated/PartyDetailsDefinitionRequest518.h b/src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PartyDetailsDefinitionRequest518.h rename to src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h diff --git a/src/lib/orderman/actors/ilink3/generated/PartyDetailsDefinitionRequestAck519.h b/src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PartyDetailsDefinitionRequestAck519.h rename to src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h diff --git a/src/lib/orderman/actors/ilink3/generated/PartyDetailsListReport538.h b/src/lib/orderman/ilink3/generated/PartyDetailsListReport538.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PartyDetailsListReport538.h rename to src/lib/orderman/ilink3/generated/PartyDetailsListReport538.h diff --git a/src/lib/orderman/actors/ilink3/generated/PartyDetailsListRequest537.h b/src/lib/orderman/ilink3/generated/PartyDetailsListRequest537.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/PartyDetailsListRequest537.h rename to src/lib/orderman/ilink3/generated/PartyDetailsListRequest537.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteAckStatus.h b/src/lib/orderman/ilink3/generated/QuoteAckStatus.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteAckStatus.h rename to src/lib/orderman/ilink3/generated/QuoteAckStatus.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteCancel528.h b/src/lib/orderman/ilink3/generated/QuoteCancel528.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteCancel528.h rename to src/lib/orderman/ilink3/generated/QuoteCancel528.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteCancelAck547.h b/src/lib/orderman/ilink3/generated/QuoteCancelAck547.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteCancelAck547.h rename to src/lib/orderman/ilink3/generated/QuoteCancelAck547.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteCancelAck563.h b/src/lib/orderman/ilink3/generated/QuoteCancelAck563.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteCancelAck563.h rename to src/lib/orderman/ilink3/generated/QuoteCancelAck563.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteCxlStatus.h b/src/lib/orderman/ilink3/generated/QuoteCxlStatus.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteCxlStatus.h rename to src/lib/orderman/ilink3/generated/QuoteCxlStatus.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteCxlTyp.h b/src/lib/orderman/ilink3/generated/QuoteCxlTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteCxlTyp.h rename to src/lib/orderman/ilink3/generated/QuoteCxlTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/QuoteTyp.h b/src/lib/orderman/ilink3/generated/QuoteTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/QuoteTyp.h rename to src/lib/orderman/ilink3/generated/QuoteTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/README.txt b/src/lib/orderman/ilink3/generated/README.txt similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/README.txt rename to src/lib/orderman/ilink3/generated/README.txt diff --git a/src/lib/orderman/actors/ilink3/generated/RFQSide.h b/src/lib/orderman/ilink3/generated/RFQSide.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/RFQSide.h rename to src/lib/orderman/ilink3/generated/RFQSide.h diff --git a/src/lib/orderman/actors/ilink3/generated/ReqResult.h b/src/lib/orderman/ilink3/generated/ReqResult.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ReqResult.h rename to src/lib/orderman/ilink3/generated/ReqResult.h diff --git a/src/lib/orderman/actors/ilink3/generated/RequestForQuote543.h b/src/lib/orderman/ilink3/generated/RequestForQuote543.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/RequestForQuote543.h rename to src/lib/orderman/ilink3/generated/RequestForQuote543.h diff --git a/src/lib/orderman/actors/ilink3/generated/RequestForQuoteAck546.h b/src/lib/orderman/ilink3/generated/RequestForQuoteAck546.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/RequestForQuoteAck546.h rename to src/lib/orderman/ilink3/generated/RequestForQuoteAck546.h diff --git a/src/lib/orderman/actors/ilink3/generated/Retransmission509.h b/src/lib/orderman/ilink3/generated/Retransmission509.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Retransmission509.h rename to src/lib/orderman/ilink3/generated/Retransmission509.h diff --git a/src/lib/orderman/actors/ilink3/generated/RetransmitReject510.h b/src/lib/orderman/ilink3/generated/RetransmitReject510.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/RetransmitReject510.h rename to src/lib/orderman/ilink3/generated/RetransmitReject510.h diff --git a/src/lib/orderman/actors/ilink3/generated/RetransmitRequest508.h b/src/lib/orderman/ilink3/generated/RetransmitRequest508.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/RetransmitRequest508.h rename to src/lib/orderman/ilink3/generated/RetransmitRequest508.h diff --git a/src/lib/orderman/actors/ilink3/generated/SLEDS.h b/src/lib/orderman/ilink3/generated/SLEDS.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SLEDS.h rename to src/lib/orderman/ilink3/generated/SLEDS.h diff --git a/src/lib/orderman/actors/ilink3/generated/SMPI.h b/src/lib/orderman/ilink3/generated/SMPI.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SMPI.h rename to src/lib/orderman/ilink3/generated/SMPI.h diff --git a/src/lib/orderman/actors/ilink3/generated/SecRspTyp.h b/src/lib/orderman/ilink3/generated/SecRspTyp.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SecRspTyp.h rename to src/lib/orderman/ilink3/generated/SecRspTyp.h diff --git a/src/lib/orderman/actors/ilink3/generated/SecurityDefinitionRequest560.h b/src/lib/orderman/ilink3/generated/SecurityDefinitionRequest560.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SecurityDefinitionRequest560.h rename to src/lib/orderman/ilink3/generated/SecurityDefinitionRequest560.h diff --git a/src/lib/orderman/actors/ilink3/generated/SecurityDefinitionResponse561.h b/src/lib/orderman/ilink3/generated/SecurityDefinitionResponse561.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SecurityDefinitionResponse561.h rename to src/lib/orderman/ilink3/generated/SecurityDefinitionResponse561.h diff --git a/src/lib/orderman/actors/ilink3/generated/Sequence506.h b/src/lib/orderman/ilink3/generated/Sequence506.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Sequence506.h rename to src/lib/orderman/ilink3/generated/Sequence506.h diff --git a/src/lib/orderman/actors/ilink3/generated/ShortSaleType.h b/src/lib/orderman/ilink3/generated/ShortSaleType.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ShortSaleType.h rename to src/lib/orderman/ilink3/generated/ShortSaleType.h diff --git a/src/lib/orderman/actors/ilink3/generated/SideNULL.h b/src/lib/orderman/ilink3/generated/SideNULL.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SideNULL.h rename to src/lib/orderman/ilink3/generated/SideNULL.h diff --git a/src/lib/orderman/actors/ilink3/generated/SideReq.h b/src/lib/orderman/ilink3/generated/SideReq.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SideReq.h rename to src/lib/orderman/ilink3/generated/SideReq.h diff --git a/src/lib/orderman/actors/ilink3/generated/SideTimeInForce.h b/src/lib/orderman/ilink3/generated/SideTimeInForce.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SideTimeInForce.h rename to src/lib/orderman/ilink3/generated/SideTimeInForce.h diff --git a/src/lib/orderman/actors/ilink3/generated/SplitMsg.h b/src/lib/orderman/ilink3/generated/SplitMsg.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/SplitMsg.h rename to src/lib/orderman/ilink3/generated/SplitMsg.h diff --git a/src/lib/orderman/actors/ilink3/generated/Terminate507.h b/src/lib/orderman/ilink3/generated/Terminate507.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/Terminate507.h rename to src/lib/orderman/ilink3/generated/Terminate507.h diff --git a/src/lib/orderman/actors/ilink3/generated/TimeInForce.h b/src/lib/orderman/ilink3/generated/TimeInForce.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/TimeInForce.h rename to src/lib/orderman/ilink3/generated/TimeInForce.h diff --git a/src/lib/orderman/actors/ilink3/generated/TradeAddendum.h b/src/lib/orderman/ilink3/generated/TradeAddendum.h similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/TradeAddendum.h rename to src/lib/orderman/ilink3/generated/TradeAddendum.h diff --git a/src/lib/orderman/actors/ilink3/generated/generate.sh b/src/lib/orderman/ilink3/generated/generate.sh similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/generate.sh rename to src/lib/orderman/ilink3/generated/generate.sh diff --git a/src/lib/orderman/actors/ilink3/generated/ilinkbinary.xml b/src/lib/orderman/ilink3/generated/ilinkbinary.xml similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/ilinkbinary.xml rename to src/lib/orderman/ilink3/generated/ilinkbinary.xml diff --git a/src/lib/orderman/actors/ilink3/generated/sbe-all-1.17.0.jar b/src/lib/orderman/ilink3/generated/sbe-all-1.17.0.jar similarity index 100% rename from src/lib/orderman/actors/ilink3/generated/sbe-all-1.17.0.jar rename to src/lib/orderman/ilink3/generated/sbe-all-1.17.0.jar diff --git a/src/lib/orderman/actors/ilink3/test/IL3TestExchange.h b/src/lib/orderman/ilink3/test/IL3TestExchange.h similarity index 100% rename from src/lib/orderman/actors/ilink3/test/IL3TestExchange.h rename to src/lib/orderman/ilink3/test/IL3TestExchange.h diff --git a/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp b/src/lib/orderman/ilink3/test/ILinkGWTests.cpp similarity index 100% rename from src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp rename to src/lib/orderman/ilink3/test/ILinkGWTests.cpp diff --git a/src/server/sparkd/cmds/CMECert.cpp b/src/server/sparkd/cmds/CMECert.cpp index 40c2de4e5..15d3f1a1b 100644 --- a/src/server/sparkd/cmds/CMECert.cpp +++ b/src/server/sparkd/cmds/CMECert.cpp @@ -1,15 +1,13 @@ #include "CMECert.h" - #include "lib/logging/logging.h" -#include "lib/orderman/actors/ilink3/IL3Dispatcher.h" -#include "lib/orderman/actors/ilink3/IL3GW.h" -#include "lib/orderman/actors/ilink3/IL3Reactor.h" -#include "lib/orderman/actors/ilink3/ILink3Utils.h" +#include "lib/orderman/ilink3/IL3Dispatcher.h" +#include "lib/orderman/ilink3/IL3GW.h" +#include "lib/orderman/ilink3/IL3Reactor.h" +#include "lib/orderman/ilink3/ILink3Utils.h" #include "lib/os/os.h" #include "lib/utils/Dispatcher.h" #include "lib/utils/SecureLogon.h" #include "lib/utils/TimeStamp.h" - #include #include #include From 0d3e27932a391b7dcdaf0ff536bd774efbb0866f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:54:37 -0400 Subject: [PATCH 035/100] refactor (flatten): Move OrderRouter to orderman dir --- src/lib/orderman/{order_router => }/OrderRouter.cpp | 0 src/lib/orderman/{order_router => }/OrderRouter.h | 0 src/lib/orderman/actors/AsyncFactory.cpp | 3 +-- src/lib/orderman/actors/ServiceBridge.cpp | 3 +-- src/lib/orderman/actors/order_manager/OrderServicesData.h | 2 +- src/lib/orderman/orders/GLBXNativeOrder.cpp | 7 ++----- src/lib/orderman/orders/ICENativeOrder.cpp | 7 ++----- 7 files changed, 7 insertions(+), 15 deletions(-) rename src/lib/orderman/{order_router => }/OrderRouter.cpp (100%) rename src/lib/orderman/{order_router => }/OrderRouter.h (100%) diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/OrderRouter.cpp similarity index 100% rename from src/lib/orderman/order_router/OrderRouter.cpp rename to src/lib/orderman/OrderRouter.cpp diff --git a/src/lib/orderman/order_router/OrderRouter.h b/src/lib/orderman/OrderRouter.h similarity index 100% rename from src/lib/orderman/order_router/OrderRouter.h rename to src/lib/orderman/OrderRouter.h diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index fc4d3ec66..5f66dae41 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,14 +1,13 @@ #include "AsyncFactory.h" - #include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/common/OutFIX.h" +#include "lib/orderman/OrderRouter.h" #include "lib/orderman/events/CreateFIXBufferReplyEvent.h" #include "lib/orderman/events/CreateFIXBufferRequestEvent.h" #include "lib/orderman/events/CreateOrderReplyEvent.h" #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" namespace bts { diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 167ae1a13..be74c1dfa 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,10 +1,10 @@ #include "ServiceBridge.h" - #include "lib/api/public/ServiceContext.h" #include "lib/api/service_helpers/PositionUtilities.h" #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/PositionService.pb.h" #include "lib/mercury/broker/BrokerProxy.h" +#include "lib/orderman/OrderRouter.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" @@ -18,7 +18,6 @@ #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/MapSecurityDB.h" diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 436efc334..fafb8e7dc 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -34,7 +34,7 @@ #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/OrderRouter.h" #include "lib/utils/Puid.h" #include "lib/utils/datetime.h" diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index bb0abf99b..c5c232725 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -1,5 +1,4 @@ #include "GLBXNativeOrder.h" - #include "lib/api/services/OrderService.pb.h" #include "lib/config/config.h" #include "lib/config/protos/orderman_cfg.pb.h" @@ -8,8 +7,9 @@ #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" +#include "lib/orderman/OrderRouter.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -19,9 +19,6 @@ #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" - -#include "lib/orderman/actors/order_manager/OrderServices.h" - #include #include diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index b1189404d..f756b0903 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -1,13 +1,13 @@ #include "ICENativeOrder.h" - #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" #include "lib/md/IntPrice.h" +#include "lib/orderman/OrderRouter.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -15,9 +15,6 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" #include "lib/utils/bts_chrono.h" - -#include "lib/orderman/actors/order_manager/OrderServices.h" - #include #include #include From f2671ea4ba7056b6ab05884d4e51fe2b5506ee8d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 15:56:05 -0400 Subject: [PATCH 036/100] refactor: Remove unused file IOrderServices --- src/lib/orderman/core/IOrderServices.cpp | 1 - src/lib/orderman/core/IOrderServices.h | 117 ----------------------- 2 files changed, 118 deletions(-) delete mode 100644 src/lib/orderman/core/IOrderServices.cpp delete mode 100644 src/lib/orderman/core/IOrderServices.h diff --git a/src/lib/orderman/core/IOrderServices.cpp b/src/lib/orderman/core/IOrderServices.cpp deleted file mode 100644 index d2640c03f..000000000 --- a/src/lib/orderman/core/IOrderServices.cpp +++ /dev/null @@ -1 +0,0 @@ -//#include "lib/orderman/core/IOrderServices.h" diff --git a/src/lib/orderman/core/IOrderServices.h b/src/lib/orderman/core/IOrderServices.h deleted file mode 100644 index df8d82e5d..000000000 --- a/src/lib/orderman/core/IOrderServices.h +++ /dev/null @@ -1,117 +0,0 @@ -#pragma once - -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include - -// fwds -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -class CustomOrderDefinition; -class OrderState; -class Update; -class OrderRecord; -} // namespace orderman -} // namespace api -namespace mercury { -class TimerEvent; -} -namespace orderman { -class ChildOrder; -class ISecurityDB; -class IAlgoServices; -class IOrderFactory; -class BookUpdateEvent; -class TickerUpdateEvent; -class SettlementUpdateEvent; -class OrderStateUpdateEvent; -} // namespace orderman -} // namespace bts - -namespace bts { -namespace orderman { - -template -using Callback = std::function; -using OrderOpCB = Callback; -OrderOpCB ignore() { - return [](auto &) {}; -}; - -struct AttachOpResult { - OrderOpResult result; - ChildOrder child; -}; - -class AlgoOrder { - public: - virtual void on_init_new( - api::orderman::OrderDefinition const &, - ISecurityDB &, - IOrderFactory &) = 0; - - virtual void - on_activate(Price, Quantity, IAlgoServices &, OrderOpCB const &) = 0; - - virtual void on_update(Price, Quantity, OrderOpCB const &) = 0; - virtual void - on_update(api::orderman::Update const &, OrderOpCB const &on_result) { - on_result(OrderOpResult{ - api::orderman::ORDER_ERROR_INVALID_OP, "Operation not supported"}); - } - - virtual void on_cancel(OrderOpCB const &) = 0; - virtual void on_detach(OrderOpCB const &) = 0; - virtual void on_attached(OrderKey /*new_parent*/){}; - virtual void on_detached() {} -}; - -class IOrderServices { - public: - // reporting state and definition changes - virtual void - report_definition(const api::orderman::CustomOrderDefinition &) = 0; - virtual void report_state(const api::orderman::OrderState &) = 0; - - // Child order creation/control - virtual void make_child_orders( - api::orderman::OrderDefinition const &, - size_t how_many, - Callback const &>) = 0; - virtual void - activate(ChildOrder &, Price, Quantity, OrderOpCB const & = ignore()) = 0; - virtual void - update(ChildOrder &, Price, Quantity, OrderOpCB const & = ignore()) = 0; - virtual void update( - ChildOrder &, - api::orderman::Update const &, - OrderOpCB const & = ignore()) = 0; - virtual void cancel(ChildOrder &, OrderOpCB const & = ignore()) = 0; - virtual void attach(OrderKey, Callback const &) = 0; - virtual void detach(ChildOrder const &, OrderOpCB const & = ignore()); - // End child control - - // Events - virtual void - subscribe_to_book(SecurityKey, Callback const &) = 0; - virtual void unsubscribe_from_book(SecurityKey) = 0; - virtual void - subscribe_to_ticker(SecurityKey, Callback const &) = 0; - virtual void unsubscribe_from_ticker(SecurityKey) = 0; - virtual void subscribe_to_settlement( - SecurityKey, Callback const &) = 0; - virtual void unsubscribe_from_settlement(SecurityKey) = 0; - virtual void - subscribe_to_time(Callback const &) = 0; - virtual void unsubscribe_from_time() = 0; - virtual void - subscribe_to_child_updates(Callback const &) = 0; - virtual void unsubscribe_from_child_updates() = 0; - // End events -}; -} // namespace orderman -} // namespace bts From 923d9ee512cee50e4383968bdb87969b96091424 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:11:33 -0400 Subject: [PATCH 037/100] refactor (flatten): Move ChildOrder to orderman dir --- src/lib/orderman/{actors/order_manager => }/ChildOrder.h | 0 src/lib/orderman/actors/order_manager/OrderBuilder.h | 3 +-- src/lib/orderman/actors/order_manager/OrderServices.cpp | 2 +- src/lib/orderman/orders/CompositeOrder.cpp | 3 +-- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 4 +--- src/lib/orderman/orders/book_algos/BookOrderBase.cpp | 2 +- .../orders/spreader_orders/spreader/ISpreaderManager.h | 2 +- .../orders/spreader_orders/spreader/SingleLegQuoter.h | 3 +-- .../spreader/external_interfacing/IAlternateOrderGateway.h | 2 +- .../spreader/external_interfacing/SpreaderOrderBuilder.h | 2 +- .../spreader/external_interfacing/SpreaderOrderServices.h | 2 +- .../spreader_orders/spreader/hedger/IHedgerStateWorker.h | 3 +-- 12 files changed, 11 insertions(+), 17 deletions(-) rename src/lib/orderman/{actors/order_manager => }/ChildOrder.h (100%) diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/ChildOrder.h similarity index 100% rename from src/lib/orderman/actors/order_manager/ChildOrder.h rename to src/lib/orderman/ChildOrder.h diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 5afa6f979..8e8b6727f 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,8 +1,7 @@ #pragma once - #include "lib/api/services/OrderService.pb.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index d608d3dec..34ccc7066 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -1,5 +1,5 @@ #include "OrderServices.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" namespace bts::orderman { diff --git a/src/lib/orderman/orders/CompositeOrder.cpp b/src/lib/orderman/orders/CompositeOrder.cpp index e249a2089..3845304a0 100644 --- a/src/lib/orderman/orders/CompositeOrder.cpp +++ b/src/lib/orderman/orders/CompositeOrder.cpp @@ -1,10 +1,9 @@ #include "lib/orderman/orders/CompositeOrder.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" - #include "lib/utils/bts_assert.h" namespace bts { diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 90c450117..7c14fbd24 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,6 +1,5 @@ #include "lib/orderman/orders/algo/AlgoWrapperOrder.h" - -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_utils.h" @@ -8,7 +7,6 @@ #include "lib/orderman/orders/algo/ChildTemplate.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/utils/bts_assert.h" - #include #include diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp index 2566c1f0f..d6fc9d5bc 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp @@ -1,6 +1,6 @@ #include "BookOrderBase.h" #include "lib/domain_model/Security.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index ceba322ab..c058f29ae 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/Book.h" namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c41b2a51b..4a6f9388c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -1,9 +1,8 @@ #pragma once - #include "LegPropertyData.h" #include "QuoteLegPriceQuantityState.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h index 22326ce5c..5c208895f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/Book.h" namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index 9271de7c4..05ae09f00 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -2,7 +2,7 @@ #include "SpreaderOrderServices.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h index c733aec37..985e9f277 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h @@ -1,7 +1,7 @@ #pragma once #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index a10b6a1e9..a8cea68cd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -1,6 +1,5 @@ #pragma once - -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" #include "lib/utils/bts_chrono.h" From 0a6a4c35fa841c58c1df20365715fef64adb0a83 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:12:58 -0400 Subject: [PATCH 038/100] refactor (flatten): Move OrderServiceServer to orderman dir --- src/lib/orderman/{server => }/OrderServiceServer.cpp | 0 src/lib/orderman/{server => }/OrderServiceServer.h | 0 src/server/sparkd/cmds/Run.cpp | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename src/lib/orderman/{server => }/OrderServiceServer.cpp (100%) rename src/lib/orderman/{server => }/OrderServiceServer.h (100%) diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp similarity index 100% rename from src/lib/orderman/server/OrderServiceServer.cpp rename to src/lib/orderman/OrderServiceServer.cpp diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/OrderServiceServer.h similarity index 100% rename from src/lib/orderman/server/OrderServiceServer.h rename to src/lib/orderman/OrderServiceServer.h diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index e3368b145..7baf243df 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -13,10 +13,10 @@ #include "lib/md/service/MarketDataServiceServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" +#include "lib/orderman/OrderServiceServer.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" #include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" -#include "lib/orderman/server/OrderServiceServer.h" #include "lib/os/os.h" #include "lib/persistence/PersistenceServiceServer.h" #include "lib/plugin/SparkServices.h" From 694309f80bc74cf626bf1cb4b31dee4639781ebd Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:17:24 -0400 Subject: [PATCH 039/100] refactor (flatten): Move OrderBuilder to orderman dir --- src/lib/orderman/{actors/order_manager => }/OrderBuilder.cpp | 0 src/lib/orderman/{actors/order_manager => }/OrderBuilder.h | 0 src/lib/orderman/orders/CompositeOrder.cpp | 2 +- src/lib/orderman/orders/TimeBoxOrder.cpp | 2 +- src/lib/orderman/orders/TriggerOrder.cpp | 2 +- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 2 +- src/lib/orderman/orders/book_algos/BookAlgo.cpp | 2 +- src/lib/orderman/orders/book_algos/BookAlgo.h | 2 +- src/lib/orderman/orders/book_algos/OCOOrder.cpp | 2 +- src/lib/orderman/orders/book_algos/PricerOrder.cpp | 2 +- src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp | 2 +- .../orders/queue_holder/state_workers/QHOEndStateWorker.cpp | 4 ++-- .../orders/queue_holder/state_workers/QHOStartStateWorker.cpp | 4 ++-- .../state_workers/QHOWaitingForAckStateWorker.cpp | 4 ++-- .../state_workers/QHOWaitingForCancelAllStateWorker.cpp | 4 ++-- .../queue_holder/state_workers/QHOWorkingStateWorker.cpp | 4 ++-- .../orders/spreader_orders/spreader/SpreaderBookkeepingData.h | 2 +- .../orders/spreader_orders/spreader/SpreaderLegData.h | 2 +- .../orderman/orders/spreader_orders/spreader/SpreaderUtils.h | 2 +- .../spreader/external_interfacing/SpreaderOrderBuilder.h | 2 +- .../spreader/external_interfacing/SpreaderOrderServices.h | 2 +- .../spreader_states/SpreaderStartStateWorker.cpp | 2 +- src/lib/plugin/plugin.cpp | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) rename src/lib/orderman/{actors/order_manager => }/OrderBuilder.cpp (100%) rename src/lib/orderman/{actors/order_manager => }/OrderBuilder.h (100%) diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp b/src/lib/orderman/OrderBuilder.cpp similarity index 100% rename from src/lib/orderman/actors/order_manager/OrderBuilder.cpp rename to src/lib/orderman/OrderBuilder.cpp diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/OrderBuilder.h similarity index 100% rename from src/lib/orderman/actors/order_manager/OrderBuilder.h rename to src/lib/orderman/OrderBuilder.h diff --git a/src/lib/orderman/orders/CompositeOrder.cpp b/src/lib/orderman/orders/CompositeOrder.cpp index 3845304a0..dea82e9f1 100644 --- a/src/lib/orderman/orders/CompositeOrder.cpp +++ b/src/lib/orderman/orders/CompositeOrder.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/CompositeOrder.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 22bc97dc5..352c63eae 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -1,5 +1,5 @@ #include "TimeBoxOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" #include diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 87ac5e85e..c8cfa491f 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,7 +1,7 @@ #include "TriggerOrder.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 7c14fbd24..7ea305b59 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,6 +1,6 @@ #include "lib/orderman/orders/algo/AlgoWrapperOrder.h" #include "lib/orderman/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/PreActivationOrderServices.h" diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index fc1fe8278..44282bfc1 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -1,5 +1,5 @@ #include "BookAlgo.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 29a0bf64f..59e69c061 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -1,7 +1,7 @@ #pragma once #include "lib/api/services/OrderService.server.pb.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/Order.h" #include #include diff --git a/src/lib/orderman/orders/book_algos/OCOOrder.cpp b/src/lib/orderman/orders/book_algos/OCOOrder.cpp index 1418826f1..06ed38556 100644 --- a/src/lib/orderman/orders/book_algos/OCOOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OCOOrder.cpp @@ -1,6 +1,6 @@ #include "OCOOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" diff --git a/src/lib/orderman/orders/book_algos/PricerOrder.cpp b/src/lib/orderman/orders/book_algos/PricerOrder.cpp index a772fa446..034c57de0 100644 --- a/src/lib/orderman/orders/book_algos/PricerOrder.cpp +++ b/src/lib/orderman/orders/book_algos/PricerOrder.cpp @@ -1,6 +1,6 @@ #include "PricerOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/utils/PBUtils.h" #include diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp index 8d4e1b29e..b78185142 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp +++ b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp @@ -1,7 +1,7 @@ #include "QueueHolderOrder.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp index e511eada1..e79c66d05 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" @@ -52,4 +52,4 @@ void QHOEndStateWorker::on_child_order_update(const OrderStateUpdateEvent &ev) { void QHOEndStateWorker::on_book(const Book &, const trace::CorID &) {} void QHOEndStateWorker::on_time(const TimeStamp &) {} } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp index fbb3b2a29..3b21a48b5 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" @@ -117,4 +117,4 @@ bool QHOStartStateWorker::_on_init_new( return true; } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp index 4e68a33b6..c209ce947 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" @@ -68,4 +68,4 @@ void QHOWaitingForAckStateWorker::on_child_order_update( void QHOWaitingForAckStateWorker::on_book(const Book &, const trace::CorID &) {} void QHOWaitingForAckStateWorker::on_time(const TimeStamp &) {} } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp index 3a908c0c4..6fd0f737b 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" @@ -71,4 +71,4 @@ void QHOWaitingForCancelAllStateWorker::_analyze_and_cancel() { _porder->_switch_state(QueueHolderOrderState::END); } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp index e34fbe45d..ef489db08 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" @@ -116,4 +116,4 @@ bool QHOWorkingStateWorker::_analyze_moving_out() { void QHOWorkingStateWorker::on_book(const Book &, const trace::CorID &) {} void QHOWorkingStateWorker::on_time(const TimeStamp &) {} } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index ade7218f3..a4764a1f6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -6,7 +6,7 @@ #include "NLegsHedgeRecompData.h" #include "SpreaderLegData.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index dca1425be..fb9d5ca4d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -4,7 +4,7 @@ #include "SingleLegQuoter.h" #include "SpreaderChildOrderState.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 9db9c9426..6495a1db1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -3,7 +3,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/md/PriceSize.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" #include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index 05ae09f00..ffd6a6218 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -3,7 +3,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/orderman/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h index 985e9f277..49d821e05 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h @@ -2,7 +2,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/orderman/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index b99114eba..4bd5225bf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -1,5 +1,5 @@ #include "SpreaderStartStateWorker.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" diff --git a/src/lib/plugin/plugin.cpp b/src/lib/plugin/plugin.cpp index 1cefa5748..3cab420f8 100644 --- a/src/lib/plugin/plugin.cpp +++ b/src/lib/plugin/plugin.cpp @@ -1,7 +1,7 @@ #include "lib/config/config.h" #include "lib/config/protos/system.pb.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/OrderBuilder.h" #include "lib/plugin/SparkServices.h" #include "lib/utils/PBUtils.h" From 85c567ffc55ee9b415502efc93182ae521743647 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:25:59 -0400 Subject: [PATCH 040/100] refactor (flatten): Move OrderServices to orderman dir --- src/lib/orderman/ChildOrder.h | 2 +- src/lib/orderman/OrderBuilder.h | 2 +- src/lib/orderman/{actors/order_manager => }/OrderServices.cpp | 0 src/lib/orderman/{actors/order_manager => }/OrderServices.h | 0 src/lib/orderman/actors/order_manager/OrderManager.cpp | 2 +- src/lib/orderman/orders/DynamicOrder.cpp | 2 +- src/lib/orderman/orders/GLBXNativeOrder.cpp | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 2 +- src/lib/orderman/orders/Order.cpp | 2 +- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 2 +- src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp | 2 +- src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename src/lib/orderman/{actors/order_manager => }/OrderServices.cpp (100%) rename src/lib/orderman/{actors/order_manager => }/OrderServices.h (100%) diff --git a/src/lib/orderman/ChildOrder.h b/src/lib/orderman/ChildOrder.h index 206680191..527678efb 100644 --- a/src/lib/orderman/ChildOrder.h +++ b/src/lib/orderman/ChildOrder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_assert.h" #include diff --git a/src/lib/orderman/OrderBuilder.h b/src/lib/orderman/OrderBuilder.h index 8e8b6727f..5540721d7 100644 --- a/src/lib/orderman/OrderBuilder.h +++ b/src/lib/orderman/OrderBuilder.h @@ -2,7 +2,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/OrderServices.cpp similarity index 100% rename from src/lib/orderman/actors/order_manager/OrderServices.cpp rename to src/lib/orderman/OrderServices.cpp diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/OrderServices.h similarity index 100% rename from src/lib/orderman/actors/order_manager/OrderServices.h rename to src/lib/orderman/OrderServices.h diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 085dc3355..f01429f85 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -2,7 +2,7 @@ #include "lib/jetfix/common/OutFIX.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index 8cfd7e1dd..e1b3fe998 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -1,6 +1,6 @@ #include "DynamicOrder.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index c5c232725..eec55604b 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -8,7 +8,7 @@ #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" #include "lib/orderman/OrderRouter.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index f756b0903..03d794aab 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/md/IntPrice.h" #include "lib/orderman/OrderRouter.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index b9fd73d39..59ff4cc9d 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -1,5 +1,5 @@ #include "Order.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 7ea305b59..22499940b 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,7 +1,7 @@ #include "lib/orderman/orders/algo/AlgoWrapperOrder.h" #include "lib/orderman/ChildOrder.h" #include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/algo/ChildTemplate.h" diff --git a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp b/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp index 345214230..7bdbd303d 100644 --- a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp +++ b/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp @@ -5,7 +5,7 @@ #include "lib/domain_model/Security.h" #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" namespace bts { diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp index c079d2040..e41622e14 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp +++ b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp @@ -3,7 +3,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/OrderServices.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" namespace bts { From 0cfb27febaa7bd31a2951178cffdde630c15f643 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:38:37 -0400 Subject: [PATCH 041/100] refactor (flatten): Move ExecutionGatewayFactory to own file --- .../actors/order_manager/OrderServicesData.h | 14 +++++------ .../events/CreateFIXBufferReplyEvent.h | 12 ++++----- ...ateway.cpp => ExecutionGatewayFactory.cpp} | 14 +++++------ .../gateways/ExecutionGatewayFactory.h | 25 +++++++++++++++++++ src/lib/orderman/gateways/IExecutionGateway.h | 8 ------ 5 files changed, 42 insertions(+), 31 deletions(-) rename src/lib/orderman/gateways/{IExecutionGateway.cpp => ExecutionGatewayFactory.cpp} (83%) create mode 100644 src/lib/orderman/gateways/ExecutionGatewayFactory.h diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index fafb8e7dc..978e35b23 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -1,15 +1,10 @@ #pragma once - -#include - +#include "lib/md/SecurityOracle.h" #include "lib/mercury/actors/ContentSubscription.h" #include "lib/mercury/events/Stream.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/securities/MapSecurityDB.h" - -#include "lib/md/SecurityOracle.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/Governor.h" +#include "lib/orderman/OrderRouter.h" #include "lib/orderman/actors/order_manager/PositionIndex.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" @@ -32,13 +27,16 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/TradeSignalEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" +#include "lib/orderman/gateways/ExecutionGatewayFactory.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" -#include "lib/orderman/OrderRouter.h" +#include "lib/orderman/order_factory/OrderFactory.h" +#include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/Puid.h" #include "lib/utils/datetime.h" #include +#include namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CreateFIXBufferReplyEvent.h b/src/lib/orderman/events/CreateFIXBufferReplyEvent.h index e03db6cec..bb6cede7f 100644 --- a/src/lib/orderman/events/CreateFIXBufferReplyEvent.h +++ b/src/lib/orderman/events/CreateFIXBufferReplyEvent.h @@ -1,13 +1,11 @@ #pragma once - -#include - +#include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include -namespace bts { -namespace orderman { +namespace bts::orderman { class CreateFIXBufferReplyEvent : public mercury::Event { @@ -22,5 +20,5 @@ class CreateFIXBufferReplyEvent std::vector buffers; config::JetFIX::Connection const *cfg; }; -} // namespace orderman -} // namespace bts + +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/IExecutionGateway.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp similarity index 83% rename from src/lib/orderman/gateways/IExecutionGateway.cpp rename to src/lib/orderman/gateways/ExecutionGatewayFactory.cpp index 0a0b6451c..e2b056878 100644 --- a/src/lib/orderman/gateways/IExecutionGateway.cpp +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp @@ -1,14 +1,13 @@ - -#include "IExecutionGateway.h" +#include "ExecutionGatewayFactory.h" +#include "lib/md/SecurityOracle.h" #include "lib/orderman/gateways/GLBXExecutionGateway.h" -#include "lib/orderman/gateways/ICEExecutionGateway.h" #include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" +#include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/tracing/PerfLog.h" #include "lib/utils/ValueWrapper.h" - #include -namespace bts { -namespace orderman { +namespace bts::orderman { std::unique_ptr ExecutionGatewayFactory::create_gateway( const config::JetFIX::Connection &conn, @@ -23,5 +22,4 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( return std::make_unique(conn, pl, o); } -} // namespace orderman -} // namespace bts +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.h b/src/lib/orderman/gateways/ExecutionGatewayFactory.h new file mode 100644 index 000000000..122397118 --- /dev/null +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.h @@ -0,0 +1,25 @@ +#pragma once +#include "lib/config/protos/jetfix.pb.h" +#include + +namespace bts::trace { +class PerfLog; +} + +namespace bts::md { +class SecurityOracle; +} + +namespace bts::orderman { + +class IExecutionGateway; + +class ExecutionGatewayFactory { + public: + static std::unique_ptr create_gateway( + const config::JetFIX::Connection &, + trace::PerfLog &, + md::SecurityOracle); +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/IExecutionGateway.h b/src/lib/orderman/gateways/IExecutionGateway.h index ed8023375..62d7e6cca 100644 --- a/src/lib/orderman/gateways/IExecutionGateway.h +++ b/src/lib/orderman/gateways/IExecutionGateway.h @@ -49,12 +49,4 @@ class IExecutionGateway { BTS_NO_COPY(IExecutionGateway); }; -class ExecutionGatewayFactory { - public: - static std::unique_ptr create_gateway( - const config::JetFIX::Connection &, - trace::PerfLog &, - md::SecurityOracle); -}; - } // namespace bts::orderman From 7ede27e90b41974018d27e2fb4d76bd234ab437c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 1 Oct 2021 15:05:13 -0400 Subject: [PATCH 042/100] refactor: Clean up ValueWrapper --- src/lib/utils/ValueWrapper.h | 115 ++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 28 deletions(-) diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index aa3716960..67f117e85 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -1,43 +1,102 @@ #pragma once - #include #include namespace bts { namespace utils { -template class ValueWrapper { +template +class ValueWrapper { public: typedef ValueT Value; - constexpr ValueWrapper() : _v() {} - constexpr explicit ValueWrapper(ValueT const &v) : _v(v) {} - constexpr explicit ValueWrapper(ValueT &&v) : _v(std::move(v)) {} + constexpr ValueWrapper() = default; + constexpr explicit ValueWrapper(const ValueT &v); + constexpr explicit ValueWrapper(ValueT &&v); - constexpr ValueWrapper(ValueWrapper const &v) : _v(v._v) {} - constexpr ValueWrapper(ValueWrapper &&v) : _v(std::move(v._v)) {} + constexpr ValueWrapper(const ValueWrapper &v) = default; + constexpr ValueWrapper(ValueWrapper &&v) = default; - ValueWrapper &operator=(ValueWrapper const &v) { - _v = v._v; - return *this; - } - ValueWrapper &operator=(ValueWrapper &&v) { - _v = std::move(v._v); - return *this; - } + ValueWrapper &operator=(ValueWrapper const &v) = default; + ValueWrapper &operator=(ValueWrapper &&v) = default; - constexpr bool operator==(ValueWrapper const &v) const { return _v == v._v; } - constexpr bool operator!=(ValueWrapper const &v) const { return _v != v._v; } - constexpr bool operator<(ValueWrapper const &v) const { return _v < v._v; } - constexpr bool operator>(ValueWrapper const &v) const { return _v > v._v; } - constexpr ValueT const &value() const { return _v; } - constexpr ValueT &value() { return _v; } + constexpr const ValueT &value() const; + constexpr ValueT &value(); private: - ValueT _v; + ValueT v_; }; -// don't ask. +template +constexpr bool operator==( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator!=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator>( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator<( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +std::ostream &operator<<(std::ostream &s, ValueWrapper const &v); + +} // namespace utils +} // namespace bts + +namespace std { + +template +struct hash> { + std::size_t operator()(const bts::utils::ValueWrapper &k) const; +}; + +} // namespace std + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +namespace bts { +namespace utils { + +template +constexpr ValueWrapper::ValueWrapper(const ValueT &v) : v_(v) {} + +template +constexpr ValueWrapper::ValueWrapper(ValueT &&v) + : v_(std::move(v)) {} + +template +constexpr ValueT const &ValueWrapper::value() const { + return v_; +} + +template +constexpr ValueT &ValueWrapper::value() { + return v_; +} + +#define BIN_OP(result_t, op) \ + template \ + constexpr result_t operator op( \ + const ValueWrapper &lhs, \ + const ValueWrapper &rhs) { \ + return result_t(lhs.value() op rhs.value()); \ + } + +BIN_OP(bool, ==) +BIN_OP(bool, !=) +BIN_OP(bool, >) +BIN_OP(bool, <) + +#undef BIN_OP + template std::ostream &operator<<(std::ostream &s, ValueWrapper const &v) { s << v.value(); @@ -48,11 +107,11 @@ std::ostream &operator<<(std::ostream &s, ValueWrapper const &v) { } // namespace bts namespace std { + template -struct hash> { - std::size_t operator()(const bts::utils::ValueWrapper &k) const { - return hash()(k.value()); - } -}; +std::size_t hash>::operator()( + const bts::utils::ValueWrapper &k) const { + return hash()(k.value()); +} } // namespace std From a0ce1b361f0f304da755d4387bd730a140b2e018 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 1 Oct 2021 15:05:42 -0400 Subject: [PATCH 043/100] Add >=, <= operators to ValueWrapper --- src/lib/utils/ValueWrapper.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 67f117e85..64a71a2eb 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -39,10 +39,18 @@ template constexpr bool operator>( const ValueWrapper &lhs, const ValueWrapper &rhs); +template +constexpr bool operator>=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + template constexpr bool operator<( const ValueWrapper &lhs, const ValueWrapper &rhs); +template +constexpr bool operator<=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + template std::ostream &operator<<(std::ostream &s, ValueWrapper const &v); @@ -93,7 +101,9 @@ constexpr ValueT &ValueWrapper::value() { BIN_OP(bool, ==) BIN_OP(bool, !=) BIN_OP(bool, >) +BIN_OP(bool, >=) BIN_OP(bool, <) +BIN_OP(bool, <=) #undef BIN_OP From 4860d0cb3dd0806a6f245a600bd4dfe09cd4d811 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 27 Sep 2021 10:35:54 -0500 Subject: [PATCH 044/100] refactor: Move classes out of MarketDataCommon.h into own files --- src/lib/core/TimeStamp.h | 27 ++ src/lib/core/ValueWrapper.h | 9 + src/lib/domain/AccountID.h | 9 + src/lib/domain/AggressorSide.cpp | 11 + src/lib/domain/AggressorSide.h | 34 ++ src/lib/domain/Book.h | 14 + src/lib/domain/BookLevel.h | 42 ++ src/lib/domain/BookLevelComp.h | 57 +++ src/lib/domain/BookSide.h | 13 + src/lib/domain/Currency.h | 7 + src/lib/domain/FutureSecurity.h | 11 + src/lib/domain/IndexSecurity.h | 7 + src/lib/domain/LegDefinition.h | 14 + src/lib/domain/NewBookSide.h | 20 + src/lib/domain/OptionSecurity.h | 7 + src/lib/domain/OrderKey.h | 9 + src/lib/domain/Price.h | 457 ++++++++++++++++++ src/lib/domain/PriceComp.h | 28 ++ src/lib/domain/Quantity.h | 116 +++++ src/lib/domain/RFQ.h | 7 + src/lib/domain/Security.h | 34 ++ src/lib/domain/SecurityCommon.h | 30 ++ src/lib/domain/SecurityID.h | 9 + src/lib/domain/SecurityMarketDataStatistics.h | 18 + src/lib/domain/SecurityState.h | 13 + src/lib/domain/SecurityType.h | 8 + src/lib/domain/Side.cpp | 10 + src/lib/domain/Side.h | 155 ++++++ src/lib/domain/SpreadSecurity.h | 14 + src/lib/domain/TradeRecord.h | 20 + src/lib/domain/UserID.h | 9 + src/lib/domain/Venue.h | 14 + src/lib/md/IMarketDataListener.h | 38 ++ src/lib/md/MarketDataError.cpp | 11 + src/lib/md/MarketDataError.h | 32 ++ src/lib/md/MarketDataListenerID.h | 9 + src/lib/md/MarketDataSubscription.h | 34 ++ src/lib/md/SecurityMarketState.cpp | 11 + src/lib/md/SecurityMarketState.h | 32 ++ src/lib/md/cme/GlbxMarketDataSubscription.h | 20 + .../deribit/DeribitMarketDataSubscription.h | 7 + src/lib/md/emumba/IMarketDataListener.h | 32 -- src/lib/md/emumba/MarketDataCommon.h | 235 --------- src/lib/md/emumba/MarketDataGateway.h | 20 +- .../spreader_orders/tests/spreader_tests.cpp | 3 +- .../md/platforms/emumba/EmumbaMDListener.cpp | 86 ++-- .../md/platforms/emumba/EmumbaMDListener.h | 32 +- 47 files changed, 1501 insertions(+), 334 deletions(-) create mode 100644 src/lib/core/TimeStamp.h create mode 100644 src/lib/core/ValueWrapper.h create mode 100644 src/lib/domain/AccountID.h create mode 100644 src/lib/domain/AggressorSide.cpp create mode 100644 src/lib/domain/AggressorSide.h create mode 100644 src/lib/domain/Book.h create mode 100644 src/lib/domain/BookLevel.h create mode 100644 src/lib/domain/BookLevelComp.h create mode 100644 src/lib/domain/BookSide.h create mode 100644 src/lib/domain/Currency.h create mode 100644 src/lib/domain/FutureSecurity.h create mode 100644 src/lib/domain/IndexSecurity.h create mode 100644 src/lib/domain/LegDefinition.h create mode 100644 src/lib/domain/NewBookSide.h create mode 100644 src/lib/domain/OptionSecurity.h create mode 100644 src/lib/domain/OrderKey.h create mode 100644 src/lib/domain/Price.h create mode 100644 src/lib/domain/PriceComp.h create mode 100644 src/lib/domain/Quantity.h create mode 100644 src/lib/domain/RFQ.h create mode 100644 src/lib/domain/Security.h create mode 100644 src/lib/domain/SecurityCommon.h create mode 100644 src/lib/domain/SecurityID.h create mode 100644 src/lib/domain/SecurityMarketDataStatistics.h create mode 100644 src/lib/domain/SecurityState.h create mode 100644 src/lib/domain/SecurityType.h create mode 100644 src/lib/domain/Side.cpp create mode 100644 src/lib/domain/Side.h create mode 100644 src/lib/domain/SpreadSecurity.h create mode 100644 src/lib/domain/TradeRecord.h create mode 100644 src/lib/domain/UserID.h create mode 100644 src/lib/domain/Venue.h create mode 100644 src/lib/md/IMarketDataListener.h create mode 100644 src/lib/md/MarketDataError.cpp create mode 100644 src/lib/md/MarketDataError.h create mode 100644 src/lib/md/MarketDataListenerID.h create mode 100644 src/lib/md/MarketDataSubscription.h create mode 100644 src/lib/md/SecurityMarketState.cpp create mode 100644 src/lib/md/SecurityMarketState.h create mode 100644 src/lib/md/cme/GlbxMarketDataSubscription.h create mode 100644 src/lib/md/deribit/DeribitMarketDataSubscription.h delete mode 100644 src/lib/md/emumba/IMarketDataListener.h delete mode 100644 src/lib/md/emumba/MarketDataCommon.h diff --git a/src/lib/core/TimeStamp.h b/src/lib/core/TimeStamp.h new file mode 100644 index 000000000..c139c1646 --- /dev/null +++ b/src/lib/core/TimeStamp.h @@ -0,0 +1,27 @@ +#pragma once +#include + +namespace bts::core { + +// I can send this whole class later but its a nice wrapper around the linux +// posix time +struct TimeStamp { + public: + constexpr TimeStamp() = default; + explicit constexpr TimeStamp(std::uint64_t value); + constexpr std::uint64_t nanos() const; + + private: + // posix time + std::uint64_t value_{}; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr TimeStamp::TimeStamp(std::uint64_t value) : value_(value) {} + +constexpr std::uint64_t TimeStamp::nanos() const { return value_; } + +} // namespace bts::core diff --git a/src/lib/core/ValueWrapper.h b/src/lib/core/ValueWrapper.h new file mode 100644 index 000000000..ef776972b --- /dev/null +++ b/src/lib/core/ValueWrapper.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" + +namespace bts::core { + +template +using ValueWrapper = utils::ValueWrapper; + +} // namespace bts::core diff --git a/src/lib/domain/AccountID.h b/src/lib/domain/AccountID.h new file mode 100644 index 000000000..b5d412a77 --- /dev/null +++ b/src/lib/domain/AccountID.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" +#include + +namespace bts::domain { + +using AccountID = utils::ValueWrapper; + +} // namespace bts::domain diff --git a/src/lib/domain/AggressorSide.cpp b/src/lib/domain/AggressorSide.cpp new file mode 100644 index 000000000..582d93f3b --- /dev/null +++ b/src/lib/domain/AggressorSide.cpp @@ -0,0 +1,11 @@ +#include "AggressorSide.h" + +namespace bts::domain { + +std::ostream &operator<<( + std::ostream &out, const AggressorSide &value) noexcept { + out << value.name(); + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/AggressorSide.h b/src/lib/domain/AggressorSide.h new file mode 100644 index 000000000..daa7749b3 --- /dev/null +++ b/src/lib/domain/AggressorSide.h @@ -0,0 +1,34 @@ +#pragma once +#include + +namespace bts::domain { + +class AggressorSide { + public: + enum Value { None = 0, Buy = 1, Sell = 2 }; + Value value; + + constexpr const char *name() const noexcept; +}; + +std::ostream &operator<<( + std::ostream &out, const AggressorSide &value) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *AggressorSide::name() const noexcept { + switch (value) { + case AggressorSide::None: + return "None"; + case AggressorSide::Buy: + return "Buy"; + case AggressorSide::Sell: + return "Sell"; + default: + return "Unknown"; + } +} + +} // namespace bts::domain diff --git a/src/lib/domain/Book.h b/src/lib/domain/Book.h new file mode 100644 index 000000000..2564e7bac --- /dev/null +++ b/src/lib/domain/Book.h @@ -0,0 +1,14 @@ +#pragma once +#include "BookSide.h" +#include "SecurityID.h" + +namespace bts::domain { + +class Book { + public: + SecurityID security_id; + BookSide bids; + BookSide asks; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/BookLevel.h b/src/lib/domain/BookLevel.h new file mode 100644 index 000000000..90fa3e863 --- /dev/null +++ b/src/lib/domain/BookLevel.h @@ -0,0 +1,42 @@ +#pragma once +#include "Price.h" +#include "Quantity.h" +#include + +namespace bts::domain { + +class BookLevel { + public: + const Price price = {}; + const Quantity total_quantity = {}; + const Quantity direct_quantity = {}; + std::size_t n_orders = {}; + + /** + * @brief Gets an empty book + * + * @details This method offers protection against changes to the default + * constructor. For example, the default constructor could be optimized + * one day so that members aren't initialized at all. No matter what + * changes the future brings, this method will always return an empty book. + * + * @return An empty BookLevel + */ + static constexpr BookLevel empty() noexcept; + + constexpr Quantity implied_quantity() const; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr BookLevel BookLevel::empty() noexcept { + return {Price::nan(), Quantity{0}, Quantity{0}, 0}; +} + +constexpr Quantity BookLevel::implied_quantity() const { + return total_quantity - direct_quantity; +} + +} // namespace bts::domain diff --git a/src/lib/domain/BookLevelComp.h b/src/lib/domain/BookLevelComp.h new file mode 100644 index 000000000..924d3d0c4 --- /dev/null +++ b/src/lib/domain/BookLevelComp.h @@ -0,0 +1,57 @@ +#pragma once +#include "BookLevel.h" +#include "Side.h" + +namespace bts::domain { + +class BookLevelComp { + public: + explicit constexpr BookLevelComp(Side side); + + constexpr bool operator()(const BookLevel &lhs, const BookLevel &rhs) const; + + constexpr bool operator()(const BookLevel &lhs, Price rhs) const; + constexpr bool operator()(Price lhs, const BookLevel &rhs) const; + + bool operator()(const BookLevel &lhs, double rhs) const; + bool operator()(double lhs, const BookLevel &rhs) const; + + private: + Side side_; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr BookLevelComp::BookLevelComp(Side side) : side_(side) {} + +constexpr bool BookLevelComp::operator()( + const BookLevel &lhs, const BookLevel &rhs) const { + if (lhs.price == rhs.price) { + return lhs.total_quantity > rhs.total_quantity; + } + return lhs.price.is_better(side_, rhs.price); +} + +constexpr bool BookLevelComp::operator()( + const BookLevel &lhs, Price rhs) const { + return lhs.price.is_better(side_, rhs); +} + +constexpr bool BookLevelComp::operator()( + Price lhs, const BookLevel &rhs) const { + return lhs.is_better(side_, rhs.price); +} + +inline bool BookLevelComp::operator()( + const BookLevel &lhs, double rhs) const { + return operator()(lhs, Price::from_double(rhs)); +} + +inline bool BookLevelComp::operator()( + double lhs, const BookLevel &rhs) const { + return operator()(Price::from_double(lhs), rhs); +} + +} // namespace bts::domain diff --git a/src/lib/domain/BookSide.h b/src/lib/domain/BookSide.h new file mode 100644 index 000000000..e8b150e40 --- /dev/null +++ b/src/lib/domain/BookSide.h @@ -0,0 +1,13 @@ +#pragma once +#include "BookLevel.h" +#include + +namespace bts::domain { + +class BookSide { + public: + // compile time size for speed + std::array blevel; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/Currency.h b/src/lib/domain/Currency.h new file mode 100644 index 000000000..9add121e0 --- /dev/null +++ b/src/lib/domain/Currency.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +enum class Currency { BTC, EH, USD }; + +} // namespace bts::domain diff --git a/src/lib/domain/FutureSecurity.h b/src/lib/domain/FutureSecurity.h new file mode 100644 index 000000000..1d6cd8bbc --- /dev/null +++ b/src/lib/domain/FutureSecurity.h @@ -0,0 +1,11 @@ +#pragma once +#include "lib/core/TimeStamp.h" + +namespace bts::domain { + +class FutureSecurity { + public: + core::TimeStamp expiration; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/IndexSecurity.h b/src/lib/domain/IndexSecurity.h new file mode 100644 index 000000000..520954aa1 --- /dev/null +++ b/src/lib/domain/IndexSecurity.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class IndexSecurity {}; + +} // namespace bts::domain diff --git a/src/lib/domain/LegDefinition.h b/src/lib/domain/LegDefinition.h new file mode 100644 index 000000000..0f26caa3b --- /dev/null +++ b/src/lib/domain/LegDefinition.h @@ -0,0 +1,14 @@ +#pragma once +#include "Quantity.h" +#include "SecurityID.h" +#include "Side.h" + +namespace bts::domain { + +struct LegDefinition { + SecurityID security_id; + Quantity leg_mult; + Side side; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/NewBookSide.h b/src/lib/domain/NewBookSide.h new file mode 100644 index 000000000..aaea8858d --- /dev/null +++ b/src/lib/domain/NewBookSide.h @@ -0,0 +1,20 @@ +#pragma once +#include "BookLevel.h" +#include + +namespace bts::domain { + +class BookSide { + public: + // compile time size for speed + using Container = std::array; + + std::uint32_t num_populated_levels() const noexcept; + bool is_empty() const noexcept; + + private: + // compile time size for speed + Container levels_; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/OptionSecurity.h b/src/lib/domain/OptionSecurity.h new file mode 100644 index 000000000..d3fd927c4 --- /dev/null +++ b/src/lib/domain/OptionSecurity.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class OptionSecurity {}; + +} // namespace bts::domain diff --git a/src/lib/domain/OrderKey.h b/src/lib/domain/OrderKey.h new file mode 100644 index 000000000..e3e7c3269 --- /dev/null +++ b/src/lib/domain/OrderKey.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" +#include + +namespace bts::domain { + +using OrderKey = utils::ValueWrapper; + +} // namespace bts::domain diff --git a/src/lib/domain/Price.h b/src/lib/domain/Price.h new file mode 100644 index 000000000..52b28fc95 --- /dev/null +++ b/src/lib/domain/Price.h @@ -0,0 +1,457 @@ +#pragma once +#include "Side.h" +#include "lib/utils/bts_assert.h" +#include +#include +#include +#include + +#if bts_assert_msg +#define _ASSERT_MSG(EXP, msg) bts_assert_msg(EXP, msg) +#else +#define _ASSERT_MSG(EXP, msg) \ + do { \ + if (!(EXP)) { \ + std::cerr << "Assert failure: " << std::string(#EXP) << " " << msg \ + << std::endl; \ + if (is_debugger_present()) \ + debug_break(); \ + std::abort(); \ + } \ + } while (0) +#endif + +#define _ASSERT(EXP) _ASSERT_MSG(EXP, "") + +namespace bts::domain { + +class Price { + public: + Price() = default; + explicit constexpr Price( + std::int64_t mantissa, + std::int8_t exponent = Price::exponent()) noexcept; + constexpr Price(Price const &) = default; + Price(Price &&) noexcept = default; + ~Price() = default; + + template + static Price from_float(float price) noexcept; + [[nodiscard]] constexpr float to_float() const noexcept; + + template + static Price from_double(double price) noexcept; + [[nodiscard]] constexpr double to_double() const noexcept; + + static constexpr Price zero() noexcept; + static constexpr Price nan() noexcept; + [[nodiscard]] constexpr Price abs() const noexcept; + [[nodiscard]] Price square() const noexcept; + + [[nodiscard]] constexpr Price improve(Side s, Price by) const noexcept; + [[nodiscard]] constexpr Price worsen(Side s, Price by) const noexcept; + + [[nodiscard]] constexpr bool is_nan() const noexcept; + + [[nodiscard]] constexpr bool is_better(Side s, Price p2) const noexcept; + + [[nodiscard]] constexpr bool is_worse(Side s, Price p2) const noexcept; + + [[nodiscard]] constexpr bool is_better_or_equal( + Side s, Price p2) const noexcept; + + [[nodiscard]] constexpr bool is_worse_or_equal( + Side s, Price p2) const noexcept; + + [[nodiscard]] constexpr Price repl_nan(Price repl) const noexcept; + + [[nodiscard]] constexpr Price get_min(Price other) const noexcept; + [[nodiscard]] constexpr Price get_max(Price other) const noexcept; + + [[nodiscard]] constexpr Price get_better( + Side side, Price other) const noexcept; + + [[nodiscard]] constexpr Price get_worse( + Side side, Price other) const noexcept; + + template + static double get_mean(Iter first, Iter last, bool skip_nan = false); + template + static double get_mean(Range range, bool skip_nan = false); + + Price &operator=(Price const &) = default; + Price &operator=(Price &&) noexcept = default; + + constexpr Price operator-() const noexcept; + + constexpr bool operator==(Price factor) const noexcept; + constexpr bool operator!=(Price factor) const noexcept; + constexpr bool operator<(Price factor) const noexcept; + constexpr bool operator<=(Price factor) const noexcept; + constexpr bool operator>(Price factor) const noexcept; + constexpr bool operator>=(Price factor) const noexcept; + + constexpr Price operator+(Price factor) const noexcept; + constexpr Price operator-(Price factor) const noexcept; + constexpr Price operator*(Price factor) const noexcept; + constexpr Price operator/(Price factor) const noexcept; + + constexpr Price &operator+=(Price factor) noexcept; + constexpr Price &operator-=(Price factor) noexcept; + constexpr Price &operator*=(Price factor) noexcept; + constexpr Price &operator/=(Price factor) noexcept; + + constexpr bool operator==(std::int64_t factor) const noexcept; + constexpr bool operator!=(std::int64_t factor) const noexcept; + constexpr bool operator<(std::int64_t factor) const noexcept; + constexpr bool operator<=(std::int64_t factor) const noexcept; + constexpr bool operator>(std::int64_t factor) const noexcept; + constexpr bool operator>=(std::int64_t factor) const noexcept; + + constexpr Price operator+(std::int64_t factor) const noexcept; + constexpr Price operator-(std::int64_t factor) const noexcept; + constexpr Price operator*(std::int64_t factor) const noexcept; + constexpr Price operator/(std::int64_t factor) const noexcept; + + constexpr Price &operator+=(std::int64_t factor) noexcept; + constexpr Price &operator-=(std::int64_t factor) noexcept; + constexpr Price &operator*=(std::int64_t factor) noexcept; + constexpr Price &operator/=(std::int64_t factor) noexcept; + + [[nodiscard]] constexpr std::int64_t mantissa() const noexcept; + static constexpr std::int8_t exponent() noexcept; + + private: + std::int64_t _mantissa; + + static double _pow10() noexcept; + static double __pow10() noexcept; // NOLINT +}; + +std::ostream &operator<<(std::ostream &out, Price price) noexcept; + +} // namespace bts::domain + +namespace std { + +template <> +struct hash { // NOLINT + constexpr size_t operator()(const bts::domain::Price &price) const noexcept; +}; + +} // namespace std + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +namespace bts::domain { + +// NOLINTNEXTLINE +#define NAN_SENTINEL std::numeric_limits::min() +// NOLINTNEXTLINE +#define IS_NAN(x) (x == std::numeric_limits::min()) + +constexpr Price::Price(std::int64_t mantissa, std::int8_t exponent) noexcept + : _mantissa(mantissa) { + _ASSERT(exponent == Price::exponent()); +} + +template +inline Price Price::from_float(float price) noexcept { + return from_double(price); +} + +constexpr float Price::to_float() const noexcept { + return static_cast(to_double()); +} + +template +inline Price Price::from_double(double price) noexcept { + static_assert(PRECISION == -exponent()); + if (std::isnan(price)) { + return nan(); + } + double temp; // NOLINT + if (fabs(modf(price, &temp)) != 0.0) { + const double rounding = 0.5 * _pow10(); + price += (price > 0) ? rounding : -rounding; + price *= __pow10(); + return Price{(std::int64_t)price}; + } + return Price{(std::int64_t)(price * __pow10())}; +} + +constexpr double Price::to_double() const noexcept { + return is_nan() ? std::numeric_limits::quiet_NaN() + : _mantissa * _pow10(); // NOLINT +} + +constexpr Price Price::zero() noexcept { return Price(0); } +constexpr Price Price::nan() noexcept { return Price(NAN_SENTINEL); } +constexpr std::int8_t Price::exponent() noexcept { return -9; } +constexpr std::int64_t Price::mantissa() const noexcept { return _mantissa; } + +constexpr Price Price::abs() const noexcept { + if (_mantissa >= 0) { + return *this; + } + return Price{-_mantissa}; +} + +inline Price Price::square() const noexcept { + auto d = to_double(); + return from_double(d * d); +} + +constexpr Price Price::improve(Side s, Price by) const noexcept { + if (s == Side::Buy) { + return *this + by; + } + return *this - by; +} + +constexpr Price Price::worsen(Side s, Price by) const noexcept { + if (s == Side::Buy) { + return *this - by; + } + return *this + by; +} + +constexpr bool Price::is_nan() const noexcept { return IS_NAN(_mantissa); } + +constexpr bool Price::is_better(Side s, Price p2) const noexcept { + if (is_nan()) { + return false; + } + if (p2.is_nan()) { + return true; + } + if (s == Side::Buy) { + return *this > p2; + } + return *this < p2; +} + +constexpr bool Price::is_worse(Side s, Price p2) const noexcept { + return p2.is_better(s, *this); +} + +constexpr bool Price::is_better_or_equal(Side s, Price p2) const noexcept { + if (is_nan()) { + // This case is always false (even if p2 is nan), because nan != nan. + return false; + } + if (p2.is_nan()) { + return true; + } + if (s == Side::Buy) { + return *this >= p2; + } + return *this <= p2; +} + +constexpr bool Price::is_worse_or_equal(Side s, Price p2) const noexcept { + return p2.is_better_or_equal(s, *this); +} + +constexpr Price Price::repl_nan(Price repl) const noexcept { + if (is_nan()) { + return repl; + } + return *this; +} + +constexpr Price Price::get_min(Price other) const noexcept { + if (is_nan()) { + return other; + } + if (other.is_nan()) { + return *this; + } + if (*this < other) { + return *this; + } + return other; +} + +constexpr Price Price::get_max(Price other) const noexcept { + if (is_nan()) { + return other; + } + if (other.is_nan()) { + return *this; + } + if (*this > other) { + return *this; + } + return other; +} + +constexpr Price Price::get_better(Side side, Price other) const noexcept { + switch (side.value) { + case Side::Buy: + return get_max(other); + case Side::Sell: + return get_min(other); + default: + return nan(); + } +} + +constexpr Price Price::get_worse(Side side, Price other) const noexcept { + return get_better(side.other(), other); +} + +template +inline double Price::get_mean(Iter first, Iter last, bool skip_nan) { + if (first == last) { + return std::numeric_limits::quiet_NaN(); + } + auto sum = zero(); + std::int32_t n = 0; + do { + if (first->is_nan()) { + if (skip_nan) { + continue; + } + return std::numeric_limits::quiet_NaN(); + } + sum += *first; + n++; + first++; + } while (first != last); + if (n == 0) { + return std::numeric_limits::quiet_NaN(); + } + auto dsum = sum.to_double(); + return dsum / n; +} + +template +inline double Price::get_mean(Range range, bool skip_nan) { + return get_mean(range.begin(), range.end(), skip_nan); +} + +inline double Price::_pow10() noexcept { return std::pow(10.0, exponent()); } +inline double Price::__pow10() noexcept { return std::pow(10.0, -exponent()); } +constexpr Price Price::operator-() const noexcept { + if (is_nan()) { + return *this; + } + return Price{-_mantissa}; +} + +// If a number is nan, all comparisons are false. This is well-established +// behavior; even nan == nan evaluates to false. +// NOLINTNEXTLINE +#define PRICE_PRICE_COMPARISON(op, nan_part) \ + constexpr bool Price::operator op(Price factor) const noexcept { \ + return nan_part _mantissa op factor._mantissa; \ + } + +// NOLINTNEXTLINE +#define PRICE_PRICE_BIN_OP(op) \ + constexpr Price Price::operator op(Price factor) const noexcept { \ + if (is_nan() || factor.is_nan()) { \ + return nan(); \ + } \ + return Price{_mantissa op factor._mantissa}; \ + } + +// NOLINTNEXTLINE +#define PRICE_PRICE_BIN_REF_OP(op) \ + constexpr Price &Price::operator op(Price factor) noexcept { \ + if (factor.is_nan()) { \ + _mantissa = nan()._mantissa; \ + } else if (!is_nan()) { \ + _mantissa op factor._mantissa; \ + } \ + return *this; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_COMPARISON(op, nan_part) \ + constexpr bool Price::operator op(std::int64_t factor) const noexcept { \ + return nan_part _mantissa op factor; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_BIN_OP(op) \ + constexpr Price Price::operator op(std::int64_t factor) const noexcept { \ + if (is_nan()) { \ + return *this; \ + } \ + return Price{_mantissa op factor}; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_BIN_REF_OP(op) \ + constexpr Price &Price::operator op(std::int64_t factor) noexcept { \ + if (!is_nan()) { \ + _mantissa op factor; \ + } \ + return *this; \ + } + +PRICE_PRICE_COMPARISON(!=, is_nan() ||) +PRICE_PRICE_COMPARISON(==, !is_nan() &&) +PRICE_PRICE_COMPARISON(<, !is_nan() &&) +PRICE_PRICE_COMPARISON(<=, !is_nan() &&) +PRICE_PRICE_COMPARISON(>, !is_nan() &&) +PRICE_PRICE_COMPARISON(>=, !is_nan() &&) + +PRICE_PRICE_BIN_OP(+) +PRICE_PRICE_BIN_OP(-) +PRICE_PRICE_BIN_OP(*) +PRICE_PRICE_BIN_OP(/) + +PRICE_PRICE_BIN_REF_OP(+=) +PRICE_PRICE_BIN_REF_OP(-=) +PRICE_PRICE_BIN_REF_OP(*=) +PRICE_PRICE_BIN_REF_OP(/=) + +PRICE_INT64_COMPARISON(!=, is_nan() ||) +PRICE_INT64_COMPARISON(==, !is_nan() &&) +PRICE_INT64_COMPARISON(<, !is_nan() &&) +PRICE_INT64_COMPARISON(<=, !is_nan() &&) +PRICE_INT64_COMPARISON(>, !is_nan() &&) +PRICE_INT64_COMPARISON(>=, !is_nan() &&) + +PRICE_INT64_BIN_OP(+) +PRICE_INT64_BIN_OP(-) +PRICE_INT64_BIN_OP(*) +PRICE_INT64_BIN_OP(/) + +PRICE_INT64_BIN_REF_OP(+=) +PRICE_INT64_BIN_REF_OP(-=) +PRICE_INT64_BIN_REF_OP(*=) +PRICE_INT64_BIN_REF_OP(/=) + +inline std::ostream &operator<<(std::ostream &out, Price p) noexcept { + out << p.to_double(); + return out; +} + +#undef NAN_SENTINEL +#undef IS_NAN +#undef PRICE_PRICE_COMPARISON +#undef PRICE_PRICE_BIN_OP +#undef PRICE_PRICE_BIN_REF_OP +#undef PRICE_INT64_COMPARISON +#undef PRICE_INT64_BIN_OP +#undef PRICE_INT64_BIN_REF_OP + +} // namespace bts::domain + +namespace std { // NOLINT + +constexpr size_t hash::operator()( + const bts::domain::Price &price) const noexcept { + return price.mantissa(); +} + +} // namespace std + +#undef _ASSERT +#undef _ASSERT_MSG diff --git a/src/lib/domain/PriceComp.h b/src/lib/domain/PriceComp.h new file mode 100644 index 000000000..09f843b69 --- /dev/null +++ b/src/lib/domain/PriceComp.h @@ -0,0 +1,28 @@ +#pragma once +#include "Price.h" +#include "Side.h" + +namespace bts::domain { + +struct PriceComp { + constexpr PriceComp() = default; + constexpr PriceComp(Side side); + constexpr PriceComp(const PriceComp &other) = default; + + constexpr bool operator()(const Price &lhs, const Price &rhs); + + private: + Side _side = Side::Buy; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr PriceComp::PriceComp(Side side) : _side(side) {} + +constexpr bool PriceComp::operator()(const Price &lhs, const Price &rhs) { + return lhs.is_better(_side, rhs); +} + +} // namespace bts::domain diff --git a/src/lib/domain/Quantity.h b/src/lib/domain/Quantity.h new file mode 100644 index 000000000..c45426571 --- /dev/null +++ b/src/lib/domain/Quantity.h @@ -0,0 +1,116 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" +#include + +namespace bts::domain { + +using Quantity = utils::ValueWrapper; + +constexpr Quantity operator-(Quantity); + +constexpr Quantity operator+(Quantity, Quantity); +constexpr Quantity operator-(Quantity, Quantity); +constexpr Quantity operator*(Quantity, Quantity); +constexpr Quantity operator/(Quantity, Quantity); +constexpr Quantity operator%(Quantity, Quantity); + +constexpr Quantity &operator+=(Quantity &, Quantity); +constexpr Quantity &operator-=(Quantity &, Quantity); +constexpr Quantity &operator*=(Quantity &, Quantity); +constexpr Quantity &operator/=(Quantity &, Quantity); +constexpr Quantity &operator%=(Quantity &, Quantity); + +constexpr bool operator==(Quantity, std::uint32_t); +constexpr bool operator!=(Quantity, std::uint32_t); +constexpr bool operator<(Quantity, std::uint32_t); +constexpr bool operator<=(Quantity, std::uint32_t); +constexpr bool operator>(Quantity, std::uint32_t); +constexpr bool operator>=(Quantity, std::uint32_t); + +constexpr Quantity operator+(Quantity, std::uint32_t); +constexpr Quantity operator-(Quantity, std::uint32_t); +constexpr Quantity operator*(Quantity, std::uint32_t); +constexpr Quantity operator/(Quantity, std::uint32_t); + +Quantity &operator+=(Quantity &, std::uint32_t); +Quantity &operator-=(Quantity &, std::uint32_t); +Quantity &operator*=(Quantity &, std::uint32_t); +Quantity &operator/=(Quantity &, std::uint32_t); + +std::uint32_t &operator+=(std::uint32_t &, Quantity); +std::uint32_t &operator-=(std::uint32_t &, Quantity); +std::uint32_t &operator*=(std::uint32_t &, Quantity); +std::uint32_t &operator/=(std::uint32_t &, Quantity); + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr Quantity operator-(Quantity qty) { return Quantity(-qty.value()); } + +#define QTY_QTY_BIN_OP(result_t, op) \ + constexpr result_t operator op(Quantity lhs, Quantity rhs) { \ + return result_t(lhs.value() op rhs.value()); \ + } + +#define QTY_QTY_BIN_REF_OP(op) \ + constexpr Quantity &operator op(Quantity &lhs, Quantity rhs) { \ + lhs.value() op rhs.value(); \ + return lhs; \ + } + +#define QTY_UINT32_BIN_OP(result_t, op) \ + constexpr result_t operator op(Quantity lhs, std::uint32_t rhs) { \ + return result_t(lhs.value() op rhs); /*NOLINT*/ \ + } \ + constexpr result_t operator op(std::uint32_t lhs, Quantity rhs) { \ + return result_t(lhs op rhs.value()); \ + } + +#define QTY_UINT32_BIN_REF_OP(op) \ + inline Quantity &operator op(Quantity &lhs, std::uint32_t rhs) { \ + lhs.value() op rhs; \ + return lhs; \ + } \ + inline std::uint32_t &operator op(std::uint32_t &lhs, Quantity rhs) { \ + lhs op rhs.value(); \ + return lhs; \ + } + +QTY_QTY_BIN_OP(Quantity, +) +QTY_QTY_BIN_OP(Quantity, -) +QTY_QTY_BIN_OP(Quantity, *) +QTY_QTY_BIN_OP(Quantity, /) +QTY_QTY_BIN_OP(Quantity, %) + +QTY_QTY_BIN_REF_OP(+=) +QTY_QTY_BIN_REF_OP(-=) +QTY_QTY_BIN_REF_OP(*=) +QTY_QTY_BIN_REF_OP(/=) +QTY_QTY_BIN_REF_OP(%=) + +QTY_UINT32_BIN_OP(bool, !=) +QTY_UINT32_BIN_OP(bool, ==) +QTY_UINT32_BIN_OP(bool, <) +QTY_UINT32_BIN_OP(bool, <=) +QTY_UINT32_BIN_OP(bool, >) +QTY_UINT32_BIN_OP(bool, >=) + +QTY_UINT32_BIN_OP(Quantity, +) +QTY_UINT32_BIN_OP(Quantity, -) +QTY_UINT32_BIN_OP(Quantity, *) +QTY_UINT32_BIN_OP(Quantity, /) +QTY_UINT32_BIN_OP(Quantity, %) + +QTY_UINT32_BIN_REF_OP(+=) +QTY_UINT32_BIN_REF_OP(-=) +QTY_UINT32_BIN_REF_OP(*=) +QTY_UINT32_BIN_REF_OP(/=) +QTY_UINT32_BIN_REF_OP(%=) + +#undef QTY_QTY_BIN_OP +#undef QTY_QTY_BIN_REF_OP +#undef QTY_UINT32_BIN_OP +#undef QTY_UINT32_BIN_REF_OP + +} // namespace bts::domain diff --git a/src/lib/domain/RFQ.h b/src/lib/domain/RFQ.h new file mode 100644 index 000000000..128cb70db --- /dev/null +++ b/src/lib/domain/RFQ.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class RFQ {}; + +} // namespace bts::domain diff --git a/src/lib/domain/Security.h b/src/lib/domain/Security.h new file mode 100644 index 000000000..7557ca5c9 --- /dev/null +++ b/src/lib/domain/Security.h @@ -0,0 +1,34 @@ +#pragma once +#include "FutureSecurity.h" +#include "IndexSecurity.h" +#include "OptionSecurity.h" +#include "SecurityCommon.h" +#include "SpreadSecurity.h" +#include "lib/utils/overloaded.h" +#include + +namespace bts::domain { + +class Security { + public: + SecurityCommon security_common; + std::variant + security; + + SecurityType security_type() const; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +inline SecurityType Security::security_type() const { + return std::visit( + overloaded{[](const IndexSecurity &) { return SecurityType::INDEX; }, + [](const FutureSecurity &) { return SecurityType::FUTURE; }, + [](const SpreadSecurity &) { return SecurityType::SPREAD; }, + [](const OptionSecurity &) { return SecurityType::OPTION; }}, + security); +} + +} // namespace bts::domain diff --git a/src/lib/domain/SecurityCommon.h b/src/lib/domain/SecurityCommon.h new file mode 100644 index 000000000..f1501ddc1 --- /dev/null +++ b/src/lib/domain/SecurityCommon.h @@ -0,0 +1,30 @@ +#pragma once +#include "Currency.h" +#include "Price.h" +#include "SecurityID.h" +#include "SecurityType.h" +#include "Venue.h" +#include + +namespace bts::domain { + +// All the security common params, ie regardless of Future, Spot, Spread etc +class SecurityCommon { + public: + Venue venue; + SecurityID security_id{}; + SecurityType security_type; + Currency currency; + double display_factor{}; + double cash_per_point{}; + std::string symbol; + std::string security_group; + std::string asset; + std::string security_desc; + Price min_price_increment{}; + double min_price_increment_ammount = 0; + bool implied_matching = false; + std::string cme_security_type; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/SecurityID.h b/src/lib/domain/SecurityID.h new file mode 100644 index 000000000..cae1f47ea --- /dev/null +++ b/src/lib/domain/SecurityID.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" +#include + +namespace bts::domain { + +using SecurityID = utils::ValueWrapper; + +} // namespace bts::domain diff --git a/src/lib/domain/SecurityMarketDataStatistics.h b/src/lib/domain/SecurityMarketDataStatistics.h new file mode 100644 index 000000000..76ef2e38d --- /dev/null +++ b/src/lib/domain/SecurityMarketDataStatistics.h @@ -0,0 +1,18 @@ +#pragma once +#include "Price.h" +#include "Quantity.h" +#include "Security.h" + +namespace bts::domain { + +class SecurityMarketDataStatistics { + public: + SecurityID security_id; + Price low; + Price high; + Price open; + Price settle; + Quantity volume; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/SecurityState.h b/src/lib/domain/SecurityState.h new file mode 100644 index 000000000..5eb3148c0 --- /dev/null +++ b/src/lib/domain/SecurityState.h @@ -0,0 +1,13 @@ +#pragma once +#include "SecurityID.h" + +namespace bts::domain { + +class SecurityState { + public: + enum class State { PREOPEN, OPEN }; + State state = State::OPEN; + SecurityID security_id; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/SecurityType.h b/src/lib/domain/SecurityType.h new file mode 100644 index 000000000..205e1de42 --- /dev/null +++ b/src/lib/domain/SecurityType.h @@ -0,0 +1,8 @@ +#pragma once + +namespace bts::domain { + +// more types will be needed there like spots etc +enum class SecurityType { INDEX, FUTURE, SPREAD, OPTION }; + +} // namespace bts::domain diff --git a/src/lib/domain/Side.cpp b/src/lib/domain/Side.cpp new file mode 100644 index 000000000..79ba8ea9d --- /dev/null +++ b/src/lib/domain/Side.cpp @@ -0,0 +1,10 @@ +#include "Side.h" + +namespace bts::domain { + +std::ostream &operator<<(std::ostream &out, const Side &s) { + out << s.name(); + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/Side.h b/src/lib/domain/Side.h new file mode 100644 index 000000000..66ea88e58 --- /dev/null +++ b/src/lib/domain/Side.h @@ -0,0 +1,155 @@ +#pragma once +#include + +namespace bts::domain { + +class Side { + public: + enum Value { Buy = 0, Sell = 1 }; + Value value; + + Side() = default; + constexpr Side(Side::Value value) noexcept; // NOLINT + + Side(const Side &) noexcept = default; + Side(Side &&) noexcept = default; + Side &operator=(const Side &) noexcept = default; + Side &operator=(Side &&) noexcept = default; + + ~Side() = default; + + static constexpr Side from_contract_flow(int flow); + + [[nodiscard]] constexpr size_t as_index() const noexcept; + [[nodiscard]] constexpr int as_contract_flow() const noexcept; + [[nodiscard]] constexpr int as_cash_flow() const noexcept; + [[nodiscard]] constexpr const char *name() const noexcept; + [[nodiscard]] constexpr Side other() const noexcept; + template + constexpr NumericT normalize(NumericT numeric) const noexcept; + + template + [[nodiscard]] T &pick(T &pick_if_buy, T &pick_if_sell) const; + + template + [[nodiscard]] const T &pick( + const T &pick_if_buy, const T &pick_if_sell) const; + + template + static void foreach (C c); + + template + static bool foreither(C c); + + template + static bool forboth(C c); +}; + +constexpr bool operator==(Side lhs, Side rhs) noexcept; +constexpr bool operator==(Side lhs, Side::Value rhs) noexcept; +constexpr bool operator!=(Side lhs, Side rhs) noexcept; +constexpr bool operator!=(Side lhs, Side::Value rhs) noexcept; +constexpr Side operator*(Side lhs, Side rhs) noexcept; +constexpr Side operator*(Side lhs, Side::Value rhs) noexcept; + +std::ostream &operator<<(std::ostream &out, const Side &s); + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr Side Side::from_contract_flow(int flow) { + if (flow > 0) { + return Side::Buy; + } + return Side::Sell; +} + +constexpr Side::Side(Side::Value value) noexcept : value(value) {} + +constexpr std::size_t Side::as_index() const noexcept { return (int)value; } + +constexpr int Side::as_contract_flow() const noexcept { + if (value == Buy) { + return 1; + } + return -1; +} + +constexpr int Side::as_cash_flow() const noexcept { + if (value == Buy) { + return -1; + } + return 1; +} + +constexpr const char *Side::name() const noexcept { + if (value == Side::Buy) { + return "Buy"; + } + return "Sell"; +} + +constexpr Side Side::other() const noexcept { + if (value == Side::Buy) { + return {Side::Sell}; + } + return {Side::Buy}; +} + +template +constexpr NumericT Side::normalize(NumericT numeric) const noexcept { + return value == Side::Buy ? numeric : -numeric; +} + +template +T &Side::pick(T &pick_if_buy, T &pick_if_sell) const { + return value == Side::Buy ? pick_if_buy : pick_if_sell; +} + +template +const T &Side::pick(const T &pick_if_buy, const T &pick_if_sell) const { + return value == Side::Buy ? pick_if_buy : pick_if_sell; +} + +template +void Side::foreach (C c) { + c(Side(Side::Buy)); + c(Side(Side::Sell)); +} + +template +bool Side::foreither(C c) { + return c(Side(Side::Buy)) || c(Side(Side::Sell)); +} + +template +bool Side::forboth(C c) { + return c(Side(Side::Buy)) && c(Side(Side::Sell)); +} + +constexpr bool operator==(Side lhs, Side rhs) noexcept { + return lhs.value == rhs.value; +} + +constexpr bool operator==(Side lhs, Side::Value rhs) noexcept { + return lhs.value == rhs; +} + +constexpr bool operator!=(Side lhs, Side rhs) noexcept { + return lhs.value != rhs.value; +} + +constexpr bool operator!=(Side lhs, Side::Value rhs) noexcept { + return lhs.value != rhs; +} + +constexpr Side operator*(Side lhs, Side rhs) noexcept { + return rhs == Side::Buy ? lhs : lhs.other(); +} + +constexpr Side operator*(Side lhs, Side::Value rhs) noexcept { + return rhs == Side::Buy ? lhs : lhs.other(); +} + +} // namespace bts::domain diff --git a/src/lib/domain/SpreadSecurity.h b/src/lib/domain/SpreadSecurity.h new file mode 100644 index 000000000..e0cffd72f --- /dev/null +++ b/src/lib/domain/SpreadSecurity.h @@ -0,0 +1,14 @@ +#pragma once +#include "LegDefinition.h" +#include "SecurityCommon.h" +#include + +namespace bts::domain { + +class SpreadSecurity { + public: + SecurityCommon security_definition; + std::vector legs; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/TradeRecord.h b/src/lib/domain/TradeRecord.h new file mode 100644 index 000000000..53ef83cf9 --- /dev/null +++ b/src/lib/domain/TradeRecord.h @@ -0,0 +1,20 @@ +#pragma once +#include "SecurityID.h" +#include "lib/core/TimeStamp.h" +#include "AggressorSide.h" +#include "Quantity.h" +#include "Price.h" + +namespace bts::domain { + +class TradeRecord { + public: + SecurityID sec_id = {}; + TimeStamp time_stamp = {}; + AggressorSide agg_side = {}; + Quantity trade_quantity; + Price trade_price; +}; + + +} // namespace bts::domain diff --git a/src/lib/domain/UserID.h b/src/lib/domain/UserID.h new file mode 100644 index 000000000..c7cd24ff6 --- /dev/null +++ b/src/lib/domain/UserID.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/utils/ValueWrapper.h" +#include + +namespace bts::domain { + +using UserID = utils::ValueWrapper; + +} // namespace bts::domain diff --git a/src/lib/domain/Venue.h b/src/lib/domain/Venue.h new file mode 100644 index 000000000..7ed5620e6 --- /dev/null +++ b/src/lib/domain/Venue.h @@ -0,0 +1,14 @@ +#pragma once + +namespace bts::domain { + +enum class Venue { + None = 0, + Glbx = 1, + Deribit = 2, + Huobi = 3, + Binance = 4, + FTX = 5 +}; + +} // namespace bts::domain diff --git a/src/lib/md/IMarketDataListener.h b/src/lib/md/IMarketDataListener.h new file mode 100644 index 000000000..5ca1203ca --- /dev/null +++ b/src/lib/md/IMarketDataListener.h @@ -0,0 +1,38 @@ +#pragma once +#include + +namespace bts::domain { +class Security; +class SecurityState; +class SecurityMarketDataStatistics; +class Book; +class TradeRecord; +class RFQ; +} // namespace bts::domain + +namespace bts::md { + +class MarketDataError; + +// The is the interface that registers itself to IMarketDataGateway and receives +// all market data via callbacks. These callbacks are always on the same thread. +class IMarketDataListener { + public: + // complete list of all securities. as securities are added subsequent calls + // on this callback are made. IMarketDataGateway guarantees that a security + // is seen via on_securities first, before any other data callbacks on that + // security are made. + virtual void on_securities( + const std::vector &complete_security_list) = 0; + virtual void on_security_state( + const domain::SecurityState &security_state) = 0; + virtual void on_security_statistics( + const domain::SecurityMarketDataStatistics &security_stats) = 0; + virtual void on_book(const domain::Book &book) = 0; + virtual void on_trades( + const std::vector &trades) = 0; + virtual void on_rfqs(const std::vector &rfqs) = 0; + virtual void on_error(const MarketDataError &error) = 0; +}; + +} // namespace bts::md diff --git a/src/lib/md/MarketDataError.cpp b/src/lib/md/MarketDataError.cpp new file mode 100644 index 000000000..2d441ee63 --- /dev/null +++ b/src/lib/md/MarketDataError.cpp @@ -0,0 +1,11 @@ +#include "MarketDataError.h" + +namespace bts::md { + +std::ostream &operator<<( + std::ostream &out, const MarketDataError &value) noexcept { + out << value.type_name() << ": " << value.message; + return out; +} + +} // namespace bts::md diff --git a/src/lib/md/MarketDataError.h b/src/lib/md/MarketDataError.h new file mode 100644 index 000000000..eb2f75811 --- /dev/null +++ b/src/lib/md/MarketDataError.h @@ -0,0 +1,32 @@ +#pragma once +#include +#include + +namespace bts::md { + +class MarketDataError { + public: + enum Type { DISCONNECTION }; + Type type = Type::DISCONNECTION; + std::string message = {}; + + constexpr const char *type_name() const noexcept; +}; + +std::ostream &operator<<( + std::ostream &out, const MarketDataError &value) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *MarketDataError::type_name() const noexcept { + switch (type) { + case MarketDataError::DISCONNECTION: + return "DISCONNECTION"; + default: + return "UNKNOWN"; + } +} + +} // namespace bts::md diff --git a/src/lib/md/MarketDataListenerID.h b/src/lib/md/MarketDataListenerID.h new file mode 100644 index 000000000..46a34dd98 --- /dev/null +++ b/src/lib/md/MarketDataListenerID.h @@ -0,0 +1,9 @@ +#pragma once +#include "lib/core/ValueWrapper.h" + +namespace bts::md { + +using MarketDataListenerID = + core::ValueWrapper; + +} // namespace bts::md diff --git a/src/lib/md/MarketDataSubscription.h b/src/lib/md/MarketDataSubscription.h new file mode 100644 index 000000000..a0e34e2e2 --- /dev/null +++ b/src/lib/md/MarketDataSubscription.h @@ -0,0 +1,34 @@ +#pragma once +#include "lib/domain/Venue.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/md/cme/GlbxMarketDataSubscription.h" +#include "lib/md/deribit/DeribitMarketDataSubscription.h" +#include + +namespace bts::md { + +struct MarketDataSubscription { + domain::Venue venue() const; + const std::variant< + cme::GlbxMarketDataSubscription, + deribit::DeribitMarketDataSubscription, + binance::BinanceMarketDataSubscription> + subscription{}; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +inline domain::Venue MarketDataSubscription::venue() const { + if (std::holds_alternative(subscription)) { + return domain::Venue::Glbx; + } + if (std::holds_alternative( + subscription)) { + return domain::Venue::Deribit; + } + return domain::Venue::Glbx; +} + +} // namespace bts::md diff --git a/src/lib/md/SecurityMarketState.cpp b/src/lib/md/SecurityMarketState.cpp new file mode 100644 index 000000000..5ac068108 --- /dev/null +++ b/src/lib/md/SecurityMarketState.cpp @@ -0,0 +1,11 @@ +#include "SecurityMarketState.h" + +namespace bts::md { + +std::ostream &operator<<( + std::ostream &out, const SecurityMarketState &value) noexcept { + out << value.name(); + return out; +} + +} // namespace bts::md diff --git a/src/lib/md/SecurityMarketState.h b/src/lib/md/SecurityMarketState.h new file mode 100644 index 000000000..513753d26 --- /dev/null +++ b/src/lib/md/SecurityMarketState.h @@ -0,0 +1,32 @@ +#pragma once +#include + +namespace bts::md { + +class SecurityMarketState { + public: + enum Value { PREOPEN, OPEN }; + Value value = Value::OPEN; + + constexpr const char *name() const noexcept; +}; + +std::ostream &operator<<( + std::ostream &out, const SecurityMarketState &value) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *SecurityMarketState::name() const noexcept { + switch (value) { + case SecurityMarketState::PREOPEN: + return "PREOPEN"; + case SecurityMarketState::OPEN: + return "OPEN"; + default: + return "UNKNOWN"; + } +} + +} // namespace bts::md diff --git a/src/lib/md/cme/GlbxMarketDataSubscription.h b/src/lib/md/cme/GlbxMarketDataSubscription.h new file mode 100644 index 000000000..b80a38321 --- /dev/null +++ b/src/lib/md/cme/GlbxMarketDataSubscription.h @@ -0,0 +1,20 @@ +#pragma once + +namespace bts::md::cme { + +// subscription parameters, ex: this is what we have for glbx +// feed_handler { +// name: "360" # COMEX Globex Futures +// incremental_a { group: "224.0.31.192" port: 14360} +// incremental_b { group: "224.0.32.192" port: 15360} +// instrument { group: "224.0.31.212" port: 14360} +// snapshot_mbo { group: "233.72.75.21" port: 23360} +// interface_a: "172.17.248.30" +// interface_b: "172.17.249.30" +// process_mbo: false +// process_trades: false +// } +// (I can give a complete implementation of GlbxMarketDataSubscription) +struct GlbxMarketDataSubscription {}; + +} // namespace bts::md::cme diff --git a/src/lib/md/deribit/DeribitMarketDataSubscription.h b/src/lib/md/deribit/DeribitMarketDataSubscription.h new file mode 100644 index 000000000..f765bc75e --- /dev/null +++ b/src/lib/md/deribit/DeribitMarketDataSubscription.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::md::deribit { + +struct DeribitMarketDataSubscription {}; + +} // namespace bts::md::deribit diff --git a/src/lib/md/emumba/IMarketDataListener.h b/src/lib/md/emumba/IMarketDataListener.h deleted file mode 100644 index 3b1767cbc..000000000 --- a/src/lib/md/emumba/IMarketDataListener.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include - -namespace EmumbaMarketData { - -struct Security; -struct SecurityState; -struct SecurityMarketDataStatistics; -struct Book; -struct TradeRecord; -struct MarketDataError; -struct RFQ; - -// The is the interface that registers itself to IMarketDataGateway and receives -// all market data via callbacks. These callbacks are always on the same thread. -class IMarketDataListener { - // complete list of all securities. as securities are added subsequent calls - // on this callback are made. IMarketDataGateway guarantees that a security - // is seen via on_securities first, before any other data callbacks on that - // security are made. - virtual void on_securities( - const std::vector &complete_security_list) = 0; - virtual void on_security_state(const SecurityState &security_state) = 0; - virtual void on_security_statistics( - const SecurityMarketDataStatistics &security_stats) = 0; - virtual void on_book(const Book &book) = 0; - virtual void on_trades(const std::vector &trades) = 0; - virtual void on_rfqs(const std::vector &rfqs) = 0; - virtual void on_error(const MarketDataError &error) = 0; -}; - -} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataCommon.h b/src/lib/md/emumba/MarketDataCommon.h deleted file mode 100644 index 40cf66655..000000000 --- a/src/lib/md/emumba/MarketDataCommon.h +++ /dev/null @@ -1,235 +0,0 @@ -#pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace EmumbaMarketData { - -// placed a bunch of common types here. Need to be exctracted out to their own -// classes/files - -// wrapper around primitive types, so that SecurityID, OrderID, Quantity etc -// are types instead of size_t, uint32_t etc -template -class ValueWrapper { - public: - constexpr ValueWrapper() = default; - ~ValueWrapper() = default; - constexpr explicit ValueWrapper(ValueT const &v) : _v(v) {} - constexpr explicit ValueWrapper(ValueT &&v) : _v(std::move(v)) {} - - constexpr ValueWrapper(ValueWrapper const &v) = default; - constexpr ValueWrapper(ValueWrapper &&v) noexcept = default; - ValueWrapper &operator=(ValueWrapper const &v) = default; - ValueWrapper &operator=(ValueWrapper &&v) noexcept = default; - - constexpr bool operator==(ValueWrapper const &v) const { return _v == v._v; } - constexpr bool operator!=(ValueWrapper const &v) const { return _v != v._v; } - constexpr bool operator<(ValueWrapper const &v) const { return _v < v._v; } - constexpr bool operator<=(ValueWrapper const &v) const { return _v <= v._v; } - constexpr bool operator>(ValueWrapper const &v) const { return _v > v._v; } - constexpr bool operator>=(ValueWrapper const &v) const { return _v >= v._v; } - constexpr ValueT const &value() const { return _v; } - constexpr ValueT &value() { return _v; } - - private: - ValueT _v; -}; - -using Quantity = ValueWrapper; -using SecurityID = ValueWrapper; -using AccountID = ValueWrapper; -using UserID = ValueWrapper; -using MarketDataListenerID = - ValueWrapper; -using OrderKey = ValueWrapper; - -// more types will be needed there like spots etc -enum class SecurityType { INDEX, FUTURE, SPREAD, OPTION }; - -enum class Currency { BTC, EH, USD }; - -// Usually exchanges give price's as mantissa and exponent. The fastest way is -// to keep it like that and do the math in integers vs doubles (I can give you a -// complete implementation of this - this is just a placeholder for now) -class Price { - public: - constexpr Price() = default; - constexpr Price(std::int64_t mantissa) noexcept : _mantissa(mantissa) {} - constexpr Price(Price const &) = default; - constexpr bool is_nan() const { - return _mantissa == std::numeric_limits::min(); - } - inline constexpr double to_double() const noexcept { - return is_nan() ? std::numeric_limits::quiet_NaN() - : _mantissa * pow10(); - } - inline constexpr double pow10() const noexcept { - return std::pow(10.0, exp); - } - // all math operators should be overloaded here (I can send the whole thing) - constexpr bool operator==(const Price &o) const noexcept { - return _mantissa == o._mantissa; - } - constexpr bool operator<(const Price &o) const noexcept { - return _mantissa < o._mantissa; - } - constexpr Price &operator+=(const Price &o) noexcept { - _mantissa += o._mantissa; - return *this; - } - - private: - // 9 decimal places is the max we have seen. cryptos might be different - const std::int8_t exp{-9}; - std::int64_t _mantissa{0}; -}; - -enum class Venue { Glbx = 0, Deribit = 1, Huobi = 2, Binance = 3, FTX }; - -// subscription parameters, ex: this is what we have for glbx -// feed_handler { -// name: "360" # COMEX Globex Futures -// incremental_a { group: "224.0.31.192" port: 14360} -// incremental_b { group: "224.0.32.192" port: 15360} -// instrument { group: "224.0.31.212" port: 14360} -// snapshot_mbo { group: "233.72.75.21" port: 23360} -// interface_a: "172.17.248.30" -// interface_b: "172.17.249.30" -// process_mbo: false -// process_trades: false -// } -// (I can give a complete implementation of GlbxMarketDataSubscription) -struct GlbxMarketDataSubscription {}; - -struct DeribitMarketDataSubscription {}; - -struct MarketDataGatewaySubscription { - const Venue venue; - const std::variant - subscription = {DeribitMarketDataSubscription{}}; -}; - -// I can send this whole class later but its a nice wrapper around the linux -// posix time -struct TimeStamp { - private: - // posix time - uint64_t _v{}; - - public: - uint64_t value() const { return _v; } -}; - -enum class Side { BUY, SIDE }; - -// All the security common params, ie regardless of Future, Spot, Spread etc -class SecurityCommon { - public: - Venue venue; - SecurityID security_id{}; - SecurityType security_type; - Currency currency; - double display_factor{}; - double cash_per_point{}; - std::string symbol; - std::string security_group; - std::string asset; - std::string security_desc; - Price min_price_increment{}; - double min_price_increment_ammount = 0; - bool implied_matching = false; -}; - -class IndexSecurity {}; - -class FutureSecurity { - public: - TimeStamp expiration; -}; - -struct LegDefinition { - SecurityID security_id; - Quantity leg_mult; - Side side; -}; - -class SpreadSecurity { - public: - std::vector legs; -}; - -struct Security { - SecurityCommon security_common; - std::variant security; - SecurityType security_type() const { - if (std::holds_alternative(security)) { - return SecurityType::INDEX; - } else if (std::holds_alternative(security)) { - return SecurityType::FUTURE; - } else { - return SecurityType::SPREAD; - } - } -}; - -struct BookLevel { - const Price price = {}; - const Quantity total_qty = {}; - const Quantity direct_qty = {}; - size_t n_orders = {}; - Quantity implied_qty() const { return Quantity{}; } -}; - -struct BookSide { - // compile time size for speed - std::array blevel; -}; - -struct Book { - SecurityID security_id; - BookSide bids; - BookSide asks; -}; - -enum class AggressorSide { Buy = 0, Sell = 1, None = 2 }; - -struct TradeRecord { - SecurityID sec_id = {}; - TimeStamp time_stamp = {}; - AggressorSide agg_side = {}; - Quantity trade_quantity; - Price trade_price; -}; - -struct SecurityState { - public: - enum class State { PREOPEN, OPEN }; - State state = State::OPEN; - SecurityID security_id; -}; - -struct SecurityMarketDataStatistics { - SecurityID security_id; - Price low; - Price high; - Price open; - Price settle; - Quantity volume; -}; - -struct MarketDataError { - enum class ErrorType { DISCONNECTION }; - ErrorType error_type = ErrorType::DISCONNECTION; - std::string error_text = {}; -}; - -struct RFQ {}; - -} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/md/emumba/MarketDataGateway.h b/src/lib/md/emumba/MarketDataGateway.h index 47b669b0b..6f59d0ae1 100644 --- a/src/lib/md/emumba/MarketDataGateway.h +++ b/src/lib/md/emumba/MarketDataGateway.h @@ -1,10 +1,14 @@ #pragma once - -#include "MarketDataCommon.h" +#include "lib/domain/SecurityID.h" +#include "lib/md/MarketDataListenerID.h" +#include "lib/md/MarketDataSubscription.h" #include #include #include + +namespace bts::md { class IMarketDataListener; +} namespace EmumbaMarketData { @@ -15,7 +19,7 @@ struct MarketDataRegistration { std::string error_text{}; }; // will have a value when there is no error - std::optional listener_id; + std::optional listener_id; RegstrationError error = {}; }; @@ -25,10 +29,12 @@ class MarketDataGateway { // listener is assigned an ID if the registration is successful. Subsequent // subscription of securities and unregister_listener is is via this id. MarketDataRegistration register_listener( - const MarketDataGatewaySubscription &, IMarketDataListener *) noexcept; + const bts::md::MarketDataSubscription &, + bts::md::IMarketDataListener *) noexcept; void subscribe( - MarketDataListenerID id, const std::vector &securities); - void unregister_listener(MarketDataListenerID id); + bts::md::MarketDataListenerID id, + const std::vector &securities); + void unregister_listener(bts::md::MarketDataListenerID id); }; -} // namespace EmumbaMarketData \ No newline at end of file +} // namespace EmumbaMarketData diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 8f3fa5c4a..8796f8513 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,5 +1,4 @@ -#include "lib/md/emumba/IMarketDataListener.h" -#include "lib/md/emumba/MarketDataCommon.h" +#include "lib/md/IMarketDataListener.h" #include "lib/md/emumba/MarketDataGateway.h" #include "lib/md/emumba/OrderGateway.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index f5bce2356..99d74f4d4 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -1,8 +1,22 @@ #include "EmumbaMDListener.h" +#include "lib/domain/AggressorSide.h" +#include "lib/domain/Book.h" +#include "lib/domain/FutureSecurity.h" +#include "lib/domain/IndexSecurity.h" +#include "lib/domain/OptionSecurity.h" +#include "lib/domain/RFQ.h" +#include "lib/domain/Security.h" +#include "lib/domain/SecurityMarketDataStatistics.h" +#include "lib/domain/SecurityState.h" +#include "lib/domain/Side.h" +#include "lib/domain/SpreadSecurity.h" +#include "lib/domain/TradeRecord.h" +#include "lib/domain/Venue.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" #include "lib/md/IntPrice.h" #include "lib/md/MDProducer.h" +#include "lib/md/MarketDataError.h" #include "lib/md/Shm/FixedSecurity.h" #include "lib/md/protos/co2.pb.h" #include "lib/utils/TimeStamp.h" @@ -27,58 +41,55 @@ void clear_books(MdArray &md_side) { } } -void copy_books( - const EmumbaMarketData::BookSide &from, MdArray &to, bool clear = true) { +void copy_books(const domain::BookSide &from, MdArray &to, bool clear = true) { if (clear) { clear_books(to); } size_t i = 0; - for (const EmumbaMarketData::BookLevel &l : from.blevel) { + for (const domain::BookLevel &l : from) { if (i < COCONUT_MAX_DEPTH) { to[i++] = PriceSize{// TODO IntPrice_from_double<9>(l.price.to_double()), - l.direct_qty.value()}; + l.direct_quantity.value()}; } } } } // namespace helpers -inline api::Venue convert_venue(EmumbaMarketData::Venue /*unused*/) { +inline api::Venue convert_venue(domain::Venue /*unused*/) { // TODO return api::Venue::VENUE_BTS; } -inline co2::TradingStatus convert_status( - EmumbaMarketData::SecurityState::State state) { +inline co2::TradingStatus convert_status(domain::SecurityState::State state) { switch (state) { - case EmumbaMarketData::SecurityState::State::OPEN: + case domain::SecurityState::State::OPEN: return co2::TRADINGSTATUS_NORMAL; - case EmumbaMarketData::SecurityState::State::PREOPEN: + case domain::SecurityState::State::PREOPEN: return co2::TRADINGSTATUS_PRE_OPEN; } return co2::TRADINGSTATUS_UNKNOWN; } -inline co2::AggressorSide convert_agg_side( - EmumbaMarketData::AggressorSide agg_side) { - switch (agg_side) { - case EmumbaMarketData::AggressorSide::Buy: +inline co2::AggressorSide convert_agg_side(domain::AggressorSide agg_side) { + switch (agg_side.value) { + case domain::AggressorSide::Buy: return co2::AggressorSide::AGGRESSOR_SIDE_BUY; - case EmumbaMarketData::AggressorSide::Sell: + case domain::AggressorSide::Sell: return co2::AggressorSide::AGGRESSOR_SIDE_SELL; - case EmumbaMarketData::AggressorSide::None: + case domain::AggressorSide::None: return co2::AggressorSide::AGGRESSOR_SIDE_NONE; } return co2::AggressorSide::AGGRESSOR_SIDE_NONE; } -bts::md::IntPrice convert_to_intprice(EmumbaMarketData::Price price) { +bts::md::IntPrice convert_to_intprice(domain::Price price) { return IntPrice_from_double<9>(price.to_double()); } inline EmumbaSecurityData *get_security( - EmumbaSecurityIndex &sec_map, EmumbaMarketData::SecurityID id) { + EmumbaSecurityIndex &sec_map, domain::SecurityID id) { auto int_id = static_cast(id.value()); EmumbaSecurityData *rv = sec_map.get_security(int_id); bts_assert(rv != nullptr); @@ -99,20 +110,16 @@ EmumbaMDListener::EmumbaMDListener( : me(std::make_unique(index, md_producer)) {} void EmumbaMDListener::on_securities( - const std::vector - &complete_security_list) { - for (EmumbaMarketData::Security const *s : complete_security_list) { - if (std::holds_alternative( - s->security)) { + const std::vector &complete_security_list) { + for (domain::Security const *s : complete_security_list) { + if (std::holds_alternative(s->security)) { _add_index(*s); - } else if (std::holds_alternative( - s->security)) { + } else if (std::holds_alternative(s->security)) { _add_future(*s); } } } -void EmumbaMDListener::on_security_state( - const EmumbaMarketData::SecurityState &state) { +void EmumbaMDListener::on_security_state(const domain::SecurityState &state) { EmumbaSecurityData *sec_data = get_security(me->index, state.security_id); if (sec_data == nullptr) { LOG(md, Error, @@ -125,7 +132,7 @@ void EmumbaMDListener::on_security_state( } void EmumbaMDListener::on_security_statistics( - const EmumbaMarketData::SecurityMarketDataStatistics &security_stats) { + const domain::SecurityMarketDataStatistics &security_stats) { EmumbaSecurityData *sec_data = get_security(me->index, security_stats.security_id); if (sec_data == nullptr) { @@ -145,7 +152,7 @@ void EmumbaMDListener::on_security_statistics( date_temp); } -void EmumbaMDListener::on_book(const EmumbaMarketData::Book &book) { +void EmumbaMDListener::on_book(const domain::Book &book) { EmumbaSecurityData *sec_data = get_security(me->index, book.security_id); if (sec_data == nullptr) { LOG(md, Error, "EmumbaMDListener::on_book could not find id: {}", @@ -159,8 +166,8 @@ void EmumbaMDListener::on_book(const EmumbaMarketData::Book &book) { } void EmumbaMDListener::on_trades( - const std::vector &latest_trades) { - for (EmumbaMarketData::TradeRecord const *t : latest_trades) { + const std::vector &latest_trades) { + for (domain::TradeRecord const *t : latest_trades) { EmumbaSecurityData *sec_data = get_security(me->index, t->sec_id); auto now = utils::TimeStamp::now(); if (sec_data != nullptr) { @@ -174,41 +181,40 @@ void EmumbaMDListener::on_trades( } } } + void EmumbaMDListener::on_rfqs( - const std::vector & /*unused*/) { + const std::vector & /*unused*/) { // TODO } -void EmumbaMDListener::on_error( - const EmumbaMarketData::MarketDataError &error) { - LOG(md, Error, "EmumbaMDListener::on_error error: {}", error.error_text); +void EmumbaMDListener::on_error(const MarketDataError &error) { + LOG(md, Error, "EmumbaMDListener::on_error error: {}", error); // TODO: clear out books? } EmumbaMDListener::~EmumbaMDListener() = default; // private functions -void EmumbaMDListener::_add_index(const EmumbaMarketData::Security &sec) { +void EmumbaMDListener::_add_index(const domain::Security &sec) { FixedStockSecurity fsec = {}; _copy_security_common(sec, fsec); _add_security(fsec); } -void EmumbaMDListener::_add_future(const EmumbaMarketData::Security &sec) { +void EmumbaMDListener::_add_future(const domain::Security &sec) { FixedFutureSecurity fsec = {}; _copy_security_common(sec, fsec); _add_security(fsec); - const auto &future_sec = - std::get(sec.security); + const auto &future_sec = std::get(sec.security); auto boost_ts = - boost::posix_time::from_time_t(future_sec.expiration.value()); + boost::posix_time::from_time_t(future_sec.expiration.nanos()); fsec.expiration_year = boost_ts.date().year(); fsec.expiration_month = boost_ts.date().month().as_number(); fsec.expiration_day = boost_ts.date().day().as_number(); } void EmumbaMDListener::_copy_security_common( - const EmumbaMarketData::Security &from, FixedSecurity &to) const { + const domain::Security &from, FixedSecurity &to) const { to.numeric_id = from.security_common.security_id.value(); to.symbol(from.security_common.symbol); to.security_desc(from.security_common.security_desc); diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h index f5b43e5db..57ace141a 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.h @@ -1,7 +1,6 @@ #include "EmumbaSecurityIndex.h" +#include "lib/md/IMarketDataListener.h" #include "lib/md/MDProducer.h" -#include "lib/md/emumba/IMarketDataListener.h" -#include "lib/md/emumba/MarketDataCommon.h" namespace bts::md { @@ -9,34 +8,31 @@ class MDProducer; class FixedSecurity; // Listens to the emumba market data source and -class EmumbaMDListener : public EmumbaMarketData::IMarketDataListener { +class EmumbaMDListener : public IMarketDataListener { private: struct PImpl; std::unique_ptr me; public: EmumbaMDListener(EmumbaSecurityIndex &index, MDProducer &md_producer); - void on_securities(const std::vector + void on_securities(const std::vector &complete_security_list) override; - void on_security_state( - const EmumbaMarketData::SecurityState &security_state) override; + void on_security_state(const domain::SecurityState &security_state) override; void on_security_statistics( - const EmumbaMarketData::SecurityMarketDataStatistics &security_stats) - override; - void on_book(const EmumbaMarketData::Book &book) override; - void on_trades(const std::vector - &trades) override; - void on_rfqs( - const std::vector &rfqs) override; - void on_error(const EmumbaMarketData::MarketDataError &error) override; + const domain::SecurityMarketDataStatistics &security_stats) override; + void on_book(const domain::Book &book) override; + void on_trades( + const std::vector &trades) override; + void on_rfqs(const std::vector &rfqs) override; + void on_error(const MarketDataError &error) override; ~EmumbaMDListener(); private: - void _add_index(const EmumbaMarketData::Security &sec); - void _add_future(const EmumbaMarketData::Security &sec); + void _add_index(const domain::Security &sec); + void _add_future(const domain::Security &sec); void _copy_security_common( - const EmumbaMarketData::Security &from, FixedSecurity &to) const; + const domain::Security &from, FixedSecurity &to) const; void _add_security(const FixedSecurity &security); }; -} // namespace bts::md \ No newline at end of file +} // namespace bts::md From 27100e2e2d6cecddb5c248f37c03732b0341e960 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 045/100] Implement OptionSecurity (was empty class) --- src/lib/domain/OptionSecurity.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/domain/OptionSecurity.h b/src/lib/domain/OptionSecurity.h index d3fd927c4..dc8a0b86d 100644 --- a/src/lib/domain/OptionSecurity.h +++ b/src/lib/domain/OptionSecurity.h @@ -1,7 +1,13 @@ #pragma once +#include "lib/core/TimeStamp.h" +#include "lib/domain/Price.h" namespace bts::domain { -class OptionSecurity {}; +class OptionSecurity { + public: + core::TimeStamp expiration; + domain::Price strike; +}; } // namespace bts::domain From 02513a87794384d9113d177524ec89813b5081ef Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 17:35:34 -0500 Subject: [PATCH 046/100] refactor: Make BookLevel fields non-const Incremental diff streams would otherwise have to create entire new books for each update (no copy assignment operator for elements which are stored in an array) --- src/lib/domain/BookLevel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/domain/BookLevel.h b/src/lib/domain/BookLevel.h index 90fa3e863..fcb698e76 100644 --- a/src/lib/domain/BookLevel.h +++ b/src/lib/domain/BookLevel.h @@ -7,9 +7,9 @@ namespace bts::domain { class BookLevel { public: - const Price price = {}; - const Quantity total_quantity = {}; - const Quantity direct_quantity = {}; + Price price = {}; + Quantity total_quantity = {}; + Quantity direct_quantity = {}; std::size_t n_orders = {}; /** From 7bc5385783ae30c818e1442b4a3d986a9497b06e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 19 Nov 2021 15:38:14 -0500 Subject: [PATCH 047/100] Port Book type over from spartan --- src/lib/domain/Book.h | 159 ++++- src/lib/domain/BookSide.h | 669 +++++++++++++++++- src/lib/domain/BookSide_PopulatedIterator.h | 201 ++++++ .../md/platforms/emumba/EmumbaMDListener.cpp | 8 +- 4 files changed, 1025 insertions(+), 12 deletions(-) create mode 100644 src/lib/domain/BookSide_PopulatedIterator.h diff --git a/src/lib/domain/Book.h b/src/lib/domain/Book.h index 2564e7bac..eb5c87c02 100644 --- a/src/lib/domain/Book.h +++ b/src/lib/domain/Book.h @@ -1,14 +1,165 @@ #pragma once +#include "BookLevel.h" +#include "BookLevelComp.h" #include "BookSide.h" #include "SecurityID.h" +#include "Side.h" +#include namespace bts::domain { -class Book { +template +class BookT { public: - SecurityID security_id; - BookSide bids; - BookSide asks; + [[nodiscard]] static constexpr BookT empty() noexcept; + [[nodiscard]] static constexpr BookT empty( + SecurityID security_id) noexcept; + + [[nodiscard]] static constexpr size_t max_depth(); + [[nodiscard]] constexpr std::size_t size() const noexcept; + + [[nodiscard]] SecurityID security_id() const; + void set_security_id(SecurityID); + + template + void merge_with(OtherBook const &b); + + void clear_to_end(std::size_t level = 0); + void clear_after_empty(); + [[nodiscard]] bool is_sorted() const; + + template + static BookT merge(BookT const & /*b1*/, OtherBook const & /*b2*/); + + void reset_merged_quantity(); + void reset_n_orders(); + template + void apply_changes(Side side, const Container &changes); + + /** + * Removes price levels of the non-dominant side that cross the dominant + * side + */ + void remove_crosses(Side dominant_side); + + BS &operator[](Side s); + const BS &operator[](Side s) const; + bool operator==(BookT const &rhs) const; + + private: + SecurityID _security_id; + std::array _books; }; +using Book = BookT; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +constexpr BookT BookT::empty() noexcept { + // Be sure to change the impl if BookLevel is optimized such that + // the quantity no longer defaults to 0. + return {}; +} + +template +constexpr BookT BookT::empty(SecurityID security_id) noexcept { + // Be sure to change the impl if BookLevel is optimized such that + // the quantity no longer defaults to 0. + auto rv = BookT::empty(); + rv.set_security_id(security_id); + return rv; +} + +template +constexpr std::size_t BookT::max_depth() { + return BS::max_depth(); +} + +template +constexpr std::size_t BookT::size() const noexcept { + return _books.size(); +} + +template +SecurityID BookT::security_id() const { + return _security_id; +} + +template +void BookT::set_security_id(SecurityID id) { + _security_id = id; +} + +template +inline BS &BookT::operator[](Side s) { + return _books[s.as_index()]; +} + +template +inline const BS &BookT::operator[](Side s) const { + return _books[s.as_index()]; +} + +template +inline bool BookT::operator==(BookT const &rhs) const { + return _books == rhs._books; +} + +template +template +void BookT::merge_with(OtherBook const &b) { + operator[](Side::Buy).merge_with(Side::Buy, b[Side::Buy]); + operator[](Side::Sell).merge_with(Side::Sell, b[Side::Sell]); +} + +template +template +BookT BookT::merge(BookT const &b1, OtherBook const &b2) { + auto result = b1; + result.merge_with(b2); + return result; +} + +template +void BookT::reset_merged_quantity() { + Side::foreach ([&](Side s) { operator[](s).reset_merged_quantity(); }); +} + +template +void BookT::reset_n_orders() { + Side::foreach ([&](Side s) { operator[](s).reset_n_orders(); }); +} + +template +void BookT::remove_crosses(Side dominant_side) { + (*this)[dominant_side.other()].remove_crosses( + dominant_side.other(), (*this)[dominant_side][0].price); +} + +template +void BookT::clear_to_end(std::size_t level) { + Side::foreach ([&](Side s) { + operator[](s).clear_to_end(static_cast(level)); + }); +} + +template +void BookT::clear_after_empty() { + Side::foreach ([&](Side s) { operator[](s).clear_after_empty(); }); +} + +template +bool BookT::is_sorted() const { + return Side::forboth([&](Side s) { return operator[](s).is_sorted(s); }); +} + +template +template +void BookT::apply_changes(Side side, const Container &changes) { + _books[static_cast(side.value)].apply_changes(side, changes); +} + } // namespace bts::domain diff --git a/src/lib/domain/BookSide.h b/src/lib/domain/BookSide.h index e8b150e40..72627ac33 100644 --- a/src/lib/domain/BookSide.h +++ b/src/lib/domain/BookSide.h @@ -1,13 +1,674 @@ #pragma once #include "BookLevel.h" -#include +#include "BookLevelComp.h" +#include "BookSide_PopulatedIterator.h" +#include "PriceComp.h" +#include "SecurityID.h" +#include "Side.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace bts::domain { -class BookSide { +template +class BookSideT { public: - // compile time size for speed - std::array blevel; + static constexpr size_t max_depth() noexcept; + using Container = std::array; + using Iterator = typename Container::iterator; + using ConstIter = typename Container::const_iterator; + using PopulatedIterator = BookSide_PopulatedIterator; + using ConstPopulatedIterator = BookSide_PopulatedIterator; + using value_type = typename Container::value_type; + + BookSideT() = default; + explicit BookSideT(Container levels); + BookSideT(const BookSideT &) noexcept = default; + BookSideT(BookSideT &&) noexcept = default; + BookSideT &operator=(const BookSideT &) noexcept = default; + BookSideT &operator=(BookSideT &&) noexcept = default; + ~BookSideT() = default; + + [[nodiscard]] constexpr BookLevel const &top() const; + constexpr BookLevel const &operator[](size_t i) const; + constexpr BookLevel &operator[](size_t i); + + static constexpr BookSideT empty() noexcept; + + [[nodiscard]] constexpr ConstIter begin() const noexcept; + [[nodiscard]] constexpr ConstIter end() const noexcept; + + constexpr Iterator begin() noexcept; + constexpr Iterator end() noexcept; + + Iterator insert(Side side, BookLevel level); + Iterator insert(Iterator it, BookLevel level); + Iterator erase(Iterator it); + + [[nodiscard]] Quantity total_depth() const; + [[nodiscard]] Quantity depth_at_price(Side s, Price p) const; + [[nodiscard]] constexpr std::size_t size() const noexcept; + + constexpr bool operator==(BookSideT const &rhs) const; + constexpr bool operator!=(BookSideT const &rhs) const; + + template + void merge_with( + Side s, + OtherBookSide const &other_book, + bool add_to_existing_merge_qty = false); + + template + static void merge_many( + Side side, + const OtherBookSideContainer &other_books, + BookSideT &dest); + + void reset_merged_quantity(); + void reset_n_orders(); + + template + static BookSideT merge( + Side s, BookSideT const & /*b1*/, OtherBookSide const & /*b2*/); + + [[nodiscard]] constexpr bool is_populated_at( + std::size_t level) const noexcept; + [[nodiscard]] constexpr bool is_populated() const noexcept; + + constexpr PopulatedIterator begin_populated() noexcept; + [[nodiscard]] constexpr ConstPopulatedIterator + begin_populated() const noexcept; + + PopulatedIterator end_populated() noexcept; + [[nodiscard]] ConstPopulatedIterator end_populated() const noexcept; + + [[nodiscard]] std::size_t count_populated() const; + + bool trim_quantity_front(Quantity quantity) noexcept; + + // finds the target cummulative quantity and returns the price + // level and the cummulative quantity at that level. the return + // cummulative quantity could be less than the target if the + // quantity is not present + [[nodiscard]] std::tuple find_cummulative_quantity( + Quantity target_quantity) const noexcept; + + // finds the price and returns the index, quantity and cummulutative quantity + // at that level + [[nodiscard]] std::tuple find_price( + Price price) const noexcept; + + /** + * Counts the volume of consecutive equal price levels (from the top of the + * book) for this book and @p other + * + * @details Price levels are considered equal if they have the same + * `BookLevel::price` and `BookLevel::total_quantity`. + */ + template + [[nodiscard]] Quantity intersecting_front_quantity( + const OtherBookSide &other, std::size_t num_levels = max_depth()) const; + + void clear_to_end(std::uint8_t level = 0); + void clear_after_empty(); + + /** + * Removes book levels that cross @p price + */ + void remove_crosses(Side side, Price price); + + /** + * Sets the top of the book to another level (levels before that level are + * erased) + */ + void cover_top(std::size_t top_level); + + [[nodiscard]] bool is_sorted( + Side side, bool stop_on_first_empty_level = true) const; + + /** + * Compares the top @p n_levels of this book to those of another book + * + * @param[in] stop_on_first_empty_level Stop comparing price levels when the + * first empty level is reached (return true if both books are empty) + */ + [[nodiscard]] bool top_levels_equal( + const BookSideT &other, + std::size_t n_levels, + bool stop_on_first_empty_level = false) const; + + private: + Container _book; }; +template +inline std::ostream &operator<<(std::ostream &s, BookSideT const &b); + +using TopBookSide = BookSideT<1>; +using BookSide = BookSideT<10>; +using ImpliedBookSide = BookSideT<2>; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +BookSideT::BookSideT(typename BookSideT::Container levels) + : _book(std::move(levels)) {} + +template +constexpr BookSideT BookSideT::empty() noexcept { + // BookLevel's quantity is initialized to 0 by default, so there is no need + // for this method to actually set the quantity at each level to 0. + // Note: there is a unit test to prevent regression, in case BookLevel is + // changed such that quantity no longer defaults to 0. + BookSideT bk; + for (auto &l : bk) { + l = BookLevel::empty(); + } + return bk; +} + +template +constexpr bool BookSideT::is_populated_at( + std::size_t level) const noexcept { + return level < BookSideT::max_depth() && !(*this)[level].is_empty(); +} + +template +constexpr size_t BookSideT::max_depth() noexcept { + return SZ; +} + +template +constexpr const BookLevel &BookSideT::top() const { + return _book[0]; +} + +template +constexpr const BookLevel &BookSideT::operator[](std::size_t i) const { + return _book[i]; +} + +template +constexpr BookLevel &BookSideT::operator[](std::size_t i) { + return _book[i]; +} + +template +constexpr typename BookSideT::Iterator BookSideT::begin() noexcept { + return _book.begin(); +} + +template +constexpr typename BookSideT::Iterator BookSideT::end() noexcept { + return _book.end(); +} + +template +constexpr typename BookSideT::ConstIter +BookSideT::begin() const noexcept { + return _book.begin(); +} + +template +constexpr typename BookSideT::ConstIter +BookSideT::end() const noexcept { + return _book.end(); +} + +template +constexpr size_t BookSideT::size() const noexcept { + return _book.size(); +} + +template +constexpr bool BookSideT::operator==(BookSideT const &rhs) const { + return _book == rhs._book; +} + +template +constexpr bool BookSideT::operator!=(BookSideT const &rhs) const { + return _book != rhs._book; +} + +template +constexpr bool BookSideT::is_populated() const noexcept { + return (*this)[0].total_quantity != 0; +} + +template +constexpr BookSide_PopulatedIterator +BookSideT::begin_populated() noexcept { + return BookSide_PopulatedIterator(_book); +} + +template +constexpr BookSide_PopulatedIterator +BookSideT::begin_populated() const noexcept { + return BookSide_PopulatedIterator(_book); +} + +template +BookSide_PopulatedIterator BookSideT::end_populated() noexcept { + return BookSide_PopulatedIterator::end(_book); +} + +template +BookSide_PopulatedIterator +BookSideT::end_populated() const noexcept { + return BookSide_PopulatedIterator::end(_book); +} + +template +std::size_t BookSideT::count_populated() const { + static_assert(SZ <= std::numeric_limits::max()); + std::int32_t len = max_depth(); + std::int32_t lo = 0; + while (len > 0) { + // NOLINTNEXTLINE + std::int32_t half = len >> 1; + if (_book[lo + half].is_empty()) { + len = half; + } else { + len = len - half - 1; + lo += half + 1; + } + } + return lo; +} + +template +inline Quantity BookSideT::total_depth() const { + std::uint32_t qty = 0; + for (auto const &level : *this) { + qty += level.total_quantity.value(); + } + return Quantity{qty}; +} + +template +inline Quantity BookSideT::depth_at_price(Side s, Price p) const { + uint32_t qty = 0; + for (auto const &level : *this) { + if (level.price.is_better_or_equal(s, p)) { + qty += level.total_quantity.value(); + } + } + return Quantity{qty}; +} + +template +inline bool BookSideT::trim_quantity_front(Quantity quantity) noexcept { + if (quantity == 0) { + return true; + } + bts_assert(quantity > 0); + for (std::size_t i = 0; is_populated_at(i); i++) { + if (_book[i].total_quantity <= quantity) { + quantity -= _book[i].total_quantity; + _book[i].total_quantity.value() = 0; + } else { + _book[i].total_quantity -= quantity; + quantity.value() = 0; + } + if (quantity == 0) { + if (_book[i].total_quantity == 0) { + i++; + } + std::size_t num_levels = 0; + for (std::size_t j = i; is_populated_at(j); j++) { + _book[j - i] = _book[j]; + num_levels++; + } + // The last 'i' levels were shifted up to the front, so the book has at + // least 'max_depth() - i' fewer populated levels now. Set those + // levels' price, qty, and n_orders to nan, zero, and zero + // repsectively. + for (std::size_t j = num_levels; j < max_depth(); j++) { + _book[j].price = Price::nan(); + _book[j].total_quantity.value() = 0; + _book[j].n_orders = 0; + } + return true; + } + } + return false; +} + +template +inline std::tuple BookSideT::find_cummulative_quantity( + Quantity target_quantity) const noexcept { + auto out_price = Price::nan(); + Quantity out_quantity{0}; + for (const auto &lev : *this) { + if (lev.total_quantity == 0) { + break; + } + out_price = lev.price; + out_quantity += lev.total_quantity; + if (out_quantity >= target_quantity) { + // early break, we have already accumulated the target + // dont let it exceed the target qty + break; + } + } + return std::make_tuple(out_price, out_quantity); +} + +template +inline std::tuple BookSideT::find_price( + Price price) const noexcept { + size_t lv = 0; + auto cumm_qty = Quantity(0); + for (const auto &bl : *this) { + cumm_qty += bl.total_quantity; + if (bl.price == price) { + return std::make_tuple(lv, bl.total_quantity, cumm_qty); + } + lv++; + } + return std::make_tuple((size_t)0, Quantity(0), Quantity(0)); +} + +template +inline std::ostream &operator<<(std::ostream &s, const BookSideT &b) { + for (auto const &l : b) { + s << l << "\n"; + } + return s; +} + +template +template +void BookSideT::merge_with( + Side s, OtherBookSide const &other_book, bool add_to_existing_merge_qty) { + boost::container::small_vector< + BookSide::value_type, max_depth() + OtherBookSide::max_depth()> + merged; + + auto comp = [s](auto const &l1, auto const &l2) { + return l1.price.is_better(s, l2.price); + }; + + // Copy this to merged output + for (auto l : *this) { + if (l.total_quantity.value() == 0) { + break; + } + if (!add_to_existing_merge_qty) { + l.merged_quantity = Quantity{0}; + } + merged.push_back(l); + } + + // Now for each entry in the other book find either a matching + // entry or the entry where the level should be inserted + for (auto ol : other_book) { + if (ol.total_quantity.value() == 0) { + break; + } + + auto it = std::lower_bound(merged.begin(), merged.end(), ol, comp); + + if (it == merged.end()) { + // level is worse than the worst level so far, append + ol.merged_quantity = ol.total_quantity; + merged.push_back(ol); + } else if (it->price == ol.price) { + // level is the same as an existing level, merge + it->total_quantity.value() += ol.total_quantity.value(); + it->n_orders += ol.n_orders; + if (add_to_existing_merge_qty) { + it->merged_quantity += ol.total_quantity; + } else { + it->merged_quantity = ol.total_quantity; + } + } else { + // level is better than what was there before, insert + ol.merged_quantity = ol.total_quantity; + merged.insert(it, ol); + } + } + + std::copy( + merged.begin(), merged.begin() + std::min(merged.size(), size()), + _book.begin()); +} + +template +template +void BookSideT::merge_many( + Side side, const OtherBookSideContainer &other_books, BookSideT &dest) { + // Determine the set of prices that will be used. Use the 'best' (i.e., most + // aggressive) prices for each side. + std::array prices; + auto last_price = prices.begin(); + PriceComp price_comp(side); + for (const auto &bk : other_books) { + auto it = prices.begin(); + for (const auto &bkl : bk) { + if (bkl.is_empty()) { + break; + } + it = std::lower_bound(it, last_price, bkl.price, price_comp); + if (std::distance(prices.begin(), it) == + static_cast(SZ)) { + break; + } + + // `it` == `last_price` means `it` hasn't been assigned a price yet. + // `it` != `bkl.price` means `bkl.price` is better than the price + // pointed to by `it`. If either is true, bkl.price should be added to + // `prices` + if (it == last_price || *it != bkl.price) { + for (auto copy_it = last_price; copy_it != it; copy_it--) { + *copy_it = *(copy_it - 1); + } + *it = bkl.price; + if (last_price != prices.end()) { + last_price++; + } + } + } + } + std::size_t insert_level = 0; + std::vector cursors(other_books.size(), 0); + for (auto price_it = prices.begin(); price_it != last_price; price_it++) { + if (insert_level == SZ) { + break; + } + auto &merged_level = dest[insert_level]; + merged_level.price = *price_it; + merged_level.total_quantity.value() = 0; + merged_level.merged_quantity.value() = 0; + merged_level.n_orders = 0; + for (std::size_t i = 0; i < other_books.size(); i++) { + const auto &bk = other_books[i]; + auto &cursor = cursors[i]; + if (bk[cursor].price == *price_it) { + merged_level.total_quantity += bk[cursor].total_quantity; + merged_level.merged_quantity += bk[cursor].merged_quantity; + merged_level.n_orders += bk[cursor].n_orders; + cursor++; + } + } + insert_level++; + } + dest.clear_to_end(insert_level); +} + +template +inline void BookSideT::reset_merged_quantity() { + for (auto &l : *this) { + l.merged_quantity = Quantity{0}; + } +} + +template +inline void BookSideT::reset_n_orders() { + for (auto &l : *this) { + l.n_orders = 0; + } +} + +template +template +BookSideT BookSideT::merge( + Side s, BookSideT const &b1, OtherBookSide const &b2) { + auto result = b1; + result.merge_with(s, b2); + return result; +} + +template +template +Quantity BookSideT::intersecting_front_quantity( + const OtherBookSide &other, std::size_t num_levels) const { + Quantity ifq{0}; + auto it = begin(); + auto oit = other.begin(); + while (num_levels > 0 && it != end() && oit != other.end() && + it->price == oit->price) { + if (it->total_quantity != oit->total_quantity) { + ifq += std::min(it->total_quantity, oit->total_quantity); + break; + } + ifq += it->total_quantity; + it++; + oit++; + num_levels--; + } + return ifq; +} + +template +void BookSideT::clear_to_end(std::uint8_t level) { + static_assert(SZ <= std::numeric_limits::max()); + while (level < SZ) { + _book[level++] = BookLevel::empty(); + } +} + +template +void BookSideT::remove_crosses(Side side, Price price) { + if (price.is_nan()) { + return; + } + auto it = std::upper_bound( + _book.begin(), + _book.begin() + static_cast(count_populated()), price, + BookLevelComp{side}); + cover_top(std::distance(_book.begin(), it)); +} + +template +void BookSideT::cover_top(std::size_t level) { + if (level == 0) { + return; + } + for (auto it = _book.begin() + level; it != _book.end(); it++) { + *(it - level) = *it; + } + clear_to_end(max_depth() - level); +} + +template +bool BookSideT::is_sorted(Side side, bool stop_on_first_empty_level) const { + PriceComp cmp(side); + for (std::size_t i = 0; i < max_depth(); i++) { + const auto &better = _book.at(i); + if (better.is_empty()) { + if (stop_on_first_empty_level) { + return true; + } + continue; + } + for (std::size_t j = i + 1; j < max_depth(); j++) { + const auto &worse = _book.at(j); + if (worse.is_empty()) { + if (stop_on_first_empty_level) { + return true; + } + continue; + } + if (!better.price.is_better(side, worse.price)) { + return false; + } + } + } + return true; +} + +template +bool BookSideT::top_levels_equal( + const BookSideT &other, + std::size_t n_levels, + bool stop_on_first_empty_level) const { + for (std::size_t i = 0; i < std::min(n_levels, max_depth()); i++) { + const auto &level = (*this)[i]; + if (stop_on_first_empty_level && level.is_empty()) { + return other[i].is_empty(); + } + if (level != other[i]) { + return false; + } + } + return true; +} + +template +void BookSideT::clear_after_empty() { + for (std::size_t i = 0; i < size(); i++) { + if (_book[i].is_empty()) { + while (++i != max_depth()) { + _book[i] = BookLevel::empty(); + } + } + } +} + +template +typename BookSideT::Iterator BookSideT::insert( + Side side, BookLevel level) { + BookLevelComp comp(side); + auto it = std::lower_bound(_book.begin(), _book.end(), level, comp); + if (it == _book.end()) { + return it; + } + if (it->price == level.price) { + *it = level; + return it; + } + return insert(it, level); +} + +template +typename BookSideT::Iterator BookSideT::insert( + Iterator it, BookLevel level) { + if (it != _book.end()) { + for (auto copy_it = it + 1; copy_it != _book.end(); copy_it++) { + *copy_it = *(copy_it - 1); + } + *it = level; + } + return it; +} + +template +typename BookSideT::Iterator BookSideT::erase(Iterator it) { + if (it != _book.end()) { + for (auto copy_it = it + 1; copy_it != _book.end(); copy_it++) { + *(copy_it - 1) = *copy_it; + } + } + return it; +} + } // namespace bts::domain diff --git a/src/lib/domain/BookSide_PopulatedIterator.h b/src/lib/domain/BookSide_PopulatedIterator.h new file mode 100644 index 000000000..b6cb42a4b --- /dev/null +++ b/src/lib/domain/BookSide_PopulatedIterator.h @@ -0,0 +1,201 @@ +#pragma once +#include "BookLevel.h" +#include +#include + +namespace bts::domain { + +template +class BookSide_PopulatedIterator { + public: + using iterator_category = std::forward_iterator_tag; + using blah = std::true_type; + using difference_type = std::ptrdiff_t; + using source_type = typename std::conditional< + IsConst, + const std::array, + std::array>::type; + using value_type = + typename std::conditional::type; + using pointer = value_type *; + using reference = value_type &; + using const_pointer = const value_type *; + using const_reference = const value_type &; + + explicit constexpr BookSide_PopulatedIterator(source_type &source) noexcept; + + constexpr BookSide_PopulatedIterator( + const BookSide_PopulatedIterator &) noexcept = default; + + constexpr BookSide_PopulatedIterator( + BookSide_PopulatedIterator &&) noexcept = default; + + ~BookSide_PopulatedIterator() = default; + + static constexpr BookSide_PopulatedIterator end( + source_type &source) noexcept; + + reference operator*(); + pointer operator->(); + const_reference operator*() const; + const_pointer operator->() const; + + BookSide_PopulatedIterator &operator++(); + // NOLINTNEXTLINE + BookSide_PopulatedIterator operator++(int); + BookSide_PopulatedIterator &operator+=(int value); + BookSide_PopulatedIterator operator+(int value); + + BookSide_PopulatedIterator &operator--(); + // NOLINTNEXTLINE + BookSide_PopulatedIterator operator--(int); + BookSide_PopulatedIterator &operator-=(int value); + BookSide_PopulatedIterator operator-(int value); + + template + constexpr bool operator==( + const BookSide_PopulatedIterator &other) const + noexcept; + + template + constexpr bool operator!=( + const BookSide_PopulatedIterator &other) const + noexcept; + + BookSide_PopulatedIterator &operator=( + const BookSide_PopulatedIterator &) noexcept = default; + + BookSide_PopulatedIterator &operator=( + BookSide_PopulatedIterator &&) noexcept = default; + + private: + constexpr BookSide_PopulatedIterator( + source_type &source, std::size_t cursor) noexcept; + + source_type *_source; + std::size_t _cursor; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +constexpr BookSide_PopulatedIterator::BookSide_PopulatedIterator( + source_type &source) noexcept + : _source(&source), _cursor(0) {} + +template +constexpr BookSide_PopulatedIterator::BookSide_PopulatedIterator( + source_type &source, std::size_t cursor) noexcept + : _source(&source), _cursor(cursor) {} + +template +constexpr BookSide_PopulatedIterator +BookSide_PopulatedIterator::end(source_type &source) noexcept { + BookSide_PopulatedIterator rv(source); + for (; rv._cursor < SZ; rv._cursor++) { + if (source[rv._cursor].total_quantity == 0) { + break; + } + } + return rv; +} + +template +typename BookSide_PopulatedIterator::reference + BookSide_PopulatedIterator::operator*() { + return (*_source)[_cursor]; +} + +template +typename BookSide_PopulatedIterator::pointer + BookSide_PopulatedIterator::operator->() { + return &(*_source)[_cursor]; +} + +template +typename BookSide_PopulatedIterator::const_reference + BookSide_PopulatedIterator::operator*() const { + return (*_source)[_cursor]; +} + +template +typename BookSide_PopulatedIterator::const_pointer + BookSide_PopulatedIterator::operator->() const { + return &(*_source)[_cursor]; +} + +template +BookSide_PopulatedIterator & +BookSide_PopulatedIterator::operator++() { + _cursor++; + return *this; +} + +template +// NOLINTNEXTLINE +BookSide_PopulatedIterator +BookSide_PopulatedIterator::operator++(int) { + const BookSide_PopulatedIterator before(*this); + ++(*this); + return before; +} + +template +BookSide_PopulatedIterator & +BookSide_PopulatedIterator::operator+=(int value) { + _cursor += value; + return *this; +} + +template +BookSide_PopulatedIterator +BookSide_PopulatedIterator::operator+(int value) { + return BookSide_PopulatedIterator(*_source, _cursor + value); +} + +template +BookSide_PopulatedIterator & +BookSide_PopulatedIterator::operator--() { + _cursor--; + return *this; +} + +template +// NOLINTNEXTLINE +BookSide_PopulatedIterator +BookSide_PopulatedIterator::operator--(int) { + BookSide_PopulatedIterator before(*this); + --(*this); + return before; +} + +template +BookSide_PopulatedIterator & +BookSide_PopulatedIterator::operator-=(int value) { + _cursor -= value; + return *this; +} + +template +BookSide_PopulatedIterator +BookSide_PopulatedIterator::operator-(int value) { + return BookSide_PopulatedIterator(*_source, _cursor - value); +} + +template +template +constexpr bool BookSide_PopulatedIterator::operator==( + const BookSide_PopulatedIterator &other) const noexcept { + return _cursor == other._cursor && _source == other._source; +} + +template +template +constexpr bool BookSide_PopulatedIterator::operator!=( + const BookSide_PopulatedIterator &other) const noexcept { + return !(*this == other); +} + +} // namespace bts::domain diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index 99d74f4d4..78c6bcfbb 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -153,14 +153,14 @@ void EmumbaMDListener::on_security_statistics( } void EmumbaMDListener::on_book(const domain::Book &book) { - EmumbaSecurityData *sec_data = get_security(me->index, book.security_id); + EmumbaSecurityData *sec_data = get_security(me->index, book.security_id()); if (sec_data == nullptr) { LOG(md, Error, "EmumbaMDListener::on_book could not find id: {}", - book.security_id.value()); + book.security_id()); return; } - helpers::copy_books(book.bids, me->bids); - helpers::copy_books(book.asks, me->asks); + helpers::copy_books(book[domain::Side::Buy], me->bids); + helpers::copy_books(book[domain::Side::Sell], me->asks); sec_data->handle.update_books( utils::TimeStamp::now(), me->bids, me->asks, {}, {}); } From b3dbc041b525a3cd6912155bffbea0f4ba8a722e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 28 Sep 2021 10:42:25 -0400 Subject: [PATCH 048/100] refactor: Split md gateway classes into sep files --- src/lib/md/MarketDataGateway.cpp | 60 +++++++++++++++++++ src/lib/md/MarketDataGateway.h | 46 ++++++++++++++ src/lib/md/MarketDataRegistration.h | 17 ++++++ src/lib/md/MarketDataRegistrationError.h | 24 ++++++++ src/lib/md/MarketDataRegistrationFactory.cpp | 10 ++++ src/lib/md/MarketDataRegistrationFactory.h | 17 ++++++ src/lib/md/emumba/MarketDataGateway.h | 40 ------------- .../spreader_orders/tests/spreader_tests.cpp | 2 +- 8 files changed, 175 insertions(+), 41 deletions(-) create mode 100644 src/lib/md/MarketDataGateway.cpp create mode 100644 src/lib/md/MarketDataGateway.h create mode 100644 src/lib/md/MarketDataRegistration.h create mode 100644 src/lib/md/MarketDataRegistrationError.h create mode 100644 src/lib/md/MarketDataRegistrationFactory.cpp create mode 100644 src/lib/md/MarketDataRegistrationFactory.h delete mode 100644 src/lib/md/emumba/MarketDataGateway.h diff --git a/src/lib/md/MarketDataGateway.cpp b/src/lib/md/MarketDataGateway.cpp new file mode 100644 index 000000000..3e40d8294 --- /dev/null +++ b/src/lib/md/MarketDataGateway.cpp @@ -0,0 +1,60 @@ +#include "MarketDataGateway.h" +#include "MarketDataRegistration.h" +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/utils/bts_assert.h" + +namespace bts::md { + +// struct IWebsocketFactory { + +// }; + +struct BinanceConnection { + IMarketDataListener *listener; +}; + +struct MarketDataGateway::PImpl { + MarketDataRegistrationFactory registration_factory; + std::unordered_map + registered_listeners; + + // bts::websocket::WebsocketClient create_binance_client(const + // binance::BinanceMarketDataSubscription &sub) { + // // websocket::WebsocketClient(""); + // } +}; + +MarketDataGateway::MarketDataGateway() + : me_(std::make_unique()) {} + +MarketDataGateway::~MarketDataGateway() = default; + +MarketDataRegistration MarketDataGateway::register_listener( + const MarketDataSubscription &sub, IMarketDataListener *listener) noexcept { + auto reg = me_->registration_factory.create(); + bts_assert(reg.listener_id.has_value()); + bts_assert( + me_->registered_listeners.find(*reg.listener_id) == + me_->registered_listeners.end()); + + switch (sub.venue()) { + case domain::Venue::Binance: + // TODO: init binance subscription + break; + default: + return MarketDataRegistration{ + MarketDataListenerID{0}, + MarketDataRegstrationError::Type::NOT_IMPLEMENTED}; + } + me_->registered_listeners[reg.listener_id.value()] = listener; + return reg; +} + +void subscribe( + MarketDataListenerID id, const std::vector &securities); + +void unregister_listener(MarketDataListenerID id); + +} // namespace bts::md diff --git a/src/lib/md/MarketDataGateway.h b/src/lib/md/MarketDataGateway.h new file mode 100644 index 000000000..954590535 --- /dev/null +++ b/src/lib/md/MarketDataGateway.h @@ -0,0 +1,46 @@ +#pragma once +#include "MarketDataListenerID.h" +#include "MarketDataRegistrationFactory.h" +#include "MarketDataSubscription.h" +#include "lib/domain/SecurityID.h" +#include +#include +#include +#include +#include +#include + +namespace bts::md { + +class IMarketDataListener; +class MarketDataRegistration; + +class MarketDataGateway { + public: + MarketDataGateway(); + ~MarketDataGateway(); + + /** + * @brief Connects a market data listener to a market data source + * + * @details The first call to the Gateway is to register the listener. The + * listener is assigned an ID if the registration is successful. Subsequent + * subscription of securities and unregister_listener is is via this id. + * + * @return MarketDataRegistration + */ + MarketDataRegistration register_listener( + const MarketDataSubscription &, IMarketDataListener *) noexcept; + + void subscribe( + MarketDataListenerID id, + const std::vector &securities); + + void unregister_listener(MarketDataListenerID id); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::md diff --git a/src/lib/md/MarketDataRegistration.h b/src/lib/md/MarketDataRegistration.h new file mode 100644 index 000000000..dfcbbb95f --- /dev/null +++ b/src/lib/md/MarketDataRegistration.h @@ -0,0 +1,17 @@ +#pragma once +#include "MarketDataListenerID.h" +#include "MarketDataRegistrationError.h" +#include "lib/domain/Venue.h" +#include + +namespace bts::md { + +class MarketDataRegistration { + public: + // will have a value when there is no error + std::optional listener_id; + // domain::Venue venue = domain::Venue::Glbx; + MarketDataRegstrationError error = {}; +}; + +} // namespace bts::md diff --git a/src/lib/md/MarketDataRegistrationError.h b/src/lib/md/MarketDataRegistrationError.h new file mode 100644 index 000000000..1035bb2b8 --- /dev/null +++ b/src/lib/md/MarketDataRegistrationError.h @@ -0,0 +1,24 @@ +#pragma once +#include + +namespace bts::md { + +struct MarketDataRegstrationError { + enum class Type { + NO_ERROR = 0, + NETWORK_ERROR = 1, + // We may add bones for future exchanges (venues) before they are actually + // implemented. Attempts to register listeners to such exchanges should + // result in a NOT_IMPLEMENTED error. + NOT_IMPLEMENTED = 2, + // Any error that occurred on our end. As this error type is vague, the + // accompanying error message should provide adequate information and + // context + INTERNAL_ERROR = 3 + }; + + Type error_type{Type::NO_ERROR}; + std::string error_text{}; +}; + +} // namespace bts::md diff --git a/src/lib/md/MarketDataRegistrationFactory.cpp b/src/lib/md/MarketDataRegistrationFactory.cpp new file mode 100644 index 000000000..c4b014db8 --- /dev/null +++ b/src/lib/md/MarketDataRegistrationFactory.cpp @@ -0,0 +1,10 @@ +#include "MarketDataRegistrationFactory.h" +#include "MarketDataRegistration.h" + +namespace bts::md { + +MarketDataRegistration MarketDataRegistrationFactory::create() { + return MarketDataRegistration{MarketDataListenerID{++id_counter_}}; +} + +} // namespace bts::md diff --git a/src/lib/md/MarketDataRegistrationFactory.h b/src/lib/md/MarketDataRegistrationFactory.h new file mode 100644 index 000000000..ae65d47ed --- /dev/null +++ b/src/lib/md/MarketDataRegistrationFactory.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::md { + +class MarketDataRegistration; + +class MarketDataRegistrationFactory { + public: + MarketDataRegistration create(); + + private: + std::atomic id_counter_; +}; + +} // namespace bts::md diff --git a/src/lib/md/emumba/MarketDataGateway.h b/src/lib/md/emumba/MarketDataGateway.h deleted file mode 100644 index 6f59d0ae1..000000000 --- a/src/lib/md/emumba/MarketDataGateway.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once -#include "lib/domain/SecurityID.h" -#include "lib/md/MarketDataListenerID.h" -#include "lib/md/MarketDataSubscription.h" -#include -#include -#include - -namespace bts::md { -class IMarketDataListener; -} - -namespace EmumbaMarketData { - -struct MarketDataRegistration { - struct RegstrationError { - enum class RegstrationErrorType { NO_ERROR = 0, NETWORK_ERROR = 1 }; - RegstrationErrorType error_type{RegstrationErrorType::NO_ERROR}; - std::string error_text{}; - }; - // will have a value when there is no error - std::optional listener_id; - RegstrationError error = {}; -}; - -class MarketDataGateway { - public: - // The first call to the Gateway is to register the listener. The - // listener is assigned an ID if the registration is successful. Subsequent - // subscription of securities and unregister_listener is is via this id. - MarketDataRegistration register_listener( - const bts::md::MarketDataSubscription &, - bts::md::IMarketDataListener *) noexcept; - void subscribe( - bts::md::MarketDataListenerID id, - const std::vector &securities); - void unregister_listener(bts::md::MarketDataListenerID id); -}; - -} // namespace EmumbaMarketData diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 8796f8513..cfd1a0f91 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,6 +1,6 @@ #include "lib/md/IMarketDataListener.h" -#include "lib/md/emumba/MarketDataGateway.h" #include "lib/md/emumba/OrderGateway.h" +#include "lib/md/websockets/WebsocketClient.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From 1ed3008c1cf5c7e1cb3d366545eb7ed9035adc2a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 25 Oct 2021 13:36:30 -0400 Subject: [PATCH 049/100] refactor: Split OrderGateway classes into sep files --- src/lib/domain/NewOrder.cpp | 10 +++ src/lib/domain/NewOrder.h | 18 ++++ src/lib/domain/OrderDefinition.cpp | 13 +++ src/lib/domain/OrderDefinition.h | 34 +++++++ src/lib/domain/OrderState.h | 19 ++++ src/lib/domain/OrderStatus.cpp | 10 +++ src/lib/domain/OrderStatus.h | 30 +++++++ src/lib/domain/OrderUpdate.cpp | 11 +++ src/lib/domain/OrderUpdate.h | 18 ++++ src/lib/domain/TimeInForce.cpp | 10 +++ src/lib/domain/TimeInForce.h | 31 +++++++ src/lib/domain/cme/GlbxOrderDefinition.h | 7 ++ src/lib/domain/cme/GlbxOrderState.h | 7 ++ .../domain/deribit/DeribitOrderDefinition.h | 7 ++ src/lib/domain/deribit/DeribitOrderState.h | 7 ++ src/lib/md/emumba/OrderGateway.h | 88 ------------------- src/lib/orderman/IOrderListener.h | 13 +++ src/lib/orderman/OrderGateway.h | 39 ++++++++ 18 files changed, 284 insertions(+), 88 deletions(-) create mode 100644 src/lib/domain/NewOrder.cpp create mode 100644 src/lib/domain/NewOrder.h create mode 100644 src/lib/domain/OrderDefinition.cpp create mode 100644 src/lib/domain/OrderDefinition.h create mode 100644 src/lib/domain/OrderState.h create mode 100644 src/lib/domain/OrderStatus.cpp create mode 100644 src/lib/domain/OrderStatus.h create mode 100644 src/lib/domain/OrderUpdate.cpp create mode 100644 src/lib/domain/OrderUpdate.h create mode 100644 src/lib/domain/TimeInForce.cpp create mode 100644 src/lib/domain/TimeInForce.h create mode 100644 src/lib/domain/cme/GlbxOrderDefinition.h create mode 100644 src/lib/domain/cme/GlbxOrderState.h create mode 100644 src/lib/domain/deribit/DeribitOrderDefinition.h create mode 100644 src/lib/domain/deribit/DeribitOrderState.h delete mode 100644 src/lib/md/emumba/OrderGateway.h create mode 100644 src/lib/orderman/IOrderListener.h create mode 100644 src/lib/orderman/OrderGateway.h diff --git a/src/lib/domain/NewOrder.cpp b/src/lib/domain/NewOrder.cpp new file mode 100644 index 000000000..acf434ce4 --- /dev/null +++ b/src/lib/domain/NewOrder.cpp @@ -0,0 +1,10 @@ +#include "NewOrder.h" + +namespace bts::domain { + +std::ostream &operator<<(std::ostream &out, const NewOrder &no) noexcept { + out << "price: " << no.price << "; qty: " << no.qty << "; " << no.order_def; + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/NewOrder.h b/src/lib/domain/NewOrder.h new file mode 100644 index 000000000..e487b3cb5 --- /dev/null +++ b/src/lib/domain/NewOrder.h @@ -0,0 +1,18 @@ +#pragma once +#include "OrderDefinition.h" +#include "Price.h" +#include "Quantity.h" + +namespace bts::domain { + +// Sent once per order, when the order is first launched (launching an order, +// placing, firing, sending all mean the same) +struct NewOrder { + OrderDefinition order_def; + domain::Price price; + domain::Quantity qty; +}; + +std::ostream &operator<<(std::ostream &out, const NewOrder &no) noexcept; + +} // namespace bts::domain diff --git a/src/lib/domain/OrderDefinition.cpp b/src/lib/domain/OrderDefinition.cpp new file mode 100644 index 000000000..9ffae0635 --- /dev/null +++ b/src/lib/domain/OrderDefinition.cpp @@ -0,0 +1,13 @@ +#include "OrderDefinition.h" + +namespace bts::domain { + +std::ostream &operator<<( + std::ostream &out, const OrderDefinition &od) noexcept { + out << "side: " << od.side << "; sec: " << od.security_id + << "; acc: " << od.account << "(" << od.account_id << ")" + << "; user: " << od.user << "(" << od.user_id << ")"; + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/OrderDefinition.h b/src/lib/domain/OrderDefinition.h new file mode 100644 index 000000000..078003393 --- /dev/null +++ b/src/lib/domain/OrderDefinition.h @@ -0,0 +1,34 @@ +#pragma once +#include "AccountID.h" +#include "Price.h" +#include "Quantity.h" +#include "SecurityID.h" +#include "Side.h" +#include "TimeInForce.h" +#include "UserID.h" +#include "lib/domain/cme/GlbxOrderDefinition.h" +#include "lib/domain/deribit/DeribitOrderDefinition.h" +#include +#include + +namespace bts::domain { + +// This contains the order parameters common to all exchanges. It is sent once +// when a new order is launched +struct OrderDefinition { + SecurityID security_id; + Side side; + std::string user; + UserID user_id; + std::string account; + AccountID account_id; + TimeInForce time_in_force; + // Exchange specific order definition (ex if a certain exchange offers + // Iceberg orders, this is where its parameters will be) + const std::variant + exchange_order = {DeribitOrderDefinition{}}; +}; + +std::ostream &operator<<(std::ostream &out, const OrderDefinition &od) noexcept; + +} // namespace bts::domain diff --git a/src/lib/domain/OrderState.h b/src/lib/domain/OrderState.h new file mode 100644 index 000000000..3b2307332 --- /dev/null +++ b/src/lib/domain/OrderState.h @@ -0,0 +1,19 @@ +#pragma once +#include "OrderStatus.h" +#include "Price.h" +#include "Quantity.h" +#include "lib/domain/cme/GlbxOrderState.h" +#include "lib/domain/deribit/DeribitOrderState.h" +#include + +namespace bts::domain { + +struct OrderState { + OrderStatus status; + Quantity total_fills; + Price avg_filled_price; + // If there is any exchange specific order state + std::variant exchange_order_state; +}; + +} // namespace bts::domain diff --git a/src/lib/domain/OrderStatus.cpp b/src/lib/domain/OrderStatus.cpp new file mode 100644 index 000000000..35b3bce16 --- /dev/null +++ b/src/lib/domain/OrderStatus.cpp @@ -0,0 +1,10 @@ +#include "OrderStatus.h" + +namespace bts::domain { + +std::ostream &operator<<(std::ostream &out, const OrderStatus &os) noexcept { + out << OrderStatus_name(os); + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/OrderStatus.h b/src/lib/domain/OrderStatus.h new file mode 100644 index 000000000..37ee83fe6 --- /dev/null +++ b/src/lib/domain/OrderStatus.h @@ -0,0 +1,30 @@ +#pragma once +#include + +namespace bts::domain { + +// Order can be in one of these states +enum class OrderStatus { Working, Completed, Canceled }; + +constexpr const char *OrderStatus_name(OrderStatus os) noexcept; + +std::ostream &operator<<(std::ostream &out, const OrderStatus &os) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *OrderStatus_name(OrderStatus os) noexcept { + switch (os) { + case OrderStatus::Working: + return "Working"; + case OrderStatus::Completed: + return "Completed"; + case OrderStatus::Canceled: + return "Canceled"; + default: + return "Unknown"; + } +} + +} // namespace bts::domain diff --git a/src/lib/domain/OrderUpdate.cpp b/src/lib/domain/OrderUpdate.cpp new file mode 100644 index 000000000..84721b66b --- /dev/null +++ b/src/lib/domain/OrderUpdate.cpp @@ -0,0 +1,11 @@ +#include "OrderUpdate.h" + +namespace bts::domain { + +std::ostream &operator<<(std::ostream &out, const OrderUpdate &ou) noexcept { + out << "key: " << ou.order_key << "; price: " << ou.price + << "; qty: " << ou.qty; + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/OrderUpdate.h b/src/lib/domain/OrderUpdate.h new file mode 100644 index 000000000..550de6449 --- /dev/null +++ b/src/lib/domain/OrderUpdate.h @@ -0,0 +1,18 @@ +#pragma once +#include "OrderKey.h" +#include "Price.h" +#include "Quantity.h" + +namespace bts::domain { + +// Structure for order modifications (also know as cancel-replace at some +// exchanges). +struct OrderUpdate { + OrderKey order_key; + Price price; + Quantity qty; +}; + +std::ostream &operator<<(std::ostream &out, const OrderUpdate &ou) noexcept; + +} // namespace bts::domain diff --git a/src/lib/domain/TimeInForce.cpp b/src/lib/domain/TimeInForce.cpp new file mode 100644 index 000000000..e771303fa --- /dev/null +++ b/src/lib/domain/TimeInForce.cpp @@ -0,0 +1,10 @@ +#include "TimeInForce.h" + +namespace bts::domain { + +std::ostream &operator<<(std::ostream &out, const TimeInForce &tif) noexcept { + out << TimeInForce_name(tif); + return out; +} + +} // namespace bts::domain diff --git a/src/lib/domain/TimeInForce.h b/src/lib/domain/TimeInForce.h new file mode 100644 index 000000000..02c075220 --- /dev/null +++ b/src/lib/domain/TimeInForce.h @@ -0,0 +1,31 @@ +#pragma once +#include + +namespace bts::domain { + +enum class TimeInForce { Day = 48, GTC = 49, IOC = 51, Date = 52 }; + +constexpr const char *TimeInForce_name(TimeInForce tif); + +std::ostream &operator<<(std::ostream &out, const TimeInForce &tif) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *TimeInForce_name(TimeInForce tif) { + switch (tif) { + case TimeInForce::Day: + return "Day"; + case TimeInForce::GTC: + return "GTC"; + case TimeInForce::IOC: + return "IOC"; + case TimeInForce::Date: + return "Date"; + default: + return "Unknown"; + } +} + +} // namespace bts::domain diff --git a/src/lib/domain/cme/GlbxOrderDefinition.h b/src/lib/domain/cme/GlbxOrderDefinition.h new file mode 100644 index 000000000..d4e3b9c14 --- /dev/null +++ b/src/lib/domain/cme/GlbxOrderDefinition.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class GlbxOrderDefinition {}; + +} // namespace bts::domain diff --git a/src/lib/domain/cme/GlbxOrderState.h b/src/lib/domain/cme/GlbxOrderState.h new file mode 100644 index 000000000..a396d5576 --- /dev/null +++ b/src/lib/domain/cme/GlbxOrderState.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class GlbxOrderState {}; + +} // namespace bts::domain diff --git a/src/lib/domain/deribit/DeribitOrderDefinition.h b/src/lib/domain/deribit/DeribitOrderDefinition.h new file mode 100644 index 000000000..80752c6fe --- /dev/null +++ b/src/lib/domain/deribit/DeribitOrderDefinition.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class DeribitOrderDefinition {}; + +} // namespace bts::domain diff --git a/src/lib/domain/deribit/DeribitOrderState.h b/src/lib/domain/deribit/DeribitOrderState.h new file mode 100644 index 000000000..c35fa1dfc --- /dev/null +++ b/src/lib/domain/deribit/DeribitOrderState.h @@ -0,0 +1,7 @@ +#pragma once + +namespace bts::domain { + +class DeribitOrderState {}; + +} // namespace bts::domain diff --git a/src/lib/md/emumba/OrderGateway.h b/src/lib/md/emumba/OrderGateway.h deleted file mode 100644 index ee7ee3009..000000000 --- a/src/lib/md/emumba/OrderGateway.h +++ /dev/null @@ -1,88 +0,0 @@ -#pragma once - -#include "MarketDataCommon.h" -#include -#include -#include - -namespace EmumbaMarketData { - -enum class TimeInForce { - TIME_IN_FORCE_DAY = 48, - TIME_IN_FORCE_GTC = 49, - TIME_IN_FORCE_IOC = 51, - TIME_IN_FORCE_DATE = 52 -}; - -struct DeribitOrderDefinition {}; -struct GlbxOrderDefinition {}; - -// This contains the order parameters common to all exchanges. It is sent once -// when a new order is launched -struct OrderDefinition { - SecurityID security_id; - Side side; - std::string user; - UserID user_id; - std::string account; - AccountID account_id; - TimeInForce time_in_force; - // Exchange specific order definition (ex if a certain exchange offers - // Iceberg orders, this is where its parameters will be) - const std::variant - exchange_order = {DeribitOrderDefinition{}}; -}; - -// Sent once per order, when the order is first launched (launching an order, -// placing, firing, sending all mean the same) -struct NewOrder { - OrderDefinition order_def; - Price price; - Quantity qty; -}; - -// Structure for order modifications (also know as cancel-replace at some -// exchanges). -struct OrderUpdate { - OrderKey order_key; - Price price; - Quantity qty; -}; - -// Order can be in one of these states -enum class OrderStatus { WORKING, COMPLETED, CANCELED }; - -struct DeribitOrderState {}; -struct GlbxOrderState {}; - -struct OrderState { - OrderStatus status; - Quantity total_fills; - Price avg_filled_price; - // If there is any exchange specific order state - std::variant exchange_order_state; -}; - -// Order cacllbacks are passed to this interface -class IOrderListener { - virtual void on_order_state( - OrderKey order_key, const OrderState &order_state) = 0; -}; - -// Anologous to the MarketDataGateway. All order interactions happen through -// this class. -class OrderGateway { - // This is called just once to register the listening class (to get order - // callbacks) - void register_once(IOrderListener *listener) noexcept; - // New orders are placed via this function. An internal OrderKey is - // generated for every order new order. This OrderKey is used for subsequent - // calls as well as IOrderListener callbacks - OrderKey launch_new_order(const NewOrder &new_order); - // An order is changed via this method. We can start by allowing only price - // and qty changes (these are by far the most common changes) - void update_order(const OrderUpdate &order_update); - void cancel_order(OrderKey order_key); -}; - -} // namespace EmumbaMarketData \ No newline at end of file diff --git a/src/lib/orderman/IOrderListener.h b/src/lib/orderman/IOrderListener.h new file mode 100644 index 000000000..654ba789b --- /dev/null +++ b/src/lib/orderman/IOrderListener.h @@ -0,0 +1,13 @@ +#pragma once +#include "lib/domain/OrderKey.h" +#include "lib/domain/OrderState.h" + +namespace bts::orderman { + +// Order callbacks are passed to this interface +class IOrderListener { + virtual void on_order_state( + domain::OrderKey order_key, const domain::OrderState &order_state) = 0; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/OrderGateway.h b/src/lib/orderman/OrderGateway.h new file mode 100644 index 000000000..bc6e7b787 --- /dev/null +++ b/src/lib/orderman/OrderGateway.h @@ -0,0 +1,39 @@ +#pragma once +#include "lib/domain/OrderKey.h" + +namespace bts::domain { +struct NewOrder; +struct OrderUpdate; +} // namespace bts::domain + +namespace bts::orderman { + +class IOrderListener; + +// Anologous to the MarketDataGateway. All order interactions happen through +// this class. +class OrderGateway { + public: + /** + * This is called just once to register the listening class (to get order + * callbacks) + */ + void register_once(IOrderListener *listener) noexcept; + + /** + * New orders are placed via this function. An internal OrderKey is generated + * for every order new order. This OrderKey is used for subsequent calls as + * well as IOrderListener callbacks + */ + domain::OrderKey launch_new_order(const domain::NewOrder &new_order); + + /** + * An order is changed via this method. We can start by allowing only price + * and qty changes (these are by far the most common changes) + */ + void update_order(const domain::OrderUpdate &order_update); + + void cancel_order(domain::OrderKey order_key); +}; + +} // namespace bts::orderman From 66f7474d62bf2c960f6b4b06cca9e6740debe4f8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 24 Sep 2021 21:52:52 -0400 Subject: [PATCH 050/100] style: Declare default copy ctrs for good taste This will also satisfy more recent compilers, for when we finally do upgrade the build --- src/lib/md/IntPrice.h | 2 ++ src/lib/md/MBOProcessor.h | 1 + src/lib/md/MDProducerHandle.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/lib/md/IntPrice.h b/src/lib/md/IntPrice.h index 85a6f50c1..a6aec4572 100644 --- a/src/lib/md/IntPrice.h +++ b/src/lib/md/IntPrice.h @@ -41,6 +41,8 @@ class IntPrice { constexpr IntPrice(const IntPrice &other) : _mantissa(other._mantissa), _exponent(other._exponent) {} + constexpr IntPrice &operator=(const IntPrice &other) = default; + bool operator==(const IntPrice &other) const { if (_exponent == other._exponent) { return _mantissa == other._mantissa; diff --git a/src/lib/md/MBOProcessor.h b/src/lib/md/MBOProcessor.h index bb3e85648..c917bdeca 100644 --- a/src/lib/md/MBOProcessor.h +++ b/src/lib/md/MBOProcessor.h @@ -95,6 +95,7 @@ struct MBOWorkingState { }; MBOWorkingState(MDProducerHandle &h) : handle(h), updated(), bid(), ask() {} + MBOWorkingState(const MBOWorkingState &other) = default; MDProducerHandle handle; utils::TimeStamp updated; diff --git a/src/lib/md/MDProducerHandle.h b/src/lib/md/MDProducerHandle.h index 71c29fbcd..7186e446e 100644 --- a/src/lib/md/MDProducerHandle.h +++ b/src/lib/md/MDProducerHandle.h @@ -23,6 +23,8 @@ class BTS_EXPORT MDProducerHandle { ColdEntry &, void *hot, MDProducerChannel channel); + + MDProducerHandle(const MDProducerHandle &other) = default; ~MDProducerHandle(); MDProducerHandle &operator=(MDProducerHandle const &other); From 2e7bdbcac5515fe0295bf97eb37f883199dfdbe4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 28 Sep 2021 10:57:36 -0400 Subject: [PATCH 051/100] Add classes that mirror binance json structures --- src/lib/md/binance/BinanceBookLevel.cpp | 44 ++++++++++++++ src/lib/md/binance/BinanceBookLevel.h | 23 ++++++++ src/lib/md/binance/BinanceBookLevelComp.h | 46 +++++++++++++++ src/lib/md/binance/BinanceBookTickerUpdate.h | 23 ++++++++ src/lib/md/binance/BinanceDiffDepthUpdate.h | 29 ++++++++++ src/lib/md/binance/BinanceMiniTickerUpdate.h | 29 ++++++++++ .../binance/BinancePartialBookDepthUpdate.h | 17 ++++++ src/lib/md/binance/BinanceTickerUpdate.h | 57 +++++++++++++++++++ 8 files changed, 268 insertions(+) create mode 100644 src/lib/md/binance/BinanceBookLevel.cpp create mode 100644 src/lib/md/binance/BinanceBookLevel.h create mode 100644 src/lib/md/binance/BinanceBookLevelComp.h create mode 100644 src/lib/md/binance/BinanceBookTickerUpdate.h create mode 100644 src/lib/md/binance/BinanceDiffDepthUpdate.h create mode 100644 src/lib/md/binance/BinanceMiniTickerUpdate.h create mode 100644 src/lib/md/binance/BinancePartialBookDepthUpdate.h create mode 100644 src/lib/md/binance/BinanceTickerUpdate.h diff --git a/src/lib/md/binance/BinanceBookLevel.cpp b/src/lib/md/binance/BinanceBookLevel.cpp new file mode 100644 index 000000000..b82c66b24 --- /dev/null +++ b/src/lib/md/binance/BinanceBookLevel.cpp @@ -0,0 +1,44 @@ +#include "BinanceBookLevel.h" +#include "lib/os/os.h" + +namespace bts::md::binance { + +bool operator==(const BinanceBookLevel &lhs, const BinanceBookLevel &rhs) { + // return lhs.quantity == rhs.quantity && lhs.price == rhs.price; + if (lhs.quantity != rhs.quantity) { + return false; + } + if (lhs.price == rhs.price) { + return true; + } + return os::is_nan(lhs.price) && os::is_nan(rhs.price); +} + +bool operator!=(const BinanceBookLevel &lhs, const BinanceBookLevel &rhs) { + return !(lhs == rhs); +} + +std::ostream &operator<<( + std::ostream &out, const BinanceBookLevel &book_level) noexcept { + out << book_level.quantity << "@" << book_level.price; + return out; +} + +void from_json(const nlohmann::json &j, BinanceBookLevel &upd) { + if (j.is_array() && j.size() == 2) { + const nlohmann::json &jprice = j.at(0); + const auto &price_str = jprice.get(); + upd.price = std::stod(price_str); + + const nlohmann::json &jqty = j.at(1); + const auto &qty_str = jqty.get(); + upd.quantity = std::stod(qty_str); + } +} + +void to_json(nlohmann::json &j, const BinanceBookLevel &upd) { + j.push_back(upd.price); + j.push_back(upd.quantity); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceBookLevel.h b/src/lib/md/binance/BinanceBookLevel.h new file mode 100644 index 000000000..3e57284c5 --- /dev/null +++ b/src/lib/md/binance/BinanceBookLevel.h @@ -0,0 +1,23 @@ +#pragma once +#include +#include +#include + +namespace bts::md::binance { + +class BinanceBookLevel { + public: + double price; + std::size_t quantity; +}; + +bool operator==(const BinanceBookLevel &lhs, const BinanceBookLevel &rhs); +bool operator!=(const BinanceBookLevel &lhs, const BinanceBookLevel &rhs); + +std::ostream &operator<<( + std::ostream &out, const BinanceBookLevel &book_level) noexcept; + +void from_json(const nlohmann::json &j, BinanceBookLevel &upd); +void to_json(nlohmann::json &j, const BinanceBookLevel &upd); + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceBookLevelComp.h b/src/lib/md/binance/BinanceBookLevelComp.h new file mode 100644 index 000000000..859bae36a --- /dev/null +++ b/src/lib/md/binance/BinanceBookLevelComp.h @@ -0,0 +1,46 @@ +#pragma once +#include "BinanceBookLevel.h" +#include "lib/domain/Price.h" +#include "lib/domain/Side.h" + +namespace bts::md::binance { + +class BinanceBookLevelComp { + public: + explicit constexpr BinanceBookLevelComp(domain::Side side); + + constexpr bool operator()( + const BinanceBookLevel &lhs, const BinanceBookLevel &rhs) const; + constexpr bool operator()(const BinanceBookLevel &lhs, double rhs) const; + constexpr bool operator()(double lhs, const BinanceBookLevel &rhs) const; + + private: + domain::Side side_; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr BinanceBookLevelComp::BinanceBookLevelComp(domain::Side side) + : side_(side) {} + +constexpr bool BinanceBookLevelComp::operator()( + const BinanceBookLevel &lhs, const BinanceBookLevel &rhs) const { + if (lhs.price == rhs.price) { + return lhs.quantity > rhs.quantity; + } + return domain::Price::is_better(side_, lhs.price, rhs.price); +} + +constexpr bool BinanceBookLevelComp::operator()( + const BinanceBookLevel &lhs, double rhs) const { + return domain::Price::is_better(side_, lhs.price, rhs); +} + +constexpr bool BinanceBookLevelComp::operator()( + double lhs, const BinanceBookLevel &rhs) const { + return domain::Price::is_better(side_, lhs, rhs.price); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceBookTickerUpdate.h b/src/lib/md/binance/BinanceBookTickerUpdate.h new file mode 100644 index 000000000..cf7f6660b --- /dev/null +++ b/src/lib/md/binance/BinanceBookTickerUpdate.h @@ -0,0 +1,23 @@ +#pragma once +#include +#include + +namespace bts::md::binance { + +class BinanceBookTickerUpdate { + public: + // json name: u + std::size_t order_book_update_id; + // json name: s + std::string symbol; + // json name: b + double best_bid_price; + // json name: B + double best_bid_quantity; + // json name: a + double best_ask_price; + // json name: A + double best_ask_quantity; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDiffDepthUpdate.h b/src/lib/md/binance/BinanceDiffDepthUpdate.h new file mode 100644 index 000000000..ed66aa9c6 --- /dev/null +++ b/src/lib/md/binance/BinanceDiffDepthUpdate.h @@ -0,0 +1,29 @@ +#pragma once +#include "BinanceBookLevel.h" +#include +#include +#include + +namespace bts::md::binance { + +class BinanceDiffDepthUpdate { + public: + // json name: e + std::string event_type; + // json name: E + std::size_t event_time; + // json name: s + std::string symbol; + // The first event whose transition is included in this update + // json name: U + std::size_t first_update_id; + // The last event whose transition is included in this update + // json name: u + std::size_t last_update_id; + // json name: b + std::vector changed_bids; + // json name: a + std::vector changed_asks; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceMiniTickerUpdate.h b/src/lib/md/binance/BinanceMiniTickerUpdate.h new file mode 100644 index 000000000..b351af5a8 --- /dev/null +++ b/src/lib/md/binance/BinanceMiniTickerUpdate.h @@ -0,0 +1,29 @@ +#pragma once +#include +#include + +namespace bts::md::binance { + +class BinanceMiniTickerUpdate { + public: + // json name: e + std::string event_type; + // json name: E + std::size_t event_time; + // json name: s + std::string symbol; + // json name: c + double close_price; + // json name: o + double open_price; + // json name: h + double high_price; + // json name: l + double low_price; + // json name: v + std::size_t base_asset_volume; + // json name: q + std::size_t quote_asset_volume; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinancePartialBookDepthUpdate.h b/src/lib/md/binance/BinancePartialBookDepthUpdate.h new file mode 100644 index 000000000..023040f65 --- /dev/null +++ b/src/lib/md/binance/BinancePartialBookDepthUpdate.h @@ -0,0 +1,17 @@ +#pragma once +#include "BinanceBookLevel.h" +#include + +namespace bts::md::binance { + +class BinancePartialBookDepthUpdate { + public: + // json name: lastUpdateId + std::size_t last_update_id; + // json name: bids + std::vector bids; + // json name: asks + std::vector asks; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceTickerUpdate.h b/src/lib/md/binance/BinanceTickerUpdate.h new file mode 100644 index 000000000..c9b041174 --- /dev/null +++ b/src/lib/md/binance/BinanceTickerUpdate.h @@ -0,0 +1,57 @@ +#pragma once +#include +#include + +namespace bts::md::binance { + +class BinanceTickerUpdate { + public: + // json name: e + std::string event_type; + // json name: E + std::size_t event_time; + // json name: s + std::string symbol; + // json name: p + double price_change; + // json name: P + double price_change_pct; + // json name: w + double weighted_avg; + // json name: x + double win_first_price; + // json name: c + double last_price; + // json name: Q + double last_quantityu; + // json name: b + double best_bid_price; + // json name: B + double best_bid_quantity; + // json name: a + double bet_ask_price; + // json name: A + double best_ask_quantity; + // json name: o + double open_price; + // json name: h + double high_price; + // json name: l + double low_price; + // json name: v + std::size_t base_asset_volume; + // json name: q + std::size_t quote_asset_volume; + // json name: O + std::size_t stat_open_time; + // json name: C + std::size_t stat_close_time; + // json name: F + std::size_t first_trade_id; + // json name: L + std::size_t last_trade_id; + // json name: n + std::size_t total_num_trades; +}; + +} // namespace bts::md::binance From 7eb8f0d68550752d46e3e99e8d298784eee6c078 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 28 Sep 2021 20:51:14 -0400 Subject: [PATCH 052/100] Add protos for crypto --- src/lib/api/domain/Currency.proto | 8 +++ src/lib/api/domain/SecurityType.proto | 10 +++ src/lib/api/domain/Venue.proto | 17 +++++ .../api/md/MarketDataSubscriptionParams.proto | 19 ++++++ .../BinanceMarketDataSubscriptionParams.proto | 19 ++++++ .../DeribitMarketDataSubscriptionParams.proto | 7 +++ .../ftx/FTXMarketDataSubscriptionParams.proto | 7 +++ .../GlbxMarketDataSubscriptionParams.proto | 7 +++ .../HuobiMarketDataSubscriptionParams.proto | 7 +++ src/lib/md/MarketDataSubscription.h | 62 +++++++++++++------ .../spreader_orders/tests/spreader_tests.cpp | 28 ++++----- .../spreader_orders/tests/tests_common.h | 26 ++++---- 12 files changed, 172 insertions(+), 45 deletions(-) create mode 100644 src/lib/api/domain/Currency.proto create mode 100644 src/lib/api/domain/SecurityType.proto create mode 100644 src/lib/api/domain/Venue.proto create mode 100644 src/lib/api/md/MarketDataSubscriptionParams.proto create mode 100644 src/lib/api/md/binance/BinanceMarketDataSubscriptionParams.proto create mode 100644 src/lib/api/md/deribit/DeribitMarketDataSubscriptionParams.proto create mode 100644 src/lib/api/md/ftx/FTXMarketDataSubscriptionParams.proto create mode 100644 src/lib/api/md/glbx/GlbxMarketDataSubscriptionParams.proto create mode 100644 src/lib/api/md/huobi/HuobiMarketDataSubscriptionParams.proto diff --git a/src/lib/api/domain/Currency.proto b/src/lib/api/domain/Currency.proto new file mode 100644 index 000000000..68dd5b138 --- /dev/null +++ b/src/lib/api/domain/Currency.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +package bts.api.domain; + +enum Currency { + BTC = 0; + ETH = 1; + USD = 3; +} diff --git a/src/lib/api/domain/SecurityType.proto b/src/lib/api/domain/SecurityType.proto new file mode 100644 index 000000000..3867bbe0a --- /dev/null +++ b/src/lib/api/domain/SecurityType.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package bts.api.domain; + +enum SecurityType { + UNSET = 0; + INDEX = 1; + FUTURE = 2; + SPREAD = 3; + OPTION = 4; +} diff --git a/src/lib/api/domain/Venue.proto b/src/lib/api/domain/Venue.proto new file mode 100644 index 000000000..0e2ede7a2 --- /dev/null +++ b/src/lib/api/domain/Venue.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; +package bts.api.domain; + +// IMPORTANT: Don't change the int value of any enum entries! +// The exchange enum value is encoded in the first 32 bits of our internal +// security keys. The remaining 32 bits (as the key is 64 bits) is then +// used to uniquely identify a security within an exchange context. For +// cross-exchange integration, it might be useful to associate an exchange +// with a security id. +enum Venue { + NONE = 0; + GLBX = 1; + DERIBIT = 2; + HUOBI = 3; + BINANCE = 4; + FTX = 5; +} diff --git a/src/lib/api/md/MarketDataSubscriptionParams.proto b/src/lib/api/md/MarketDataSubscriptionParams.proto new file mode 100644 index 000000000..ad1d9a10b --- /dev/null +++ b/src/lib/api/md/MarketDataSubscriptionParams.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +import "lib/api/md/binance/BinanceMarketDataSubscriptionParams.proto"; +import "lib/api/md/deribit/DeribitMarketDataSubscriptionParams.proto"; +import "lib/api/md/ftx/FTXMarketDataSubscriptionParams.proto"; +import "lib/api/md/glbx/GlbxMarketDataSubscriptionParams.proto"; +import "lib/api/md/huobi/HuobiMarketDataSubscriptionParams.proto"; + +package bts.api.md; + +message MarketDataSubscriptionParams { + oneof VenueParams { + bts.api.md.glbx.GlbxMarketDataSubscriptionParams glbx = 1; + bts.api.md.deribit.DeribitMarketDataSubscriptionParams deribit = 2; + bts.api.md.binance.BinanceMarketDataSubscriptionParams binance = 3; + bts.api.md.huobi.HuobiMarketDataSubscriptionParams huobi = 4; + bts.api.md.ftx.FTXMarketDataSubscriptionParams ftx = 5; + } +} diff --git a/src/lib/api/md/binance/BinanceMarketDataSubscriptionParams.proto b/src/lib/api/md/binance/BinanceMarketDataSubscriptionParams.proto new file mode 100644 index 000000000..771c697f6 --- /dev/null +++ b/src/lib/api/md/binance/BinanceMarketDataSubscriptionParams.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +import "lib/api/io/URL.proto"; + +package bts.api.md.binance; + +message BinanceDepthStreamParams { + bts.api.io.URL stream_url = 1; + bts.api.io.URL snapshot_url = 2; + repeated string symbols = 3; + // The number of book levels to observe. At the time of writing this comment, + // valid values are 1, 5, 10, 100, 1000, or unlimited (represented by 0). + // Check the binance api docs for updates. + uint32 num_levels = 4; +} + +message BinanceMarketDataSubscriptionParams { + repeated BinanceDepthStreamParams depth_streams = 2; +} diff --git a/src/lib/api/md/deribit/DeribitMarketDataSubscriptionParams.proto b/src/lib/api/md/deribit/DeribitMarketDataSubscriptionParams.proto new file mode 100644 index 000000000..7e0a0c361 --- /dev/null +++ b/src/lib/api/md/deribit/DeribitMarketDataSubscriptionParams.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package bts.api.md.deribit; + +message DeribitMarketDataSubscriptionParams { + // TODO +} diff --git a/src/lib/api/md/ftx/FTXMarketDataSubscriptionParams.proto b/src/lib/api/md/ftx/FTXMarketDataSubscriptionParams.proto new file mode 100644 index 000000000..df7481779 --- /dev/null +++ b/src/lib/api/md/ftx/FTXMarketDataSubscriptionParams.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package bts.api.md.ftx; + +message FTXMarketDataSubscriptionParams { + // TODO +} diff --git a/src/lib/api/md/glbx/GlbxMarketDataSubscriptionParams.proto b/src/lib/api/md/glbx/GlbxMarketDataSubscriptionParams.proto new file mode 100644 index 000000000..9cb48ca76 --- /dev/null +++ b/src/lib/api/md/glbx/GlbxMarketDataSubscriptionParams.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package bts.api.md.glbx; + +message GlbxMarketDataSubscriptionParams { + // TODO +} diff --git a/src/lib/api/md/huobi/HuobiMarketDataSubscriptionParams.proto b/src/lib/api/md/huobi/HuobiMarketDataSubscriptionParams.proto new file mode 100644 index 000000000..093857145 --- /dev/null +++ b/src/lib/api/md/huobi/HuobiMarketDataSubscriptionParams.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package bts.api.md.huobi; + +message HuobiMarketDataSubscriptionParams { + // TODO +} diff --git a/src/lib/md/MarketDataSubscription.h b/src/lib/md/MarketDataSubscription.h index a0e34e2e2..abd64f306 100644 --- a/src/lib/md/MarketDataSubscription.h +++ b/src/lib/md/MarketDataSubscription.h @@ -1,34 +1,60 @@ #pragma once -#include "lib/domain/Venue.h" -#include "lib/md/binance/BinanceMarketDataSubscription.h" -#include "lib/md/cme/GlbxMarketDataSubscription.h" -#include "lib/md/deribit/DeribitMarketDataSubscription.h" +#include "lib/api/domain/Venue.pb.h" +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/api/md/deribit/DeribitMarketDataSubscriptionParams.pb.h" +#include "lib/api/md/glbx/GlbxMarketDataSubscriptionParams.pb.h" #include namespace bts::md { struct MarketDataSubscription { - domain::Venue venue() const; - const std::variant< - cme::GlbxMarketDataSubscription, - deribit::DeribitMarketDataSubscription, - binance::BinanceMarketDataSubscription> - subscription{}; + api::domain::Venue venue() const; + + MarketDataSubscription() = default; + explicit MarketDataSubscription( + const api::md::MarketDataSubscriptionParams ¶ms); + + MarketDataSubscription(const MarketDataSubscription &) noexcept = default; + MarketDataSubscription(MarketDataSubscription &&) noexcept = default; + MarketDataSubscription &operator=(const MarketDataSubscription &) noexcept = + default; + MarketDataSubscription &operator=(MarketDataSubscription &&) noexcept = + default; + + const api::md::MarketDataSubscriptionParams ¶ms() const; + + private: + api::md::MarketDataSubscriptionParams params_{}; }; ////////////////////////////////////////////////// // Definition ////////////////////////////////////////////////// -inline domain::Venue MarketDataSubscription::venue() const { - if (std::holds_alternative(subscription)) { - return domain::Venue::Glbx; +MarketDataSubscription::MarketDataSubscription( + const api::md::MarketDataSubscriptionParams ¶ms) + : params_(params) {} + +inline const api::md::MarketDataSubscriptionParams & +MarketDataSubscription::params() const { + return params_; +} + +inline api::domain::Venue MarketDataSubscription::venue() const { + switch (params_.VenueParams_case()) { + case api::md::MarketDataSubscriptionParams::VenueParamsCase::kBinance: + return api::domain::Venue::BINANCE; + case api::md::MarketDataSubscriptionParams::VenueParamsCase::kDeribit: + return api::domain::Venue::DERIBIT; + case api::md::MarketDataSubscriptionParams::VenueParamsCase::kFtx: + return api::domain::Venue::FTX; + case api::md::MarketDataSubscriptionParams::VenueParamsCase::kGlbx: + return api::domain::Venue::GLBX; + case api::md::MarketDataSubscriptionParams::VenueParamsCase::kHuobi: + return api::domain::Venue::HUOBI; + default: + return api::domain::Venue::NONE; } - if (std::holds_alternative( - subscription)) { - return domain::Venue::Deribit; - } - return domain::Venue::Glbx; } } // namespace bts::md diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index cfd1a0f91..111fe3044 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -4587,7 +4587,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(1999.0), 1.0, + in_book, bts::md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); @@ -4606,7 +4606,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(1999.0), 1.0, + in_book, bts::md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); @@ -4624,7 +4624,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(1999.0), 1.0, + in_book, bts::md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); @@ -4642,7 +4642,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::INT_NAN, 1.0, bts::spark::LegSpreaderParams::DIRECT, + in_book, bts::md::INT_NAN, 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book( @@ -4659,7 +4659,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(1999.0), 1.0, + in_book, bts::md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); @@ -4677,7 +4677,7 @@ TEST_CASE("simple book addition", "[spreader]") { api::Side::SIDE_BUY, true); Book out_book(key); SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(1999.0), 1.0, + in_book, bts::md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); @@ -4716,7 +4716,7 @@ TEST_CASE("random book addition", "[spreader]") { // direct, book { SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(settlement_price), 1.0, + in_book, bts::md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book( @@ -4733,7 +4733,7 @@ TEST_CASE("random book addition", "[spreader]") { exp_ask_prices[i] = ask_prices[i] - settlement_price; } SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(settlement_price), 1.0, + in_book, bts::md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book( @@ -4750,7 +4750,7 @@ TEST_CASE("random book addition", "[spreader]") { exp_ask_sizes[i] = direct_ask_sizes[i] + implied_ask_sizes[i]; } SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(settlement_price), 1.0, + in_book, bts::md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book( @@ -4769,7 +4769,7 @@ TEST_CASE("random book addition", "[spreader]") { exp_ask_sizes[i] = direct_ask_sizes[i] + implied_ask_sizes[i]; } SpreaderUtils::copy_book( - in_book, md::IntPrice_from_double<7>(settlement_price), 1.0, + in_book, bts::md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book( @@ -5046,11 +5046,11 @@ TEST_CASE("net_change_transformation", "[spreader]") { // generate books in ticks Book b1_ticks, b2_ticks; SpreaderUtils::copy_book( - b1_raw, md::IntPrice_from_double<7>(settle1), 0.0005, + b1_raw, bts::md::IntPrice_from_double<7>(settle1), 0.0005, spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, b1_ticks); SpreaderUtils::copy_book( - b2_raw, md::IntPrice_from_double<7>(settle2), 0.0001, + b2_raw, bts::md::IntPrice_from_double<7>(settle2), 0.0001, spark::LegSpreaderParams::DIRECT, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, b2_ticks); // generate the leg properties accordingly (notice the tick size is 1 @@ -5103,11 +5103,11 @@ TEST_CASE("net_change_transformation", "[spreader]") { // generate books in ticks Book b1_ticks, b2_ticks; SpreaderUtils::copy_book( - b1_raw, md::IntPrice_from_double<7>(settle1), tick1, + b1_raw, bts::md::IntPrice_from_double<7>(settle1), tick1, spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, b1_ticks); SpreaderUtils::copy_book( - b2_raw, md::IntPrice_from_double<7>(settle2), tick2, + b2_raw, bts::md::IntPrice_from_double<7>(settle2), tick2, spark::LegSpreaderParams::MERGED, bts::api::SyntheticContract::PRICECALC_NET_CHANGE, b2_ticks); // generate the leg properties accordingly (notice the tick size is 1 diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index bba1dbff9..627c2c8be 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -29,8 +29,8 @@ void fill_book(bts::orderman::Book &, double *, uint16_t *, bts::api::Side); class AltOrderGatewayForTest : public IAlternateOrderGateway { public: - void - place_order(SecurityKey, OrderKey, api::Side, Price, Quantity) override {} + void place_order( + SecurityKey, OrderKey, api::Side, Price, Quantity) override {} void modify_order(OrderKey, Price, Quantity) override {} void cancel_order(OrderKey) override {} OrderKey generate_key() override { @@ -340,9 +340,9 @@ void fill_book( bool delete_arrays) { bts::orderman::BookSide &bookside = book.side(side); for (size_t i = 0; i < book.n_levels(); i++) - bookside[i] = md::PriceSize( - md::IntPrice_from_double<7>(prices[i]), direct_sizes[i], - md::ImpliedSize(implied_sizes[i])); + bookside[i] = bts::md::PriceSize( + bts::md::IntPrice_from_double<7>(prices[i]), direct_sizes[i], + bts::md::ImpliedSize(implied_sizes[i])); if (delete_arrays) { delete[] prices; delete[] direct_sizes; @@ -357,7 +357,7 @@ void fill_book( bts::api::Side side) { bts::orderman::BookSide &bookside = book.side(side); for (size_t i = 0; i < book.n_levels(); i++) - bookside[i] = md::PriceSize_from_double<6>(prices[i], sizes[i]); + bookside[i] = bts::md::PriceSize_from_double<6>(prices[i], sizes[i]); } void fill_book( bts::orderman::Book &book, @@ -368,8 +368,8 @@ void fill_book( bts::orderman::BookSide &bidside = book.side(api::Side::SIDE_BUY); bts::orderman::BookSide &askside = book.side(api::Side::SIDE_SELL); for (size_t i = 0; i < book.n_levels(); i++) { - bidside[i] = md::PriceSize_from_double<6>(bid_prices[i], bid_sizes[i]); - askside[i] = md::PriceSize_from_double<6>(ask_prices[i], ask_sizes[i]); + bidside[i] = bts::md::PriceSize_from_double<6>(bid_prices[i], bid_sizes[i]); + askside[i] = bts::md::PriceSize_from_double<6>(ask_prices[i], ask_sizes[i]); } } bts::orderman::Book get_book( @@ -383,13 +383,13 @@ bts::orderman::Book get_book( bool delete_arrays) { bts::orderman::BookSide bidside, askside; for (size_t i = 0; i < n_bid_levels; i++) { - md::PriceSize bid = - md::PriceSize_from_double<6>(bid_prices[i], bid_sizes[i]); + bts::md::PriceSize bid = + bts::md::PriceSize_from_double<6>(bid_prices[i], bid_sizes[i]); bidside[i] = bid; } for (size_t i = 0; i < n_ask_levels; i++) { - md::PriceSize ask = - md::PriceSize_from_double<6>(ask_prices[i], ask_sizes[i]); + bts::md::PriceSize ask = + bts::md::PriceSize_from_double<6>(ask_prices[i], ask_sizes[i]); askside[i] = ask; } if (delete_arrays) { @@ -689,7 +689,7 @@ void validate_book( REQUIRE(book.security_key() == key); const BookSide &md = side == api::Side::SIDE_BUY ? book.bid() : book.ask(); for (size_t i = 0; i < book.n_levels(); i++) { - const md::PriceSize &p = md[i]; + const bts::md::PriceSize &p = md[i]; if (!os::is_nan(prices[i]) && !os::is_nan(p.price())) REQUIRE( securities::test_price_equality(p.price(), prices[i], tick_size)); From c018f866717c0b6ca584b3837ee119f9ed20ed9b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 13 Oct 2021 09:34:37 -0400 Subject: [PATCH 053/100] Add SecurityStore bones/basic impl --- src/lib/md/SecurityStore.cpp | 126 +++++++++++++++++++++++++++++++++++ src/lib/md/SecurityStore.h | 45 +++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 src/lib/md/SecurityStore.cpp create mode 100644 src/lib/md/SecurityStore.h diff --git a/src/lib/md/SecurityStore.cpp b/src/lib/md/SecurityStore.cpp new file mode 100644 index 000000000..bf176c0b1 --- /dev/null +++ b/src/lib/md/SecurityStore.cpp @@ -0,0 +1,126 @@ +#include "SecurityStore.h" +#include "lib/domain/FutureSecurity.h" +#include "lib/domain/Security.h" +#include "lib/utils/Dispatcher.h" +#include "lib/utils/LockBox.h" + +#include +#include +#include +#include + +namespace bts::md { + +static domain::SecurityID create_sec_id( + api::domain::Venue venue, std::uint32_t exch_id) { + auto val = static_cast(exch_id) | + (static_cast(venue) >> 31); + return domain::SecurityID{val}; +} + +struct SecurityStore::PImpl { + utils::LockBox> cache; + tbb::concurrent_queue update_queue; + + void enqueue_update_db(const SecurityPtr &); + void flush(); + + static std::uint32_t id_counter; +}; + +std::uint32_t SecurityStore::PImpl::id_counter = 0; + +void SecurityStore::PImpl::enqueue_update_db(const SecurityPtr &security) { + update_queue.push(security); +} + +void SecurityStore::PImpl::flush() { + // TODO +} + +////////////////// + +SecurityStore::SecurityStore() + : me_(std::make_shared()) {} +SecurityStore::~SecurityStore() {} + +const domain::Security *SecurityStore::try_get_security( + domain::SecurityID key) const { + return me_->cache.lock( + [key](btree::btree_map &t) + -> const domain::Security * { + auto iter = t.find(key); + if (iter != t.end()) { + return iter->second.get(); + } + return nullptr; + }); +} + +const domain::Security *SecurityStore::get_security(domain::SecurityID id) { + const auto *result = try_get_security(id); + if (result == nullptr) { + // TODO + } + return result; +} + +std::vector SecurityStore::get_securities() { + std::vector result; + result.reserve(100000); + + me_->cache.lock([&result](auto &cache) { + for (auto const &p : cache) { + result.push_back(p.second.get()); + } + }); + return result; +} + +const domain::Security *SecurityStore::add_db_security( + const SecurityPtr &security) { + bts_assert(security); + return me_->cache.lock([&security](auto &cache) { + domain::SecurityID id(security->security_common.id); + auto result = cache.insert(std::make_pair(id, security)); + // If result was inserted result.first->second is equal to security + // If the value was already present it must be a recently inserted 'live' + // security and we should use it + return result.first->second.get(); + }); +} + +bool SecurityStore::add_security( + api::domain::Venue venue, + api::domain::SecurityType type, + const std::string &symbol) { + if (venue == api::domain::Venue::NONE || symbol.empty() || + type == api::domain::SecurityType::UNSET) { + return false; + } + return me_->cache.lock([&](auto &cache) { + // TODO: Complete implementation (this initializes an incomplete security + // atm) + SecurityPtr sptr = std::make_shared(); + domain::Security &s = *sptr; + s.security_common.symbol = symbol; + s.security_common.venue = venue; + s.security_common.id = create_sec_id(venue, me_->id_counter++); + switch (type) { + case api::domain::SecurityType::FUTURE: { + s.security = domain::FutureSecurity(); + break; + } + default: + break; + } + // Insert but don't overwrite existing + auto result = cache.insert(std::make_pair(s.security_common.id, sptr)); + me_->enqueue_update_db(sptr); + return result.second; + }); +} + +void SecurityStore::flush_to_disk() { me_->flush(); } + +} // namespace bts::md diff --git a/src/lib/md/SecurityStore.h b/src/lib/md/SecurityStore.h new file mode 100644 index 000000000..df73b8e5a --- /dev/null +++ b/src/lib/md/SecurityStore.h @@ -0,0 +1,45 @@ +#pragma once + +#include "MDConsumerHandle.h" +#include "lib/api/domain/Venue.pb.h" +#include "lib/api/domain/SecurityType.pb.h" +#include "lib/domain/SecurityID.h" +#include + +namespace bts::domain { +class Security; +} + +namespace bts::md { + +class SecurityStore { + public: + using SecurityPtr = std::shared_ptr; + + SecurityStore(); + ~SecurityStore(); + + // Load security from cache with fallback to database + const domain::Security *get_security(domain::SecurityID id); + + // Load all securities from cache, no fallback to database + std::vector get_securities(); + + // Get the security if it's in the cache otherwise return nullptr. Does not + // query security database. + const domain::Security *try_get_security(domain::SecurityID key) const; + + // returns true if the cache was updated + bool add_security( + api::domain::Venue venue, + api::domain::SecurityType type, + const std::string &symbol); + const domain::Security *add_db_security(const SecurityPtr &security); + void flush_to_disk(); + + private: + struct PImpl; + std::shared_ptr me_; +}; + +} // namespace bts::md From 07afba0b9eb813368e2a4525d1afc3d8407dcdc5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Oct 2021 19:42:03 -0400 Subject: [PATCH 054/100] Remove websocket bones --- .../orderman/orders/spreader_orders/tests/spreader_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 111fe3044..813271757 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,6 +1,5 @@ #include "lib/md/IMarketDataListener.h" -#include "lib/md/emumba/OrderGateway.h" -#include "lib/md/websockets/WebsocketClient.h" +#include "lib/communincation/websockets/WebsocketClient.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From 1679dc61a198364d21f1048e10d3b9166fdbaf9b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 20:29:27 -0500 Subject: [PATCH 055/100] Add bts_assert_msgf macro for templated assert msgs --- src/lib/utils/bts_assert.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/utils/bts_assert.h b/src/lib/utils/bts_assert.h index d9e60683b..1815d4acc 100644 --- a/src/lib/utils/bts_assert.h +++ b/src/lib/utils/bts_assert.h @@ -27,6 +27,18 @@ #define bts_assert(EXP) bts_assert_msg(EXP, "") +#define bts_assert_msgf(EXP, msg_template, ...) \ + do { \ + if (!(EXP)) { \ + LOG(Assert, bts::Fatal, "Assert failure: {} {}", std::string(#EXP), \ + fmt::format(msg_template, __VA_ARGS__)); \ + std::this_thread::sleep_for(std::chrono::seconds(1)); \ + if (is_debugger_present()) \ + debug_break(); \ + TERMINATE; \ + } \ + } while (0) + #ifndef NDEBUG #define bts_assert_d bts_assert #else From 77dfe79d95b9be4c497d8ccf664dab9d1b744d3f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 30 Sep 2021 17:36:32 -0400 Subject: [PATCH 056/100] Add proto file settings to clang-format --- .clang-format | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.clang-format b/.clang-format index 994882dfe..76027b85f 100644 --- a/.clang-format +++ b/.clang-format @@ -4,3 +4,6 @@ BinPackParameters: false AlignAfterOpenBracket: AlwaysBreak AlwaysBreakTemplateDeclarations: true PenaltyReturnTypeOnItsOwnLine: 140 +--- +Language: Proto +IndentWidth: 2 From 6573985beadfbdd669db57187026fdde45183d1d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 1 Oct 2021 15:56:51 -0400 Subject: [PATCH 057/100] Overload price comp fns to accept doubles --- src/lib/domain/Price.h | 44 ++++++++++++++++++++++++++++++++++++++ src/lib/domain/PriceComp.h | 5 +++++ 2 files changed, 49 insertions(+) diff --git a/src/lib/domain/Price.h b/src/lib/domain/Price.h index 52b28fc95..50d2e348c 100644 --- a/src/lib/domain/Price.h +++ b/src/lib/domain/Price.h @@ -54,14 +54,22 @@ class Price { [[nodiscard]] constexpr bool is_nan() const noexcept; [[nodiscard]] constexpr bool is_better(Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_better( + Side s, double p1, double p2) noexcept; [[nodiscard]] constexpr bool is_worse(Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_worse( + Side s, double p1, double p2) noexcept; [[nodiscard]] constexpr bool is_better_or_equal( Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_better_or_equal( + Side s, double p1, double p2) noexcept; [[nodiscard]] constexpr bool is_worse_or_equal( Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_worse_or_equal( + Side s, double p1, double p2) noexcept; [[nodiscard]] constexpr Price repl_nan(Price repl) const noexcept; @@ -233,10 +241,27 @@ constexpr bool Price::is_better(Side s, Price p2) const noexcept { return *this < p2; } +constexpr bool Price::is_better(Side s, double p1, double p2) noexcept { + if (std::isnan(p1)) { + return false; + } + if (std::isnan(p2)) { + return true; + } + if (s == Side::Buy) { + return p1 > p2; + } + return p1 < p2; +} + constexpr bool Price::is_worse(Side s, Price p2) const noexcept { return p2.is_better(s, *this); } +constexpr bool Price::is_worse(Side s, double p1, double p2) noexcept { + return is_better(s, p2, p1); +} + constexpr bool Price::is_better_or_equal(Side s, Price p2) const noexcept { if (is_nan()) { // This case is always false (even if p2 is nan), because nan != nan. @@ -251,10 +276,29 @@ constexpr bool Price::is_better_or_equal(Side s, Price p2) const noexcept { return *this <= p2; } +constexpr bool Price::is_better_or_equal( + Side s, double p1, double p2) noexcept { + if (std::isnan(p1)) { + // This case is always false (even if p2 is nan), because nan != nan. + return false; + } + if (std::isnan(p2)) { + return true; + } + if (s == Side::Buy) { + return p1 >= p2; + } + return p1 <= p2; +} + constexpr bool Price::is_worse_or_equal(Side s, Price p2) const noexcept { return p2.is_better_or_equal(s, *this); } +constexpr bool Price::is_worse_or_equal(Side s, double p1, double p2) noexcept { + return is_better_or_equal(s, p2, p1); +} + constexpr Price Price::repl_nan(Price repl) const noexcept { if (is_nan()) { return repl; diff --git a/src/lib/domain/PriceComp.h b/src/lib/domain/PriceComp.h index 09f843b69..c27c7fb33 100644 --- a/src/lib/domain/PriceComp.h +++ b/src/lib/domain/PriceComp.h @@ -10,6 +10,7 @@ struct PriceComp { constexpr PriceComp(const PriceComp &other) = default; constexpr bool operator()(const Price &lhs, const Price &rhs); + constexpr bool operator()(double lhs, double rhs); private: Side _side = Side::Buy; @@ -25,4 +26,8 @@ constexpr bool PriceComp::operator()(const Price &lhs, const Price &rhs) { return lhs.is_better(_side, rhs); } +constexpr bool PriceComp::operator()(double lhs, double rhs) { + return Price::is_better(_side, lhs, rhs); +} + } // namespace bts::domain From f9db93e41afc876d83680aae16dbaa365c1c7f91 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 18:16:22 -0500 Subject: [PATCH 058/100] Add simple HTTPClient The binance depth stream must be bootstrapped with a depth snapshot, which is retrieved via an HTTP GET request --- src/lib/api/io/URL.proto | 15 +++ src/lib/collections/FlatUnorderedMap.h | 159 +++++++++++++++++++++++++ src/lib/io/QueryParams.cpp | 16 +++ src/lib/io/QueryParams.h | 13 ++ src/lib/io/URL.cpp | 153 ++++++++++++++++++++++++ src/lib/io/URL.h | 96 +++++++++++++++ src/lib/io/http/CurlHandle.cpp | 21 ++++ src/lib/io/http/CurlHandle.h | 21 ++++ src/lib/io/http/HTTPClient.cpp | 55 +++++++++ src/lib/io/http/HTTPClient.h | 35 ++++++ src/lib/io/http/HTTPHeaders.cpp | 46 +++++++ src/lib/io/http/HTTPHeaders.h | 23 ++++ src/lib/io/http/HTTPRequest.cpp | 17 +++ src/lib/io/http/HTTPRequest.h | 26 ++++ src/lib/io/http/HTTPResponse.cpp | 25 ++++ src/lib/io/http/HTTPResponse.h | 33 +++++ src/lib/utils/StringSplitter.h | 81 +++++++++++++ 17 files changed, 835 insertions(+) create mode 100644 src/lib/api/io/URL.proto create mode 100644 src/lib/collections/FlatUnorderedMap.h create mode 100644 src/lib/io/QueryParams.cpp create mode 100644 src/lib/io/QueryParams.h create mode 100644 src/lib/io/URL.cpp create mode 100644 src/lib/io/URL.h create mode 100644 src/lib/io/http/CurlHandle.cpp create mode 100644 src/lib/io/http/CurlHandle.h create mode 100644 src/lib/io/http/HTTPClient.cpp create mode 100644 src/lib/io/http/HTTPClient.h create mode 100644 src/lib/io/http/HTTPHeaders.cpp create mode 100644 src/lib/io/http/HTTPHeaders.h create mode 100644 src/lib/io/http/HTTPRequest.cpp create mode 100644 src/lib/io/http/HTTPRequest.h create mode 100644 src/lib/io/http/HTTPResponse.cpp create mode 100644 src/lib/io/http/HTTPResponse.h create mode 100644 src/lib/utils/StringSplitter.h diff --git a/src/lib/api/io/URL.proto b/src/lib/api/io/URL.proto new file mode 100644 index 000000000..61913fae7 --- /dev/null +++ b/src/lib/api/io/URL.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package bts.api.io; + +message QueryParam { + string key = 1; + string value = 2; +} + +message URL { + string protocol = 1; + string host = 2; + uint32 port = 3; + string path = 4; + repeated QueryParam query_params = 5; +} diff --git a/src/lib/collections/FlatUnorderedMap.h b/src/lib/collections/FlatUnorderedMap.h new file mode 100644 index 000000000..a4be47c1a --- /dev/null +++ b/src/lib/collections/FlatUnorderedMap.h @@ -0,0 +1,159 @@ +#pragma once +#include +#include +#include +#include +#include + +namespace bts::collections { + +template +class FlatUnorderedMap { + public: + using Container = std::vector>; + using Iterator = Container::iterator; + using ConstIterator = Container::const_iterator; + using ReverseIterator = Container::reverse_iterator; + using ConstReverseIterator = Container::const_reverse_iterator; + + Value *get(const Key &key); + const Value *get(const Key &key) const; + + template + std::pair try_emplace(const Key &key, Args... args); + + Iterator begin(); + ConstIterator begin() const; + + ReverseIterator rbegin(); + ConstReverseIterator rbegin() const; + + Iterator end(); + ConstIterator end() const; + + ReverseIterator rend(); + ConstReverseIterator rend() const; + + bool empty() const; + + std::size_t size() const; + + Value &operator[](const Key &key); + + private: + std::vector> items_; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +Value *FlatUnorderedMap::get(const Key &key) { + for (auto &qp : items_) { + if (qp.first == key) { + return &qp.second; + } + } + return nullptr; +} + +template +const Value *FlatUnorderedMap::get(const Key &key) const { + for (auto &qp : items_) { + if (qp.first == key) { + return &qp.second; + } + } + return nullptr; +} + +// template +// std::pair::Iterator, bool> +// FlatUnorderedMap::try_emplace(const Key &key) { +// for (auto it = items_.begin(); it != items_.end(); it++) { +// if (it->first == key) { +// return {it, false}; +// } +// } +// return items_.emplace_back(key); +// } + +template +template +std::pair::Iterator, bool> +FlatUnorderedMap::try_emplace(const Key &key, Args... args) { + for (auto it = items_.begin(); it != items_.end(); it++) { + if (it->first == key) { + return {it, false}; + } + } + Value v(args...); + items_.emplace_back(key, std::move(v)); + return {items_.end() - 1, true}; +} + +template +typename FlatUnorderedMap::Iterator +FlatUnorderedMap::begin() { + return items_.begin(); +} + +template +typename FlatUnorderedMap::ConstIterator +FlatUnorderedMap::begin() const { + return items_.begin(); +} + +template +typename FlatUnorderedMap::ReverseIterator +FlatUnorderedMap::rbegin() { + return items_.rbegin(); +} + +template +typename FlatUnorderedMap::ConstReverseIterator +FlatUnorderedMap::rbegin() const { + return items_.rbegin(); +} + +template +typename FlatUnorderedMap::Iterator +FlatUnorderedMap::end() { + return items_.end(); +} + +template +typename FlatUnorderedMap::ConstIterator +FlatUnorderedMap::end() const { + return items_.end(); +} + +template +typename FlatUnorderedMap::ReverseIterator +FlatUnorderedMap::rend() { + return items_.rend(); +} + +template +typename FlatUnorderedMap::ConstReverseIterator +FlatUnorderedMap::rend() const { + return items_.rend(); +} + +template +bool FlatUnorderedMap::empty() const { + return items_.empty(); +} + +template +std::size_t FlatUnorderedMap::size() const { + return items_.size(); +} + +template +Value &FlatUnorderedMap::operator[](const Key &key) { + return try_emplace(key).first->second; +} + +} // namespace bts::collections diff --git a/src/lib/io/QueryParams.cpp b/src/lib/io/QueryParams.cpp new file mode 100644 index 000000000..a547c7609 --- /dev/null +++ b/src/lib/io/QueryParams.cpp @@ -0,0 +1,16 @@ +#include "QueryParams.h" +#include +#include + +namespace bts::io { + +std::string QueryParams::to_string() const { + std::string rv; + auto query_param_strs = ranges::transform_view( + *this, [](const auto &qp) { return qp.first + "=" + qp.second; }); + rv.append(fmt::format( + "{}", fmt::join(query_param_strs.begin(), query_param_strs.end(), "&"))); + return rv; +} + +} // namespace bts::io diff --git a/src/lib/io/QueryParams.h b/src/lib/io/QueryParams.h new file mode 100644 index 000000000..78f01310f --- /dev/null +++ b/src/lib/io/QueryParams.h @@ -0,0 +1,13 @@ +#pragma once +#include "lib/collections/FlatUnorderedMap.h" +#include + +namespace bts::io { + +class QueryParams + : public collections::FlatUnorderedMap { + public: + std::string to_string() const; +}; + +} // namespace bts::io diff --git a/src/lib/io/URL.cpp b/src/lib/io/URL.cpp new file mode 100644 index 000000000..6b8660d6a --- /dev/null +++ b/src/lib/io/URL.cpp @@ -0,0 +1,153 @@ +#include "URL.h" +#include "lib/api/io/URL.pb.h" +#include +#include +#include +#include +#include + +namespace bts::io { + +// URL:: URL(const api::io::URL &url) : protocol_(url.protocol()), +// host_(url.host()), port_(url.port()), path_(url.path()) {} +URL::URL(const bts::api::io::URL &url) + : protocol_(url.protocol()), host_(url.host()), port_(url.port()), + path_(url.path()) { + for (const auto &qp : url.query_params()) { + query_params_[qp.key()] = qp.value(); + } +} + +std::vector> URL::well_known_ports_() { + return std::vector>{ + {"http", 80}, {"https", 443}, {"ws", 80}, + {"wss", 443}, {"ssh", 22}, {"sftp", 22}, + }; +} + +std::uint16_t URL::get_known_port_for_protocol(const std::string &protocol) { + auto wkps = well_known_ports_(); + for (const auto &p : wkps) { + if (p.first == protocol) { + return p.second; + } + } + return 0; +} + +std::string URL::get_known_protocol_for_port(std::uint16_t port) { + auto wkps = well_known_ports_(); + for (const auto &p : wkps) { + if (p.second == port) { + return p.first; + } + } + return ""; +} + +std::string &URL::protocol() { return protocol_; } +const std::string &URL::protocol() const { return protocol_; } + +std::string &URL::host() { return host_; } +const std::string &URL::host() const { return host_; } + +std::uint16_t &URL::port() { return port_; } +std::uint16_t URL::port() const { return port_; } + +std::string &URL::path() { return path_; } +const std::string &URL::path() const { return path_; } + +QueryParams &URL::query_params() { return query_params_; } + +const QueryParams &URL::query_params() const { return query_params_; } + +std::string URL::to_string() const { + auto rv = protocol() + "://"; + if (host().empty()) { + rv.append("localhost"); + } else { + rv.append(host()); + } + if (port_ != 0) { + rv.append(":" + std::to_string(port_)); + } + if (!path_.empty()) { + rv.append("/" + path_); + } + if (!query_params_.empty()) { + rv.append("?"); + auto query_param_strs = + ranges::transform_view(query_params_, [](const auto &qp) { + return qp.first + "=" + qp.second; + }); + rv.append(fmt::format( + "{}", + fmt::join(query_param_strs.begin(), query_param_strs.end(), "&"))); + } + return rv; +} + +std::ostream &operator<<(std::ostream &out, const URL &url) noexcept { + out << url.to_string(); + return out; +} + +void URL::fill_protocol(const std::string &protocol) { + if (protocol_.empty()) { + protocol_ = protocol; + } +} + +void URL::fill_host(const std::string &host) { + if (host_.empty()) { + host_ = host; + } +} + +void URL::fill_port(std::uint16_t port) { + if (port_ == 0) { + port_ = port; + } +} + +void URL::fill_path(const std::string &path) { + if (path_.empty()) { + path_ = path; + } +} + +void URL::fill_query_params( + const QueryParams &query_params, bool add_missing_params) { + if (query_params_.empty()) { + query_params_ = query_params; + } else if (add_missing_params) { + for (const auto &[k, v] : query_params) { + query_params_.try_emplace(k, v); + } + } +} + +void URL::fill_with(const URL &url) { + fill_path(url.path()); + fill_host(url.host()); + fill_protocol(url.protocol()); + fill_port(url.port()); + fill_query_params(url.query_params()); +} + +bool operator==(const URL &lhs, const URL &rhs) noexcept { + bool rv = lhs.protocol() == rhs.protocol() && lhs.host() == rhs.host() && + lhs.path() == rhs.path() && lhs.port() == rhs.port(); + if (rv) { + rv = std::equal( + lhs.query_params().begin(), lhs.query_params().end(), + rhs.query_params().begin(), rhs.query_params().end()); + } + return rv; +} + +bool operator!=(const URL &lhs, const URL &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace bts::io diff --git a/src/lib/io/URL.h b/src/lib/io/URL.h new file mode 100644 index 000000000..56f4f199a --- /dev/null +++ b/src/lib/io/URL.h @@ -0,0 +1,96 @@ +#pragma once +#include "QueryParams.h" +#include "lib/core/HashPhaser.h" +#include +#include +#include +#include +#include +#include + +namespace bts::api::io { +class URL; +} + +namespace bts::io { + +class URL { + public: + URL() = default; + explicit URL(const bts::api::io::URL &url); + + URL(const URL &) = default; + URL(URL &&) noexcept = default; + URL &operator=(const URL &) = default; + URL &operator=(URL &&) noexcept = default; + + std::string &protocol(); + const std::string &protocol() const; + + std::string &host(); + const std::string &host() const; + + std::uint16_t &port(); + std::uint16_t port() const; + + std::string &path(); + const std::string &path() const; + + QueryParams &query_params(); + const QueryParams &query_params() const; + + std::string to_string() const; + + void fill_protocol(const std::string &protocol); + void fill_host(const std::string &host); + void fill_path(const std::string &path); + void fill_port(std::uint16_t port); + void fill_query_params( + const QueryParams &query_params, bool add_missing_params = false); + void fill_with(const URL &url); + + static std::uint16_t get_known_port_for_protocol( + const std::string &protocol); + static std::string get_known_protocol_for_port(std::uint16_t port); + + private: + std::string protocol_; + std::string host_; + std::uint16_t port_; + std::string path_; + QueryParams query_params_; + + static std::vector> + well_known_ports_(); +}; + +bool operator==(const URL &lhs, const URL &rhs) noexcept; +bool operator!=(const URL &lhs, const URL &rhs) noexcept; + +std::ostream &operator<<(std::ostream &out, const URL &url) noexcept; + +} // namespace bts::io + +namespace std { + +template <> +struct hash { + std::size_t operator()(const bts::io::URL &url) const; +}; + +} // namespace std + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +namespace std { + +inline std::size_t hash::operator()( + const bts::io::URL &url) const { + return bts::core::HashPhaser::auto_phase( + url.protocol(), url.host(), url.port(), url.path(), + url.query_params().size()); +} + +} // namespace std diff --git a/src/lib/io/http/CurlHandle.cpp b/src/lib/io/http/CurlHandle.cpp new file mode 100644 index 000000000..79db4d9ec --- /dev/null +++ b/src/lib/io/http/CurlHandle.cpp @@ -0,0 +1,21 @@ +#include "CurlHandle.h" +#include +#include + +namespace bts::http { + +CurlHandle::CurlHandle() { + const auto eCode = curl_global_init(CURL_GLOBAL_ALL); + if (eCode != CURLE_OK) { + throw std::runtime_error{"Error initializing libCURL"}; + } +} + +CurlHandle::~CurlHandle() { curl_global_cleanup(); } + +CurlHandle &CurlHandle::instance() { + static CurlHandle inst{}; + return inst; +} + +} // namespace bts::http diff --git a/src/lib/io/http/CurlHandle.h b/src/lib/io/http/CurlHandle.h new file mode 100644 index 000000000..eaef53d54 --- /dev/null +++ b/src/lib/io/http/CurlHandle.h @@ -0,0 +1,21 @@ +#pragma once + +namespace bts::http { + +class CurlHandle { + public: + static CurlHandle &instance(); + + CurlHandle(CurlHandle const &) = delete; + CurlHandle(CurlHandle &&) = delete; + + CurlHandle &operator=(CurlHandle const &) = delete; + CurlHandle &operator=(CurlHandle &&) = delete; + + ~CurlHandle(); + + private: + CurlHandle(); +}; + +} // namespace bts::http diff --git a/src/lib/io/http/HTTPClient.cpp b/src/lib/io/http/HTTPClient.cpp new file mode 100644 index 000000000..428928cf5 --- /dev/null +++ b/src/lib/io/http/HTTPClient.cpp @@ -0,0 +1,55 @@ +#include "HTTPClient.h" +#include "HTTPRequest.h" +#include "HTTPResponse.h" +#include "lib/io/URL.h" +#include "lib/logging/logging.h" +#include +#include + +namespace bts::io::http { + +static size_t write_data_( + void *ptr, size_t size, size_t nmemb, std::string *data) { + data->append((char *)ptr, size * nmemb); + return size * nmemb; +} + +HTTPResponse HTTPClient::get(const HTTPRequest &request) { + auto *curl = curl_easy_init(); + auto url_str = request.url().to_string(); + // LOG(md, bts::Info, "do GET: {}", url_str); + curl_easy_setopt(curl, CURLOPT_URL, url_str.c_str()); + + struct curl_slist *request_headers = NULL; + for (const auto &[k, v] : request.headers()) { + request_headers = curl_slist_append( + request_headers, fmt::format("{}: {}", k, v).c_str()); + } + + std::string response_string; + std::string header_string; + std::string response_header_string; + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data_); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response_string); + curl_easy_setopt(curl, CURLOPT_HEADERDATA, &header_string); + + char *url; + long response_code; + double elapsed; + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); + curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &elapsed); + curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); + // curl_easy_getinfo(curl, CURLINFO_HEADER_OUT, &response_header_string); + + curl_easy_perform(curl); + curl_easy_cleanup(curl); + curl = NULL; + HTTPResponse response; + response.headers() = HTTPHeaders(response_header_string); + response.body() = std::move(response_string); + response.code() = response_code; + // LOG(md, bts::Info, "do GET: {}. Received response:\n{}", url_str, response); + return response; +} + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPClient.h b/src/lib/io/http/HTTPClient.h new file mode 100644 index 000000000..c8eba9272 --- /dev/null +++ b/src/lib/io/http/HTTPClient.h @@ -0,0 +1,35 @@ +#include +#include +#include // std::size_t +#include // snprintf +#include +#include // strerror, strlen, memcpy, strcpy +#include +#include +#include +#include +#include +#include // std::unique_ptr +#include +#include +#include // va_start, etc. +#include +#include +#include +#include +#include +#include +#include + +namespace bts::io::http { + +class HTTPRequest; +class HTTPResponse; + +class HTTPClient { + public: + // HTTPClient(const std::string &url); + HTTPResponse get(const HTTPRequest &request); +}; + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPHeaders.cpp b/src/lib/io/http/HTTPHeaders.cpp new file mode 100644 index 000000000..9bffd8418 --- /dev/null +++ b/src/lib/io/http/HTTPHeaders.cpp @@ -0,0 +1,46 @@ +#include "HTTPHeaders.h" +#include "lib/utils/StringSplitter.h" +#include +#include +#include +#include +#include + +namespace bts::io::http { + +HTTPHeaders::HTTPHeaders(const std::string &str) { + auto item_strs = utils::StringSplitter::split(str, "\n"); + auto items = ranges::transform_view( + item_strs, + [](const std::string &item_str) -> std::pair { + auto kv = utils::StringSplitter::split(item_str, ":"); + if (kv.empty()) { + return std::make_pair("", ""); + } + if (kv.size() == 1) { + return std::make_pair(kv[0], std::string("")); + } + return std::make_pair(kv[0], kv[1]); + }); + for (auto p : items) { + try_emplace(p.first, p.second); + } +} + +std::string HTTPHeaders::to_string() const { + std::string rv; + auto query_param_strs = ranges::transform_view( + *this, [](const auto &qp) { return qp.first + ": " + qp.second; }); + rv.append(fmt::format( + "{}", + fmt::join(query_param_strs.begin(), query_param_strs.end(), "\n"))); + return rv; +} + +std::ostream &operator<<( + std::ostream &out, const HTTPHeaders &headers) noexcept { + out << headers.to_string(); + return out; +} + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPHeaders.h b/src/lib/io/http/HTTPHeaders.h new file mode 100644 index 000000000..3c5dfe7a4 --- /dev/null +++ b/src/lib/io/http/HTTPHeaders.h @@ -0,0 +1,23 @@ +#pragma once +#include "lib/collections/FlatUnorderedMap.h" + +namespace bts::io::http { + +class HTTPHeaders + : public collections::FlatUnorderedMap { + public: + HTTPHeaders() = default; + explicit HTTPHeaders(const std::string &header_str); + + HTTPHeaders(const HTTPHeaders &) noexcept = default; + HTTPHeaders(HTTPHeaders &&) noexcept = default; + HTTPHeaders &operator=(const HTTPHeaders &) noexcept = default; + HTTPHeaders &operator=(HTTPHeaders &&) noexcept = default; + + std::string to_string() const; +}; + +std::ostream &operator<<( + std::ostream &out, const HTTPHeaders &headers) noexcept; + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPRequest.cpp b/src/lib/io/http/HTTPRequest.cpp new file mode 100644 index 000000000..70f953900 --- /dev/null +++ b/src/lib/io/http/HTTPRequest.cpp @@ -0,0 +1,17 @@ +#include "HTTPRequest.h" + +namespace bts::io::http { + +io::URL &HTTPRequest::url() { return url_; } + +const io::URL &HTTPRequest::url() const { return url_; } + +HTTPHeaders &HTTPRequest::headers() { return headers_; } + +const HTTPHeaders &HTTPRequest::headers() const { return headers_; } + +std::string &HTTPRequest::body() { return body_; } + +const std::string &HTTPRequest::body() const { return body_; } + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPRequest.h b/src/lib/io/http/HTTPRequest.h new file mode 100644 index 000000000..bee527a19 --- /dev/null +++ b/src/lib/io/http/HTTPRequest.h @@ -0,0 +1,26 @@ +#pragma once +#include "HTTPHeaders.h" +#include "lib/io/URL.h" +#include +#include + +namespace bts::io::http { + +class HTTPRequest { + public: + io::URL &url(); + const io::URL &url() const; + + HTTPHeaders &headers(); + const HTTPHeaders &headers() const; + + std::string &body(); + const std::string &body() const; + + private: + io::URL url_; + HTTPHeaders headers_; + std::string body_; +}; + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPResponse.cpp b/src/lib/io/http/HTTPResponse.cpp new file mode 100644 index 000000000..cc7c14c91 --- /dev/null +++ b/src/lib/io/http/HTTPResponse.cpp @@ -0,0 +1,25 @@ +#include "HTTPResponse.h" +#include + +namespace bts::io::http { + +HTTPHeaders &HTTPResponse::headers() { return headers_; } + +const HTTPHeaders &HTTPResponse::headers() const { return headers_; } + +std::string &HTTPResponse::body() { return body_; } + +const std::string &HTTPResponse::body() const { return body_; } + +std::int64_t &HTTPResponse::code() { return code_; } + +std::int64_t HTTPResponse::code() const { return code_; } + +std::ostream &operator<<( + std::ostream &out, const HTTPResponse &response) noexcept { + out << response.headers() << "\n" + << response.body() << "\nCode: " << response.code(); + return out; +} + +} // namespace bts::io::http diff --git a/src/lib/io/http/HTTPResponse.h b/src/lib/io/http/HTTPResponse.h new file mode 100644 index 000000000..c22ce2c8f --- /dev/null +++ b/src/lib/io/http/HTTPResponse.h @@ -0,0 +1,33 @@ +#pragma once +#include "HTTPHeaders.h" +#include "lib/io/URL.h" +#include +#include + +namespace bts::io::http { + +class HTTPResponse { + public: + io::URL &url(); + const io::URL &url() const; + + HTTPHeaders &headers(); + const HTTPHeaders &headers() const; + + std::string &body(); + const std::string &body() const; + + std::int64_t &code(); + std::int64_t code() const; + + private: + io::URL url_; + HTTPHeaders headers_; + std::string body_; + std::int64_t code_; +}; + +std::ostream &operator<<( + std::ostream &out, const HTTPResponse &response) noexcept; + +} // namespace bts::io::http diff --git a/src/lib/utils/StringSplitter.h b/src/lib/utils/StringSplitter.h new file mode 100644 index 000000000..bc1750723 --- /dev/null +++ b/src/lib/utils/StringSplitter.h @@ -0,0 +1,81 @@ +#pragma once +#include +#include +#include +#include + +namespace bts::utils { + +class StringSplitter { + public: + template + static std::vector split( + Range range, const std::string &delimiter); + + template + static std::vector split( + Iterator first, Iterator last, const std::string &delimiter); + + template + static void split( + Iterator first, + Iterator last, + const std::string &delimiter, + std::vector &parts); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +std::vector StringSplitter::split( + Range range, const std::string &delimiter) { + std::vector parts; + split(range.begin(), range.end(), delimiter, parts); + return parts; +} + +template +std::vector StringSplitter::split( + Iterator first, Iterator last, const std::string &delimiter) { + std::vector parts; + split(first, last, delimiter, parts); + return parts; +} + +template +void StringSplitter::split( + Iterator first, + Iterator last, + const std::string &delimiter, + std::vector &parts) { + + auto cursor = first; + auto curr_end = first; + auto curr_start = first; + + auto find_delim = [&cursor, &delimiter, &last]() { + for (auto it = cursor; it != last; it++) { + if (*it == delimiter[0]) { + if (std::equal( + it + 1, it + delimiter.size(), delimiter.begin() + 1, + delimiter.end())) { + return it; + } + } + } + return last; + }; + + while ((curr_end = find_delim()) != last) { + parts.push_back(std::string(curr_start, curr_end)); + curr_start = curr_end + delimiter.size(); + cursor = curr_end + delimiter.size(); + } + if (cursor != last) { + parts.push_back(std::string(cursor, last)); + } +} + +} // namespace bts::utils From 41714fe3f2fe8972b6893a458f39ad2534b07e1d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Oct 2021 19:33:54 -0400 Subject: [PATCH 059/100] Stop tracking .vscode --- .gitignore | 1 - .vscode/c_cpp_properties.json | 137 --------- .vscode/launch.json | 513 ---------------------------------- .vscode/settings.json | 18 -- .vscode/tasks.json | 93 ------ src/.vscode/settings.json | 17 -- 6 files changed, 779 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json delete mode 100644 src/.vscode/settings.json diff --git a/.gitignore b/.gitignore index a2c1e8c74..e0efacbda 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ cmake-build-debug/ .dir-locals.el *.pyc *.vscode/* -!.vscode/*.json .vs obj/ *.csproj.user diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index 58191fe38..000000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux (clang)", - "includePath": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}/src", - "${workspaceRoot}/src/server/sparkd/cmds/spartan", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/build/clang/debug/src" - ], - "defines": [], - "intelliSenseMode": "clang-x64", - "browse": { - "path": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}/src", - "${workspaceRoot}/src/server/sparkd/cmds/spartan", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/build/clang/debug/src" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "cStandard": "c11", - "cppStandard": "c++17", - "compileCommands": "${workspaceFolder}/build/clang/debug/compile_commands.json" - }, - { - "name": "Linux (gcc)", - "includePath": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}/src", - "${workspaceRoot}/src/server/sparkd/cmds/spartan", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/build/gcc/debug/src" - ], - "defines": [], - "intelliSenseMode": "clang-x64", - "browse": { - "path": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}/src", - "${workspaceRoot}/src/server/sparkd/cmds/spartan", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/build/gcc/debug/src" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "cStandard": "c11", - "cppStandard": "c++17", - "compileCommands": "${workspaceFolder}/build/gcc/debug/compile_commands.json" - }, - { - "name": "Windows", - "intelliSenseMode": "clang-x64", - "includePath": [ - "${workspaceRoot}/src", - "${workspaceRoot}/build/src", - "${workspaceRoot}/build/ninja_debug/src", - "${workspaceRoot}/externals/windows/include", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", - "${workspaceRoot}/externals/windows/vscode/usr/local/include", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", - "${workspaceRoot}/externals/windows/vscode/usr/include" - ], - "defines": [ - "__linux__", - "__x86_64__" - ], - "browse": { - "path": [ - "${workspaceRoot}/src", - "${workspaceRoot}/build/src", - "${workspaceRoot}/build/ninja_debug/src", - "${workspaceRoot}/externals/windows/include", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", - "${workspaceRoot}/externals/windows/vscode/usr/local/include", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", - "${workspaceRoot}/externals/windows/vscode/usr/include/*" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "cStandard": "c11", - "cppStandard": "c++17" - }, - { - "name": "WindowsQuick", - "intelliSenseMode": "clang-x64", - "includePath": [ - "${workspaceRoot}/src", - "${workspaceRoot}/build/src", - "${workspaceRoot}/build/gcc/debug/src", - "${workspaceRoot}/externals/windows/include", - "${workspaceRoot}/externals/linux/include", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", - "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", - "${workspaceRoot}/externals/windows/vscode/usr/local/include", - "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", - "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", - "${workspaceRoot}/externals/windows/vscode/usr/include" - ], - "defines": [ - "__linux__", - "__x86_64__" - ], - "browse": { - "path": [ - "${workspaceRoot}/src" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db" - }, - "cStandard": "c11", - "cppStandard": "c++17" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index c61bb1e8a..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,513 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Spark Local", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceRoot}/build/gcc/debug/server/sparkd", - "args": [ - "run", - "test", - "-a", - "OutrightVanillaOrder" - ], - "stopAtEntry": false, - "cwd": "${workspaceRoot}/build/gcc/debug/server/", - "environment": [ - { - "name": "TZ", - "value": "America/Chicago" - } - ], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, - { - "name": "SparkVM Launch", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "-a", - "[ilink3]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - }, - { - "description": "Skip STL", - "text": "skip -gfi /usr/include/c++/7/bits/*.h", - "ignoreFailures": true - }, - { - "description": "LD LIBRARY", - "text": "set env LD_LIBRARY_PATH=.", - "ignoreFailures": false - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "(gdb) Launch", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceRoot}/build/gcc/debug/server/sparkd/sparkd", - "args": [ - "run" - ], - "stopAtEntry": false, - "cwd": "${workspaceRoot}/build/gcc/debug/src/server/sparkd", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, - { - "name": "Client Launch", - "type": "clr", - "request": "launch", - "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe", - "args": [], - "cwd": "${workspaceRoot}", - "stopAtEntry": false, - "externalConsole": true, - "requireExactSource": false - }, - { - "name": "SDK Launch", - "type": "clr", - "request": "launch", - "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe", - "args": [ - "md", - "GLBX", - "Future", - "CL", - "CLZ9", - "--user=bts", - "--pass=" - ], - "cwd": "${workspaceRoot}", - "stopAtEntry": false, - "externalConsole": true, - "requireExactSource": false - }, - { - "name": "Excel Launch", - "type": "clr", - "request": "launch", - "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE", - "args": [ - "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll" - ], - "cwd": "${workspaceRoot}", - "stopAtEntry": false, - "externalConsole": true, - "requireExactSource": false - }, - { - "name": "Client Tests", - "type": "clr", - "request": "launch", - "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe", - "args": [ - "test", - "ApiUpdateTests" - ], - "cwd": "${workspaceRoot}", - "stopAtEntry": false, - "externalConsole": true, - "requireExactSource": false - }, - { - "name": "Client Attach", - "type": "clr", - "request": "attach", - "processId": "${command:pickProcess}" - }, - { - "name": "Spreader Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "[spreader]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "MD Synthetic Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "[md][synthetic]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Spartan Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "[spartan_md]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Matcher Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "[matcher]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Admin Service Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", - "args": [ - "test", - "[admin_service]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Limiter Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", - "args": [ - "test", - "[limiter]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "MD Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/gcc/debug/server/sparkd", - "args": [ - "test", - "[algo]" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - }, - { - "description": "Skip STL", - "text": "skip -gfi /usr/include/c++/7/bits/*.h", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "SparkVM attach", - "type": "cppdbg", - "request": "attach", - "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", - "processId": "${command:pickRemoteProcess}", - "MIMode": "gdb", - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Python", - "type": "python", - "request": "launch", - "stopOnEntry": false, - "python": "${command:python.interpreterPath}", - "program": "${file}", - "cwd": "${workspaceRoot}", - "env": {}, - "envFile": "${workspaceRoot}/.env", - "args": [ - "DEBUG" - ], - "debugOptions": [ - "WaitOnAbnormalExit", - "WaitOnNormalExit", - "RedirectOutput" - ] - }, - { - "name": ".NET Core Remote Attach", - "type": "coreclr", - "request": "attach", - "processId": "${command:pickRemoteProcess}", - "pipeTransport": { - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/home/bts/vsdbg/vsdbg", - "pipeCwd": "${workspaceRoot}", - "quoteArgs": true - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - }, - "justMyCode": true - }, - { - "name": ".NET Core Remote Launch", - "type": "coreclr", - "request": "launch", - "program": "/usr/bin/dotnet", - "args": [ - "sparkcmd.dll", - "test", - "test_join_create_and_takeout_market" - ], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/gcc/debug/server", - "pipeTransport": { - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": [ - "bts@sparkvm" - ], - "debuggerPath": "/home/bts/vsdbg/vsdbg", - "pipeCwd": "${workspaceRoot}", - "quoteArgs": true - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - }, - "justMyCode": false - }, - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3e3a76083..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "files.associations": { - "utility": "cpp", - "initializer_list": "cpp", - "list": "cpp", - "type_traits": "cpp", - "vector": "cpp", - "xhash": "cpp", - "xstring": "cpp", - "system_error": "cpp", - "array": "cpp", - "string_view": "cpp", - "xutility": "cpp", - "*.ipp": "cpp", - "tuple": "cpp" - }, - "cmake.configureOnOpen": false -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index fd8201579..000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "client_build", - "type": "shell", - "command": ".\\tools\\buildspark.cmd", - "problemMatcher": "$msCompile", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared" - }, - "group": "build" - }, - { - "label": "server_build", - "type": "shell", - "command": ".\\tools\\buildsparkd.cmd", - "problemMatcher": { - "base": "$gcc", - "owner": "cpp", - "fileLocation": [ - "relative", - "${workspaceFolder}" - ], - "pattern": { - "regexp": "(.?)(home)(.?)(bts)(.?)(spark)(.?)(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)", - "file": 8, - "line": 9, - "column": 10, - "severity": 11, - "message": 12 - } - }, - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "new" - }, - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "linux_build", - "type": "shell", - "command": "docker exec -i ${USER}s_docker bash -c \"cd build/${input:compiler}/${input:build_configuration} && ninja\"", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [ - "$gcc" - ], - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "dedicated", - "showReuseMessage": true, - "clear": false - } - } - ], - "inputs": [ - { - "id": "build_configuration", - "type": "pickString", - "default": "debug", - "description": "Configuration:", - "options": [ - "debug", - "release" - ] - }, - { - "id": "compiler", - "type": "pickString", - "default": "gcc", - "description": "Compiler", - "options": [ - "clang", - "gcc" - ] - } - ] -} diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json deleted file mode 100644 index fd58dbf23..000000000 --- a/src/.vscode/settings.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "files.associations": { - "chrono": "cpp", - "future": "cpp", - "system_error": "cpp", - "ios": "cpp", - "utility": "cpp", - "iosfwd": "cpp", - "xhash": "cpp", - "xstring": "cpp", - "xtree": "cpp", - "xutility": "cpp", - "exception": "cpp", - "bitset": "cpp", - "xlocale": "cpp" - } -} \ No newline at end of file From 48862f2b8dbf8fa04698b457f0a0d15bacb297df Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Oct 2021 19:42:58 -0400 Subject: [PATCH 060/100] refactor: Rename 'communication' dir 'io' --- .../websockets => io/websocket}/IWebsocketListener.h | 0 .../websockets => io/websocket}/WebsocketClient.cpp | 0 .../{communincation/websockets => io/websocket}/WebsocketClient.h | 0 .../websockets => io/websocket}/WebsocketClientConfiguration.h | 0 .../{communincation/websockets => io/websocket}/WebsocketError.h | 0 .../websockets => io/websocket}/WebsocketMessage.h | 0 .../websockets => io/websocket}/tests/WebsocketClientTests.cpp | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename src/lib/{communincation/websockets => io/websocket}/IWebsocketListener.h (100%) rename src/lib/{communincation/websockets => io/websocket}/WebsocketClient.cpp (100%) rename src/lib/{communincation/websockets => io/websocket}/WebsocketClient.h (100%) rename src/lib/{communincation/websockets => io/websocket}/WebsocketClientConfiguration.h (100%) rename src/lib/{communincation/websockets => io/websocket}/WebsocketError.h (100%) rename src/lib/{communincation/websockets => io/websocket}/WebsocketMessage.h (100%) rename src/lib/{communincation/websockets => io/websocket}/tests/WebsocketClientTests.cpp (100%) diff --git a/src/lib/communincation/websockets/IWebsocketListener.h b/src/lib/io/websocket/IWebsocketListener.h similarity index 100% rename from src/lib/communincation/websockets/IWebsocketListener.h rename to src/lib/io/websocket/IWebsocketListener.h diff --git a/src/lib/communincation/websockets/WebsocketClient.cpp b/src/lib/io/websocket/WebsocketClient.cpp similarity index 100% rename from src/lib/communincation/websockets/WebsocketClient.cpp rename to src/lib/io/websocket/WebsocketClient.cpp diff --git a/src/lib/communincation/websockets/WebsocketClient.h b/src/lib/io/websocket/WebsocketClient.h similarity index 100% rename from src/lib/communincation/websockets/WebsocketClient.h rename to src/lib/io/websocket/WebsocketClient.h diff --git a/src/lib/communincation/websockets/WebsocketClientConfiguration.h b/src/lib/io/websocket/WebsocketClientConfiguration.h similarity index 100% rename from src/lib/communincation/websockets/WebsocketClientConfiguration.h rename to src/lib/io/websocket/WebsocketClientConfiguration.h diff --git a/src/lib/communincation/websockets/WebsocketError.h b/src/lib/io/websocket/WebsocketError.h similarity index 100% rename from src/lib/communincation/websockets/WebsocketError.h rename to src/lib/io/websocket/WebsocketError.h diff --git a/src/lib/communincation/websockets/WebsocketMessage.h b/src/lib/io/websocket/WebsocketMessage.h similarity index 100% rename from src/lib/communincation/websockets/WebsocketMessage.h rename to src/lib/io/websocket/WebsocketMessage.h diff --git a/src/lib/communincation/websockets/tests/WebsocketClientTests.cpp b/src/lib/io/websocket/tests/WebsocketClientTests.cpp similarity index 100% rename from src/lib/communincation/websockets/tests/WebsocketClientTests.cpp rename to src/lib/io/websocket/tests/WebsocketClientTests.cpp From b35c43b55c0edfa2092d7da2d98649fc050270e7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Oct 2021 19:46:54 -0400 Subject: [PATCH 061/100] refactor: Rename communication namespace to match path --- src/lib/io/websocket/IWebsocketListener.h | 4 +-- src/lib/io/websocket/WebsocketClient.cpp | 26 +++++++------- src/lib/io/websocket/WebsocketClient.h | 5 ++- .../websocket/WebsocketClientConfiguration.h | 5 ++- src/lib/io/websocket/WebsocketError.h | 5 ++- src/lib/io/websocket/WebsocketMessage.h | 5 ++- .../websocket/tests/WebsocketClientTests.cpp | 34 +++++++++---------- 7 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/lib/io/websocket/IWebsocketListener.h b/src/lib/io/websocket/IWebsocketListener.h index 28f0b7862..ae527153b 100644 --- a/src/lib/io/websocket/IWebsocketListener.h +++ b/src/lib/io/websocket/IWebsocketListener.h @@ -1,7 +1,7 @@ #pragma once #include -namespace bts::spark::communication { +namespace bts::io::websocket { struct WebsocketError; struct WebsocketMessage; @@ -27,4 +27,4 @@ class IWebsocketListener { virtual void on_connection_closed(bool gracefully) = 0; }; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketClient.cpp b/src/lib/io/websocket/WebsocketClient.cpp index afd6fd1b4..b8186d12a 100644 --- a/src/lib/io/websocket/WebsocketClient.cpp +++ b/src/lib/io/websocket/WebsocketClient.cpp @@ -43,14 +43,14 @@ #include #include -namespace beast = boost::beast; // from -namespace http = beast::http; // from -namespace websocket = beast::websocket; // from -namespace net = boost::asio; // from +namespace beast = boost::beast; // from +namespace http_core = beast::http; // from +namespace websocket_core = beast::websocket; // from +namespace net = boost::asio; // from namespace ssl = boost::asio::ssl; // from -using tcp = boost::asio::ip::tcp; // from +using tcp = boost::asio::ip::tcp; // from -namespace bts::spark::communication { +namespace bts::io::websocket { std::string get_thread_string() { auto core_id = sched_getcpu(); @@ -329,7 +329,7 @@ class WebsocketSSLClientInternal using WSCI = WebsocketSSLClientInternal; const WebsocketClientConfiguration _conf; tcp::resolver _resolver; - websocket::stream> _ws; + websocket_core::stream> _ws; beast::flat_buffer _read_buffer; boost::asio::deadline_timer _timer; IWebsocketListener *_listener; @@ -375,7 +375,7 @@ class WebsocketSSLClientInternal if (!_close_attempted) { _close_attempted = true; _ws.async_close( - websocket::close_code::normal, + websocket_core::close_code::normal, beast::bind_front_handler(&WSCI::_on_close, shared_from_this())); } } @@ -475,13 +475,13 @@ class WebsocketSSLClientInternal // Set suggested timeout settings for the websocket _ws.set_option( - websocket::stream_base::timeout::suggested(beast::role_type::client)); + websocket_core::stream_base::timeout::suggested(beast::role_type::client)); // Set a decorator to change the User-Agent of the handshake - _ws.set_option( - websocket::stream_base::decorator([](websocket::request_type &req) { + _ws.set_option(websocket_core::stream_base::decorator( + [](websocket_core::request_type &req) { req.set( - http::field::user_agent, + http_core::field::user_agent, std::string(BOOST_BEAST_VERSION_STRING) + " websocket-client-async-ssl"); })); @@ -701,4 +701,4 @@ void WebsocketClient::on_connection_closed(bool gracefully) { WebsocketClient::~WebsocketClient() = default; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketClient.h b/src/lib/io/websocket/WebsocketClient.h index 90414c7af..3926ac7ee 100644 --- a/src/lib/io/websocket/WebsocketClient.h +++ b/src/lib/io/websocket/WebsocketClient.h @@ -1,10 +1,9 @@ - #pragma once #include "IWebsocketListener.h" #include #include -namespace bts::spark::communication { +namespace bts::io::websocket { struct WebsocketClientConfiguration; @@ -37,4 +36,4 @@ class WebsocketClient : public IWebsocketListener, virtual ~WebsocketClient(); }; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.h b/src/lib/io/websocket/WebsocketClientConfiguration.h index 4ce912561..55de4235a 100644 --- a/src/lib/io/websocket/WebsocketClientConfiguration.h +++ b/src/lib/io/websocket/WebsocketClientConfiguration.h @@ -1,8 +1,7 @@ - #pragma once #include -namespace bts::spark::communication { +namespace bts::io::websocket { struct WebsocketClientConfiguration { const std::string ip; @@ -14,4 +13,4 @@ struct WebsocketClientConfiguration { const size_t timer_ms; }; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketError.h b/src/lib/io/websocket/WebsocketError.h index 58e0becc4..54451528d 100644 --- a/src/lib/io/websocket/WebsocketError.h +++ b/src/lib/io/websocket/WebsocketError.h @@ -1,8 +1,7 @@ - #pragma once #include -namespace bts::spark::communication { +namespace bts::io::websocket { struct WebsocketError { enum class ErrorType { @@ -16,4 +15,4 @@ struct WebsocketError { std::string message; }; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketMessage.h b/src/lib/io/websocket/WebsocketMessage.h index 93015b1f6..574f20c04 100644 --- a/src/lib/io/websocket/WebsocketMessage.h +++ b/src/lib/io/websocket/WebsocketMessage.h @@ -1,9 +1,8 @@ - #pragma once #include #include -namespace bts::spark::communication { +namespace bts::io::websocket { struct WebsocketMessage { // user controls the message_id. callback for write complete is called @@ -16,4 +15,4 @@ struct WebsocketMessage { } }; -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/tests/WebsocketClientTests.cpp b/src/lib/io/websocket/tests/WebsocketClientTests.cpp index ba0538e03..a0f912666 100644 --- a/src/lib/io/websocket/tests/WebsocketClientTests.cpp +++ b/src/lib/io/websocket/tests/WebsocketClientTests.cpp @@ -1,8 +1,8 @@ -#include "lib/communincation/websockets/IWebsocketListener.h" -#include "lib/communincation/websockets/WebsocketClient.h" -#include "lib/communincation/websockets/WebsocketClientConfiguration.h" -#include "lib/communincation/websockets/WebsocketError.h" -#include "lib/communincation/websockets/WebsocketMessage.h" +#include "lib/io/websocket/IWebsocketListener.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/io/websocket/WebsocketClientConfiguration.h" +#include "lib/io/websocket/WebsocketError.h" +#include "lib/io/websocket/WebsocketMessage.h" #include #include #include @@ -40,14 +40,14 @@ #include #include -namespace beast = boost::beast; // from -namespace http = beast::http; // from -namespace websocket = beast::websocket; // from -namespace net = boost::asio; // from -using tcp = boost::asio::ip::tcp; // from - // using namespace +namespace beast = boost::beast; // from +namespace http = beast::http; // from +namespace websocket_core = beast::websocket; // from +namespace net = boost::asio; // from +using tcp = boost::asio::ip::tcp; // from + // using namespace -namespace bts::spark::communication { +namespace bts::io::websocket { class RandomGenerator { public: @@ -105,11 +105,11 @@ class SyncWebsocketEchoServer { << " remote_endpoint:" << socket.remote_endpoint() << std::endl; print_thread(); - websocket::stream ws{std::move(socket)}; + websocket_core::stream ws{std::move(socket)}; // Set a decorator to change the Server of the handshake - ws.set_option(websocket::stream_base::decorator( - [](websocket::response_type &res) { + ws.set_option(websocket_core::stream_base::decorator( + [](websocket_core::response_type &res) { res.set( http::field::server, std::string(BOOST_BEAST_VERSION_STRING) + @@ -141,7 +141,7 @@ class SyncWebsocketEchoServer { } } catch (beast::system_error const &se) { // This indicates that the session was closed - if (se.code() != websocket::error::closed) { + if (se.code() != websocket_core::error::closed) { std::cerr << "Error: " << se.code().message() << std::endl; } } catch (std::exception const &e) { @@ -356,4 +356,4 @@ TEST_CASE("WebsocketClientTest", "[bin_conn]") { c->start(); } -} // namespace bts::spark::communication \ No newline at end of file +} // namespace bts::io::websocket From 03b475add1a0cdd449e2412134f896bdfef10707 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 20:51:39 -0500 Subject: [PATCH 062/100] fix build: Resolve struct/class fwd decl conflicts --- src/lib/io/websocket/IWebsocketListener.h | 4 ++-- src/lib/io/websocket/WebsocketClient.h | 2 +- src/lib/io/websocket/WebsocketClientConfiguration.h | 3 ++- src/lib/io/websocket/WebsocketError.h | 3 ++- src/lib/io/websocket/WebsocketMessage.h | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/io/websocket/IWebsocketListener.h b/src/lib/io/websocket/IWebsocketListener.h index ae527153b..d71d805fc 100644 --- a/src/lib/io/websocket/IWebsocketListener.h +++ b/src/lib/io/websocket/IWebsocketListener.h @@ -3,8 +3,8 @@ namespace bts::io::websocket { -struct WebsocketError; -struct WebsocketMessage; +class WebsocketError; +class WebsocketMessage; // Interface on which to receive data, status and timer events class IWebsocketListener { diff --git a/src/lib/io/websocket/WebsocketClient.h b/src/lib/io/websocket/WebsocketClient.h index 3926ac7ee..1185d4718 100644 --- a/src/lib/io/websocket/WebsocketClient.h +++ b/src/lib/io/websocket/WebsocketClient.h @@ -5,7 +5,7 @@ namespace bts::io::websocket { -struct WebsocketClientConfiguration; +class WebsocketClientConfiguration; class WebsocketClient : public IWebsocketListener, public std::enable_shared_from_this { diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.h b/src/lib/io/websocket/WebsocketClientConfiguration.h index 55de4235a..51f45efaf 100644 --- a/src/lib/io/websocket/WebsocketClientConfiguration.h +++ b/src/lib/io/websocket/WebsocketClientConfiguration.h @@ -3,7 +3,8 @@ namespace bts::io::websocket { -struct WebsocketClientConfiguration { +class WebsocketClientConfiguration { + public: const std::string ip; const std::string port; // this can not be derived form the ip and port only diff --git a/src/lib/io/websocket/WebsocketError.h b/src/lib/io/websocket/WebsocketError.h index 54451528d..1a3245a44 100644 --- a/src/lib/io/websocket/WebsocketError.h +++ b/src/lib/io/websocket/WebsocketError.h @@ -3,7 +3,8 @@ namespace bts::io::websocket { -struct WebsocketError { +class WebsocketError { + public: enum class ErrorType { SETUP = 0, // error happens during the connection setup phase DISCONNECT, diff --git a/src/lib/io/websocket/WebsocketMessage.h b/src/lib/io/websocket/WebsocketMessage.h index 574f20c04..b48530645 100644 --- a/src/lib/io/websocket/WebsocketMessage.h +++ b/src/lib/io/websocket/WebsocketMessage.h @@ -4,7 +4,8 @@ namespace bts::io::websocket { -struct WebsocketMessage { +class WebsocketMessage { + public: // user controls the message_id. callback for write complete is called // using this id const std::uint64_t message_id; From d18547806edbc6b5930ef8a69cf0ab089569dd92 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 20:55:24 -0500 Subject: [PATCH 063/100] Add output operators to websocket classes --- src/lib/io/websocket/WebsocketError.cpp | 14 +++++++++++ src/lib/io/websocket/WebsocketError.h | 29 +++++++++++++++++++++++ src/lib/io/websocket/WebsocketMessage.cpp | 11 +++++++++ src/lib/io/websocket/WebsocketMessage.h | 4 ++++ 4 files changed, 58 insertions(+) create mode 100644 src/lib/io/websocket/WebsocketError.cpp create mode 100644 src/lib/io/websocket/WebsocketMessage.cpp diff --git a/src/lib/io/websocket/WebsocketError.cpp b/src/lib/io/websocket/WebsocketError.cpp new file mode 100644 index 000000000..152636403 --- /dev/null +++ b/src/lib/io/websocket/WebsocketError.cpp @@ -0,0 +1,14 @@ +#include "WebsocketError.h" + +namespace bts::io::websocket { + +constexpr const char *WebsocketError::error_type_name() const { + return ErrorType_Name(error_type); +} + +std::ostream &operator<<(std::ostream &out, const WebsocketError &we) noexcept { + out << we.error_type_name() << " " << we.message; + return out; +} + +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketError.h b/src/lib/io/websocket/WebsocketError.h index 1a3245a44..a07b8bfbd 100644 --- a/src/lib/io/websocket/WebsocketError.h +++ b/src/lib/io/websocket/WebsocketError.h @@ -1,4 +1,5 @@ #pragma once +#include #include namespace bts::io::websocket { @@ -12,8 +13,36 @@ class WebsocketError { READ_FAILED, MISC }; + ErrorType error_type; std::string message; + + constexpr const char *error_type_name() const; + + static constexpr const char *ErrorType_Name(ErrorType et); }; +std::ostream &operator<<(std::ostream &out, const WebsocketError &we) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr const char *WebsocketError::ErrorType_Name(ErrorType et) { + switch (et) { + case ErrorType::SETUP: + return "SETUP"; + case ErrorType::DISCONNECT: + return "DISCONNECT"; + case ErrorType::WRITE_FAILED: + return "WRITE_FAILED"; + case ErrorType::READ_FAILED: + return "READ_FAILED"; + case ErrorType::MISC: + return "MISC"; + default: + return "UNKNOWN"; + } +} + } // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketMessage.cpp b/src/lib/io/websocket/WebsocketMessage.cpp new file mode 100644 index 000000000..82af88f5c --- /dev/null +++ b/src/lib/io/websocket/WebsocketMessage.cpp @@ -0,0 +1,11 @@ +#include "WebsocketMessage.h" + +namespace bts::io::websocket { + +std::ostream &operator<<( + std::ostream &out, const WebsocketMessage &wm) noexcept { + out << "id: " << wm.message_id << "; data sz: " << wm.data_size; + return out; +} + +} // namespace bts::websocket diff --git a/src/lib/io/websocket/WebsocketMessage.h b/src/lib/io/websocket/WebsocketMessage.h index b48530645..f96f9d285 100644 --- a/src/lib/io/websocket/WebsocketMessage.h +++ b/src/lib/io/websocket/WebsocketMessage.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include @@ -16,4 +17,7 @@ class WebsocketMessage { } }; +std::ostream &operator<<( + std::ostream &out, const WebsocketMessage &wm) noexcept; + } // namespace bts::io::websocket From 18250a98f7f1a2711f0d59c09b46c1322730639b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 20:56:21 -0500 Subject: [PATCH 064/100] Add fn to init WebsocketClientConfiguration w/ a url --- .../io/websocket/WebsocketClientConfiguration.cpp | 12 ++++++++++++ src/lib/io/websocket/WebsocketClientConfiguration.h | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 src/lib/io/websocket/WebsocketClientConfiguration.cpp diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.cpp b/src/lib/io/websocket/WebsocketClientConfiguration.cpp new file mode 100644 index 000000000..e9cb64047 --- /dev/null +++ b/src/lib/io/websocket/WebsocketClientConfiguration.cpp @@ -0,0 +1,12 @@ +#include "WebsocketClientConfiguration.h" +#include "lib/io/URL.h" + +namespace bts::io::websocket { + +WebsocketClientConfiguration WebsocketClientConfiguration::from_url( + const URL &url) { + return WebsocketClientConfiguration{ + url.host(), std::to_string(url.port()), url.host(), 0, 0, 1000}; +} + +} // namespace bts::io::websocket diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.h b/src/lib/io/websocket/WebsocketClientConfiguration.h index 51f45efaf..016fc07dd 100644 --- a/src/lib/io/websocket/WebsocketClientConfiguration.h +++ b/src/lib/io/websocket/WebsocketClientConfiguration.h @@ -1,6 +1,10 @@ #pragma once #include +namespace bts::io { +class URL; +} + namespace bts::io::websocket { class WebsocketClientConfiguration { @@ -12,6 +16,8 @@ class WebsocketClientConfiguration { const size_t n_reconnection_attempts; const size_t msecs_bw_connection_tries; const size_t timer_ms; + + static WebsocketClientConfiguration from_url(const URL &url); }; } // namespace bts::io::websocket From 9a63cfa9560988956f2b94729ab41cb881e69a10 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Oct 2021 17:18:59 -0500 Subject: [PATCH 065/100] Add .tmp to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e0efacbda..decfba4a9 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ trace_data/ /src/.clang-format /src/server/sparkd/cmds/spartan/analysis/.ipynb_checkpoints /src/server/sparkd/cmds/spartan/analysis/data +*.tmp/* From e83c466bf22716dabf4388477624713ae3e004b3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 066/100] Port over some handy tools from spartan --- src/lib/core/EnumBitwiseOperators.h | 15 ++ src/lib/core/HashPhaser.h | 220 ++++++++++++++++++++++++++++ src/lib/core/ProtoPrinter.h | 54 +++++++ src/lib/core/VectorAdapter.h | 56 +++++++ src/lib/utils/ContainsKey.h | 3 + 5 files changed, 348 insertions(+) create mode 100644 src/lib/core/EnumBitwiseOperators.h create mode 100644 src/lib/core/HashPhaser.h create mode 100644 src/lib/core/ProtoPrinter.h create mode 100644 src/lib/core/VectorAdapter.h create mode 100644 src/lib/utils/ContainsKey.h diff --git a/src/lib/core/EnumBitwiseOperators.h b/src/lib/core/EnumBitwiseOperators.h new file mode 100644 index 000000000..b8e8dbb69 --- /dev/null +++ b/src/lib/core/EnumBitwiseOperators.h @@ -0,0 +1,15 @@ +#pragma once + +#define BITWISE_OP(enum_type, numeric_type, op) \ + enum_type operator op(enum_type lhs, enum_type rhs) noexcept { \ + return static_cast(static_cast(lhs) \ + op static_cast(rhs)); \ + } + +#define BITWISE_OPS(enum_type, numeric_type) \ + BITWISE_OP(enum_type, numeric_type, |) \ + BITWISE_OP(enum_type, numeric_type, &) \ + BITWISE_OP(enum_type, numeric_type, ^) + +#define HAS_FLAG(enum_value, flag) (enum_value & flag) == flag +#define STRIP_FLAG(enum_value, flag) (enum_value | flag) ^ flag diff --git a/src/lib/core/HashPhaser.h b/src/lib/core/HashPhaser.h new file mode 100644 index 000000000..dbbc34c37 --- /dev/null +++ b/src/lib/core/HashPhaser.h @@ -0,0 +1,220 @@ +#pragma once +#include +#include +#include +#include + +namespace bts::core { + +/** + * Provides facilities to combine multiple hash codes into a single hash code. + * + * @remarks Employs techniques, such as modular arithmetic and bitwise shifts, + * to minimize and evenly distribute information loss to the [multiple] input + * hash codes in the [singular] output hash code. + */ +class HashPhaser { + public: + /** + * Combines the hash codes of several parameters into a single hash code. + * + * @param value One of the parameters whose hash to store + * @param next The other parameters whose hash to store + * + * @remarks A well-chosen modulus of each parameter's hash is stored in + * equally sized blocks of bits. + */ + template + static std::size_t auto_phase(T value, NextT... next); + + /** + * Combines the hash codes of a limited number of elements into a single hash + * code. + * + * @param first Iterator pointing to the first element whose hash to store + * @param last Iterator pointing just after the last element whose hash to + * store + * + * @remarks A well-chosen modulus of each value's hash is stored in equally + * sized blocks of bits + */ + template + static std::size_t auto_phase_range(Iter first, Iter last); + + /** + * Combines the hash codes of a limited number of elements into a single hash + * code. + * + * @param first Iterator pointing to the first element whose hash to store + * @param last Iterator pointing just after the last element whose hash to + * store + * @param hash The hash op to use + * + * @overload + */ + template + static std::size_t auto_phase_range(Iter first, Iter last, Hash hash); + + /** + * Combines the hash codes of several parameters into a single composite hash + * code. + * + * @param value One of the parameters whose hash to store + * @param hash_op The hash code operator to use for the 'value' parameter + * @param next The other parameters whose hash to store + * + * @remarks A well-chosen modulus of each parameter's hash is stored in + * equally sized blocks of bits. + */ + template + static std::size_t custom_phase(T value, HashOp hash_op, NextT... next); + + private: + template + static void _auto_phase( + std::size_t &hash, std::uint16_t &depth, T value, NextT... next); + + template + static void _auto_phase(std::size_t &hash, std::uint16_t &depth, T value); + + template + static void _custom_phase( + std::size_t &hash, std::uint16_t &depth, T value, HashOp, NextT... next); + + template + static void _custom_phase( + std::size_t &hash, std::uint16_t &depth, T value, HashOp); + + /** + * Get the result of std::hash()(value) without having to declare the + * template parameter T explicitly (helpful when using 'auto' variables). + */ + template + static std::size_t _default_hash(T value); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +std::size_t HashPhaser::custom_phase(T value, HashOp hash_op, NextT... next) { + std::size_t res = 0; + std::uint16_t depth = 0; + HashPhaser::_custom_phase(res, depth, value, hash_op, next...); + return res; +} + +template +std::size_t HashPhaser::auto_phase(T value, NextT... next) { + std::size_t res = 0; + std::uint16_t depth = 0; + HashPhaser::_auto_phase(res, depth, value, next...); + return res; +} + +template +inline std::size_t HashPhaser::_default_hash(T value) { + return std::hash()(value); +} + +template +std::size_t HashPhaser::auto_phase_range(Iter first, Iter last) { + if (first == last) { + return 0; + } + const std::uint16_t max_els = 8; + auto num_vals = std::distance(first, last); + std::uint16_t el_count = + num_vals > std::numeric_limits::max() + ? max_els + : std::max(static_cast(num_vals), max_els); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / el_count; + std::size_t phase = 1U << (bits_per_hash - 1); + std::size_t composite_hash = 0; + auto el_rem = el_count; + while (first != last) { + std::size_t val_hash = _default_hash(*first); + composite_hash |= (val_hash % phase) << ((el_count - 1) * bits_per_hash); + if (--el_rem == 0) { + break; + } + } + return composite_hash; +} + +template +std::size_t HashPhaser::auto_phase_range(Iter first, Iter last, Hash hash) { + if (first == last) { + return 0; + } + const std::uint16_t max_els = 8; + auto num_vals = std::distance(first, last); + std::uint16_t el_count = + num_vals > std::numeric_limits::max() + ? max_els + : std::max(static_cast(num_vals), max_els); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / el_count; + std::size_t phase = 1U << (bits_per_hash - 1); + std::size_t composite_hash = 0; + auto el_rem = el_count; + while (first != last) { + std::size_t val_hash = hash(*first); + composite_hash |= (val_hash % phase) << ((el_count - 1) * bits_per_hash); + if (--el_rem == 0) { + break; + } + } + return composite_hash; +} + +template +void HashPhaser::_auto_phase( + std::size_t &composite_hash, std::uint16_t &depth, T value, NextT... next) { + auto m_depth = depth++; + _auto_phase(composite_hash, depth, next...); + auto val_hash = std::hash()(value); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / depth; + std::size_t phase = 1U << (bits_per_hash - 1); + composite_hash |= (val_hash % phase) << (m_depth * bits_per_hash); +} + +template +void HashPhaser::_auto_phase( + std::size_t &composite_hash, std::uint16_t &depth, T value) { + depth++; + std::size_t val_hash = std::hash()(value); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / depth; + std::size_t phase = 1U << (bits_per_hash - 1); + composite_hash |= (val_hash % phase) << ((depth - 1) * bits_per_hash); +} + +template +void HashPhaser::_custom_phase( + std::size_t &composite_hash, + std::uint16_t &depth, + T value, + HashOp hash_op, + NextT... next) { + auto m_depth = depth++; + _custom_phase(composite_hash, depth, next...); + auto val_hash = hash_op(value); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / depth; + std::size_t phase = 1U << (bits_per_hash - 1); + composite_hash |= (val_hash % phase) << (m_depth * bits_per_hash); +} + +template +void HashPhaser::_custom_phase( + std::size_t &composite_hash, + std::uint16_t &depth, + T value, + HashOp hash_op) { + depth++; + std::size_t val_hash = hash_op(value); + auto bits_per_hash = (sizeof(std::size_t) * __CHAR_BIT__) / depth; + std::size_t phase = 1U << (bits_per_hash - 1); + composite_hash |= (val_hash % phase) << ((depth - 1) * bits_per_hash); +} + +} // namespace bts::core diff --git a/src/lib/core/ProtoPrinter.h b/src/lib/core/ProtoPrinter.h new file mode 100644 index 000000000..98a213f6e --- /dev/null +++ b/src/lib/core/ProtoPrinter.h @@ -0,0 +1,54 @@ +#pragma once +#include +#include + +namespace bts::core { + +template +class ProtoPrinter { + public: + explicit ProtoPrinter(const T *message) noexcept; + static void print(const T &message, std::ostream &out = std::cout); + + const T *message; +}; + +template +std::ostream &operator<<( + std::ostream &out, const ProtoPrinter &printer) noexcept; + +class ProtoPrinterFactory { + public: + template + static ProtoPrinter create(const T *message); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +ProtoPrinter::ProtoPrinter(const T *message) noexcept : message(message) {} + +template +void ProtoPrinter::print(const T &message, std::ostream &out) { + std::string str; + google::protobuf::TextFormat::PrintToString(message, &str); + out << str; +} + +template +ProtoPrinter ProtoPrinterFactory::create(const T *message) { + return ProtoPrinter(message); +} + +template +std::ostream &operator<<( + std::ostream &out, const ProtoPrinter &printer) noexcept { + std::string str; + google::protobuf::TextFormat::PrintToString(*printer.message, &str); + out << str; + return out; +} + +} // namespace bts::core diff --git a/src/lib/core/VectorAdapter.h b/src/lib/core/VectorAdapter.h new file mode 100644 index 000000000..481eb4cb3 --- /dev/null +++ b/src/lib/core/VectorAdapter.h @@ -0,0 +1,56 @@ +#pragma once +#include +#include + +namespace bts::core { + +class VectorAdapter { + public: + template + static std::vector to(const std::vector &source, Op op); + + template + static std::vector to_const_pointers( + const std::vector &source); + + template + static std::vector copy_values(const std::unordered_map &source); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +std::vector VectorAdapter::to(const std::vector &source, Op op) { + std::vector result; + result.reserve(source.size()); + for (const auto &value : source) { + result.push_back(op(value)); + } + return result; +} + +template +std::vector VectorAdapter::to_const_pointers( + const std::vector &source) { + std::vector ptrs; + ptrs.reserve(source.size()); + for (const auto &value : source) { + ptrs.push_back(&value); + } + return ptrs; +} + +template +std::vector VectorAdapter::copy_values( + const std::unordered_map &source) { + std::vector values; + values.reserve(source.size()); + for (const auto &p : source) { + values.push_back(p.second); + } + return values; +} + +} // namespace bts::core diff --git a/src/lib/utils/ContainsKey.h b/src/lib/utils/ContainsKey.h new file mode 100644 index 000000000..424f50c1d --- /dev/null +++ b/src/lib/utils/ContainsKey.h @@ -0,0 +1,3 @@ +#pragma once + +#define CONTAINS_KEY(map, key) (map.find(key) != map.end()) From 1ae124f0b2c1a4e561999b3deaa890c0fd95f96d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 067/100] Add SecurityResolver w/ fn bones --- src/lib/domain/SecurityResolver.h | 76 +++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 src/lib/domain/SecurityResolver.h diff --git a/src/lib/domain/SecurityResolver.h b/src/lib/domain/SecurityResolver.h new file mode 100644 index 000000000..01201c5eb --- /dev/null +++ b/src/lib/domain/SecurityResolver.h @@ -0,0 +1,76 @@ +#pragma once +#include "lib/domain/SecurityID.h" +#include "lib/domain/Venue.h" +#include +#include +#include + +namespace bts::domain { + +class SecurityResolver { + public: + static domain::Venue id_to_venue(domain::SecurityID id); + + static domain::SecurityID symbol_to_id( + domain::Venue venue, const std::string &symbol); + + static std::string id_to_symbol(domain::SecurityID id); + + template > + static std::vector ids_for_venue( + const IDs &ids, const Venues &venues); + + template + static std:: + unordered_map> + map_venue_to_id(const IDs &ids); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +inline domain::Venue SecurityResolver::id_to_venue(domain::SecurityID /*id*/) { + // TODO + return domain::Venue::None; +} + +inline domain::SecurityID SecurityResolver::symbol_to_id( + domain::Venue /*venue*/, const std::string & /*symbol*/) { + // TODO + return domain::SecurityID{0}; +} + +inline std::string SecurityResolver::id_to_symbol(domain::SecurityID /*id*/) { + // TODO + return ""; +} + +template +std::vector SecurityResolver::ids_for_venue( + const IDs &ids, const Venues &venues) { + std::vector rv; + for (auto id : ids) { + auto id_venue = id_to_venue(id); + for (auto venue : venues) { + if (id_venue == venue) { + rv.push_back(id); + break; + } + } + } + return rv; +} + +template +std::unordered_map> +SecurityResolver::map_venue_to_id(const IDs &ids) { + std::unordered_map> rv; + for (auto id : ids) { + auto venue = id_to_venue(id); + rv[venue].insert(id); + } + return rv; +} + +} // namespace bts::domain From 0f81af3095337d19b22e062d80ae34b262ece5a4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 28 Sep 2021 20:51:33 -0400 Subject: [PATCH 068/100] cli: Add crypto subcommand This runs a test/example app that subscribes to binance md and prints depth to the console --- src/lib/config/protos/CryptoConfig.proto | 7 + src/lib/md/CompositeMarketDataListener.h | 58 +++++ src/lib/md/IMarketDataListener.h | 2 +- src/lib/md/MarketDataGateway.cpp | 219 +++++++++++++++-- src/lib/md/MarketDataListener.h | 50 ++++ src/lib/md/MarketDataListenerData.h | 26 ++ .../md/binance/BinanceDepthBootstrapper.cpp | 96 ++++++++ src/lib/md/binance/BinanceDepthBootstrapper.h | 36 +++ src/lib/md/binance/BinanceDepthSnapshot.cpp | 127 ++++++++++ src/lib/md/binance/BinanceDepthSnapshot.h | 36 +++ .../md/binance/BinanceDepthStreamParams.cpp | 123 ++++++++++ src/lib/md/binance/BinanceDepthStreamParams.h | 76 ++++++ src/lib/md/binance/BinanceDepthStreamSite.cpp | 75 ++++++ src/lib/md/binance/BinanceDepthStreamSite.h | 128 ++++++++++ .../md/binance/BinanceDepthStreamSiteKey.cpp | 41 ++++ .../md/binance/BinanceDepthStreamSiteKey.h | 39 +++ .../binance/BinanceDiffDepthSubscription.cpp | 231 ++++++++++++++++++ .../md/binance/BinanceDiffDepthSubscription.h | 44 ++++ src/lib/md/binance/BinanceDiffDepthUpdate.cpp | 147 +++++++++++ src/lib/md/binance/BinanceDiffDepthUpdate.h | 21 ++ .../binance/BinanceMarketDataSubscription.cpp | 72 ++++++ .../binance/BinanceMarketDataSubscription.h | 45 ++++ src/lib/md/binance/BinanceStreamListener.h | 54 ++++ .../binance/BinanceWebsocketStreamDemuxer.cpp | 50 ++++ .../binance/BinanceWebsocketStreamDemuxer.h | 51 ++++ src/lib/md/listeners/LiveLadderPrinter.cpp | 71 ++++++ src/lib/md/listeners/LiveLadderPrinter.h | 12 + src/server/sparkd/cmds/crypto/BinanceDemo.cpp | 44 ++++ src/server/sparkd/cmds/crypto/BinanceDemo.h | 17 ++ .../sparkd/cmds/crypto/BinanceDemoCmd.cpp | 20 ++ .../sparkd/cmds/crypto/BinanceDemoCmd.h | 17 ++ src/server/sparkd/cmds/crypto/CryptoCmd.cpp | 19 ++ src/server/sparkd/cmds/crypto/CryptoCmd.h | 17 ++ src/server/sparkd/main.cpp | 6 +- 34 files changed, 2055 insertions(+), 22 deletions(-) create mode 100644 src/lib/config/protos/CryptoConfig.proto create mode 100644 src/lib/md/CompositeMarketDataListener.h create mode 100644 src/lib/md/MarketDataListener.h create mode 100644 src/lib/md/MarketDataListenerData.h create mode 100644 src/lib/md/binance/BinanceDepthBootstrapper.cpp create mode 100644 src/lib/md/binance/BinanceDepthBootstrapper.h create mode 100644 src/lib/md/binance/BinanceDepthSnapshot.cpp create mode 100644 src/lib/md/binance/BinanceDepthSnapshot.h create mode 100644 src/lib/md/binance/BinanceDepthStreamParams.cpp create mode 100644 src/lib/md/binance/BinanceDepthStreamParams.h create mode 100644 src/lib/md/binance/BinanceDepthStreamSite.cpp create mode 100644 src/lib/md/binance/BinanceDepthStreamSite.h create mode 100644 src/lib/md/binance/BinanceDepthStreamSiteKey.cpp create mode 100644 src/lib/md/binance/BinanceDepthStreamSiteKey.h create mode 100644 src/lib/md/binance/BinanceDiffDepthSubscription.cpp create mode 100644 src/lib/md/binance/BinanceDiffDepthSubscription.h create mode 100644 src/lib/md/binance/BinanceDiffDepthUpdate.cpp create mode 100644 src/lib/md/binance/BinanceMarketDataSubscription.cpp create mode 100644 src/lib/md/binance/BinanceMarketDataSubscription.h create mode 100644 src/lib/md/binance/BinanceStreamListener.h create mode 100644 src/lib/md/binance/BinanceWebsocketStreamDemuxer.cpp create mode 100644 src/lib/md/binance/BinanceWebsocketStreamDemuxer.h create mode 100644 src/lib/md/listeners/LiveLadderPrinter.cpp create mode 100644 src/lib/md/listeners/LiveLadderPrinter.h create mode 100644 src/server/sparkd/cmds/crypto/BinanceDemo.cpp create mode 100644 src/server/sparkd/cmds/crypto/BinanceDemo.h create mode 100644 src/server/sparkd/cmds/crypto/BinanceDemoCmd.cpp create mode 100644 src/server/sparkd/cmds/crypto/BinanceDemoCmd.h create mode 100644 src/server/sparkd/cmds/crypto/CryptoCmd.cpp create mode 100644 src/server/sparkd/cmds/crypto/CryptoCmd.h diff --git a/src/lib/config/protos/CryptoConfig.proto b/src/lib/config/protos/CryptoConfig.proto new file mode 100644 index 000000000..9c1cdc49f --- /dev/null +++ b/src/lib/config/protos/CryptoConfig.proto @@ -0,0 +1,7 @@ +syntax='proto3'; +package bts.config; +import "lib/api/md/MarketDataSubscriptionParams.proto"; + +message CryptoConfig { + repeated bts.api.md.MarketDataSubscriptionParams crypto_md = 1; +} diff --git a/src/lib/md/CompositeMarketDataListener.h b/src/lib/md/CompositeMarketDataListener.h new file mode 100644 index 000000000..6254dd0a0 --- /dev/null +++ b/src/lib/md/CompositeMarketDataListener.h @@ -0,0 +1,58 @@ +#pragma once +#include "IMarketDataListener.h" +#include + +namespace bts::md { + +class CompositeListener : IMarketDataListener { + public: + std::vector listeners; + + void on_securities(const std::vector + &complete_security_list) override { + for (auto *l : listeners) { + l->on_securities(complete_security_list); + } + } + + void on_security_state( + const domain::SecurityState &security_state) override { + for (auto *l : listeners) { + l->on_security_state(security_state); + } + } + + void on_security_statistics( + const domain::SecurityMarketDataStatistics &security_stats) override { + for (auto *l : listeners) { + l->on_security_statistics(security_stats); + } + } + + void on_book(const domain::Book &book) override { + for (auto *l : listeners) { + l->on_book(book); + } + } + + void on_trades( + const std::vector &trades) override { + for (auto *l : listeners) { + l->on_trades(trades); + } + } + + void on_rfqs(const std::vector &rfqs) override { + for (auto *l : listeners) { + l->on_rfqs(rfqs); + } + } + + void on_error(const domain::MarketDataError &error) override { + for (auto *l : listeners) { + l->on_error(error); + } + } +}; + +} // namespace bts::md diff --git a/src/lib/md/IMarketDataListener.h b/src/lib/md/IMarketDataListener.h index 5ca1203ca..e1cdd12ee 100644 --- a/src/lib/md/IMarketDataListener.h +++ b/src/lib/md/IMarketDataListener.h @@ -1,11 +1,11 @@ #pragma once +#include "lib/domain/Book.h" #include namespace bts::domain { class Security; class SecurityState; class SecurityMarketDataStatistics; -class Book; class TradeRecord; class RFQ; } // namespace bts::domain diff --git a/src/lib/md/MarketDataGateway.cpp b/src/lib/md/MarketDataGateway.cpp index 3e40d8294..7f4d771c4 100644 --- a/src/lib/md/MarketDataGateway.cpp +++ b/src/lib/md/MarketDataGateway.cpp @@ -1,29 +1,134 @@ #include "MarketDataGateway.h" #include "MarketDataRegistration.h" #include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/core/ProtoPrinter.h" +#include "lib/domain/SecurityID.h" +#include "lib/domain/SecurityResolver.h" +#include "lib/domain/Venue.h" +#include "lib/io/URL.h" #include "lib/io/websocket/WebsocketClient.h" -#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/logging/logging.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/MarketDataListenerData.h" +#include "lib/md/MarketDataListenerID.h" +#include "lib/md/binance/BinanceDepthStreamSite.h" +#include "lib/md/binance/BinanceDepthStreamSiteKey.h" +#include "lib/md/binance/BinanceDiffDepthSubscription.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "lib/utils/ContainsKey.h" #include "lib/utils/bts_assert.h" +#include +#include namespace bts::md { -// struct IWebsocketFactory { - -// }; - -struct BinanceConnection { - IMarketDataListener *listener; +struct SecData { + std::unordered_set listeners; + domain::Book book; }; +template +static api::md::binance::BinanceMarketDataSubscriptionParams +create_binance_subscription(const Symbols &symbols) { + api::md::binance::BinanceMarketDataSubscriptionParams sub; + auto &depth_stream = *sub.add_depth_streams(); + depth_stream.set_num_levels(domain::Book::max_depth()); + + // stream url + auto &stream_url = *depth_stream.mutable_stream_url(); + *stream_url.mutable_protocol() = "wss"; + *stream_url.mutable_host() = "stream.binance.com"; + stream_url.set_port(9443); + + // snapshot url + auto &snapshot_url = *depth_stream.mutable_snapshot_url(); + *snapshot_url.mutable_protocol() = "https"; + *snapshot_url.mutable_host() = "api.binance.com"; + *snapshot_url.mutable_path() = "api/v3/depth"; + snapshot_url.set_port(443); + + // add symbols + for (const auto &sym : symbols) { + depth_stream.add_symbols(sym); + } + return sub; +} + struct MarketDataGateway::PImpl { MarketDataRegistrationFactory registration_factory; - std::unordered_map + std::unordered_map< + binance::BinanceDepthStreamSiteKey, + binance::BinanceDepthStreamSite> + binance_sites; + std::unordered_map sec_sub_ref_counts; + std::unordered_map sec_data_map; + std::unordered_map registered_listeners; - // bts::websocket::WebsocketClient create_binance_client(const - // binance::BinanceMarketDataSubscription &sub) { - // // websocket::WebsocketClient(""); - // } + void on_binance_depth_changed( + const std::string &symbol, + bts::md::binance::BinanceDiffDepthUpdate upd) { + LOG(md, bts::Diag, "depth changed. sym: {}"); + auto sid = domain::SecurityResolver::symbol_to_id( + domain::Venue::Binance, symbol); + auto &sec_data = sec_data_map[sid]; + upd.apply_to_book(sec_data.book); + for (const auto lid : sec_data.listeners) { + auto &listener = registered_listeners[lid]; + listener.listener->on_book(sec_data.book); + } + } + + binance::BinanceDepthStreamSite &get_binance_site( + const binance::BinanceDepthStreamSiteKey &k) { + return binance_sites + .try_emplace(k, k, &sec_sub_ref_counts, ®istered_listeners) + .first->second; + } + + std::pair try_emplace_binance_site( + const binance::BinanceDepthStreamSiteKey &k) { + auto p = binance_sites.try_emplace( + k, k, &sec_sub_ref_counts, ®istered_listeners); + return {&p.first->second, p.second}; + } + + void subscribe( + MarketDataListenerID id, + const api::md::binance::BinanceDepthStreamParams &depth_stream) { + binance::BinanceDepthStreamSiteKey site_key(depth_stream); + auto site_it = binance_sites.find(site_key); + bts_assert(site_it != binance_sites.end()); + auto &site = site_it->second; + site.subscribe(id, depth_stream.symbols()); + } + + void unsubscribe( + MarketDataListenerID id, + const api::md::binance::BinanceDepthStreamParams &depth_stream) { + binance::BinanceDepthStreamSiteKey site_key(depth_stream); + auto site_it = binance_sites.find(site_key); + bts_assert(site_it != binance_sites.end()); + auto &site = site_it->second; + site.unsubscribe(id, depth_stream.symbols()); + } + + void subscribe( + MarketDataListenerID id, + const api::md::binance::BinanceMarketDataSubscriptionParams &sub) { + for (const auto &depth_stream : sub.depth_streams()) { + subscribe(id, depth_stream); + } + } + + void unsubscribe( + MarketDataListenerID id, + const api::md::binance::BinanceMarketDataSubscriptionParams &sub) { + for (const auto &depth_stream : sub.depth_streams()) { + unsubscribe(id, depth_stream); + } + } }; MarketDataGateway::MarketDataGateway() @@ -39,22 +144,100 @@ MarketDataRegistration MarketDataGateway::register_listener( me_->registered_listeners.find(*reg.listener_id) == me_->registered_listeners.end()); + auto init_listener = [&]() { + auto *conn = &me_->registered_listeners[reg.listener_id.value()]; + conn->id = reg.listener_id.value(); + conn->listener = listener; + }; + switch (sub.venue()) { - case domain::Venue::Binance: - // TODO: init binance subscription + case api::domain::Venue::BINANCE: { + bts_assert( + sub.params().VenueParams_case() == + api::md::MarketDataSubscriptionParams::kBinance); + + init_listener(); + std::vector new_sites; + LOG(md, bts::Info, "MarketDataGateway registering listener.\n{}\n", + core::ProtoPrinter( + &sub.params())); + const auto &depth_streams = sub.params().binance().depth_streams(); + for (const auto &depth_stream : depth_streams) { + binance::BinanceDepthStreamSiteKey site_key(depth_stream); + auto [site, is_new] = me_->try_emplace_binance_site(site_key); + bts_assert(site); + site->subscribe(reg.listener_id.value(), depth_stream.symbols()); + if (is_new) { + new_sites.push_back(site); + } + } + + // Although the websocket connection could be made lazily (i.e., in the + // `subscribe` method), establishing the connection ahead of time keeps + // that step out of the hot(ter) path + for (auto *site : new_sites) { + site->on_depth_changed().bind<&PImpl::on_binance_depth_changed>(*me_); + site->connect(); + } break; + } default: return MarketDataRegistration{ MarketDataListenerID{0}, MarketDataRegstrationError::Type::NOT_IMPLEMENTED}; } - me_->registered_listeners[reg.listener_id.value()] = listener; + return reg; } -void subscribe( - MarketDataListenerID id, const std::vector &securities); +void MarketDataGateway::subscribe( + MarketDataListenerID id, + const std::vector &securities) { + auto venue_secs = domain::SecurityResolver::map_venue_to_id(securities); + for (const auto &[venue, secs] : venue_secs) { + switch (venue) { + case domain::Venue::Binance: { + auto syms = ranges::views::transform(secs, [](auto sid) { + return domain::SecurityResolver::id_to_symbol(sid); + }); + auto sub = create_binance_subscription(syms); + me_->subscribe(id, sub); + } + default: + break; + } + } +} -void unregister_listener(MarketDataListenerID id); +void MarketDataGateway::unsubscribe( + MarketDataListenerID id, + const std::vector &securities) { + LOG(md, bts::Info, "Unsubscribing {} secs for listener {}", + securities.size(), id); + auto venue_secs = domain::SecurityResolver::map_venue_to_id(securities); + for (const auto &[venue, secs] : venue_secs) { + switch (venue) { + case domain::Venue::Binance: { + auto syms = ranges::views::transform(secs, [](auto sid) { + return domain::SecurityResolver::id_to_symbol(sid); + }); + auto sub = create_binance_subscription(syms); + me_->unsubscribe(id, sub); + } + default: + break; + } + } +} + +void MarketDataGateway::unregister_listener(MarketDataListenerID id) { + LOG(md, bts::Info, "Unregistering listener {}", id); + bts_assert(CONTAINS_KEY(me_->registered_listeners, id)); + auto &ld = me_->registered_listeners[id]; + std::vector sec_vec( + ld.securities.begin(), ld.securities.end()); + unsubscribe(id, sec_vec); + me_->registered_listeners.erase(id); +} } // namespace bts::md diff --git a/src/lib/md/MarketDataListener.h b/src/lib/md/MarketDataListener.h new file mode 100644 index 000000000..f0f757e4b --- /dev/null +++ b/src/lib/md/MarketDataListener.h @@ -0,0 +1,50 @@ +#pragma once +#include "IMarketDataListener.h" +#include "lib/domain/Book.h" +#include "lib/domain/Security.h" +#include "lib/domain/SecurityState.h" +#include "lib/domain/SecurityMarketDataStatistics.h" +#include "lib/domain/TradeRecord.h" +#include "lib/md/MarketDataError.h" + +namespace bts::md { + +class MarketDataListener : public IMarketDataListener { + public: + void on_securities(const std::vector + &complete_security_list) override; + void on_security_state(const domain::SecurityState &security_state) override; + void on_security_statistics( + const domain::SecurityMarketDataStatistics &security_stats) override; + + void on_book(const domain::Book &book) override; + void on_trades( + const std::vector &trades) override; + void on_rfqs(const std::vector &rfqs) override; + void on_error(const MarketDataError &error) override; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +void MarketDataListener::on_securities( + const std::vector & /*complete_security_list*/) {} + +void MarketDataListener::on_security_state( + const domain::SecurityState & /*security_state*/) {} + +void MarketDataListener::on_security_statistics( + const domain::SecurityMarketDataStatistics & /*security_stats*/) {} + +void MarketDataListener::on_book(const domain::Book & /*book*/) {} + +void MarketDataListener::on_trades( + const std::vector & /*trades*/) {} + +void MarketDataListener::on_rfqs( + const std::vector & /*rfqs*/) {} + +void MarketDataListener::on_error(const MarketDataError & /*error*/) {} + +} // namespace bts::md diff --git a/src/lib/md/MarketDataListenerData.h b/src/lib/md/MarketDataListenerData.h new file mode 100644 index 000000000..21ebb6d40 --- /dev/null +++ b/src/lib/md/MarketDataListenerData.h @@ -0,0 +1,26 @@ +#pragma once +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/domain/SecurityID.h" +#include "lib/domain/SecurityResolver.h" +#include "lib/domain/Venue.h" +#include "lib/io/URL.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/MarketDataListenerID.h" +#include "lib/md/binance/BinanceDiffDepthSubscription.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/utils/ContainsKey.h" +#include "lib/utils/bts_assert.h" +#include +#include + +namespace bts::md { + +struct MarketDataListenerData { + MarketDataListenerID id; + IMarketDataListener *listener; + std::unordered_set securities; +}; + +} // namespace bts::md diff --git a/src/lib/md/binance/BinanceDepthBootstrapper.cpp b/src/lib/md/binance/BinanceDepthBootstrapper.cpp new file mode 100644 index 000000000..1a06bcafe --- /dev/null +++ b/src/lib/md/binance/BinanceDepthBootstrapper.cpp @@ -0,0 +1,96 @@ +#include "BinanceDepthBootstrapper.h" +#include "BinanceDepthSnapshot.h" +#include "BinanceDiffDepthUpdate.h" +#include "lib/core/EnumBitwiseOperators.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/logging/logging.h" +#include "lib/md/IMarketDataListener.h" +#include + +namespace bts::md::binance { + +enum class State { + WaitingForSnapshot = 1 << 0, + WaitingForUpdate = 1 << 1, + SeedingUpdates = 1 << 2, + PublishingUpdates = 1 << 3 +}; + +BITWISE_OPS(State, std::int32_t) + +struct BinanceDepthBootstrapper::PImpl { + BinanceDepthSnapshot last_snapshot; + BinanceDiffDepthUpdate buffered_update; + State state = State::WaitingForSnapshot | State::WaitingForUpdate; + OnDepthChanged on_depth_changed; + + void on_diff_update(const BinanceDiffDepthUpdate &diff_update) { + bts_assert(diff_update.last_update_id >= diff_update.first_update_id); + if (state == State::PublishingUpdates) { + bts_assert( + diff_update.last_update_id > buffered_update.last_update_id); + on_depth_changed(diff_update); + return; + } + + if (HAS_FLAG(state, State::WaitingForUpdate)) { + // this is the first diff-update (assign directly to + // buffered_update, rather than merge) + buffered_update = diff_update; + state = STRIP_FLAG(state, State::WaitingForUpdate); + } else { + // this is a subsequent diff-update (merge to buffered_update) + buffered_update += diff_update; + } + + // with the new buffer, try to bootstrap the outgoing updates. + if (buffered_update.includes_event(last_snapshot.last_update_id)) { + start(last_snapshot.apply_diff(buffered_update)); + } + } + + void on_snapshot(const BinanceDepthSnapshot &snapshot) { + if (state == State::PublishingUpdates) { + return; + } + if (buffered_update.includes_event(snapshot.last_update_id)) { + start(snapshot.apply_diff(buffered_update)); + return; + } + // publish a 'synthetic incremental update' as the delta between this + // snapshot and the last one. + auto synth_update = snapshot - last_snapshot; + // Update last_snapshot before invoking the depth-changed callback to + // avoid exposing stale state in re-entrant calls. + last_snapshot = snapshot; + on_depth_changed(synth_update); + } + + void start(const BinanceDepthSnapshot &snapshot) { + state = State::PublishingUpdates; + last_snapshot = snapshot; + on_depth_changed(snapshot.as_initial_update()); + } +}; + +BinanceDepthBootstrapper::BinanceDepthBootstrapper() + : me_(std::make_unique()) {} + +BinanceDepthBootstrapper::~BinanceDepthBootstrapper() = default; + +BinanceDepthBootstrapper::OnDepthChanged & +BinanceDepthBootstrapper::on_depth_changed() { + return me_->on_depth_changed; +} + +void BinanceDepthBootstrapper::on_snapshot( + const BinanceDepthSnapshot &snapshot) { + me_->on_snapshot(snapshot); +} + +void BinanceDepthBootstrapper::on_diff_update( + const BinanceDiffDepthUpdate &diff_update) { + me_->on_diff_update(diff_update); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthBootstrapper.h b/src/lib/md/binance/BinanceDepthBootstrapper.h new file mode 100644 index 000000000..92ee1aeb6 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthBootstrapper.h @@ -0,0 +1,36 @@ +#pragma once +#include "system/Delegate.h" +#include + +namespace bts::md::binance { + +class BinanceDepthSnapshot; +class BinanceDiffDepthUpdate; +class BinanceDiffDepthListener; + +class BinanceDepthBootstrapper { + public: + BinanceDepthBootstrapper(); + BinanceDepthBootstrapper(const BinanceDepthBootstrapper &) = delete; + BinanceDepthBootstrapper(BinanceDepthBootstrapper &&) noexcept = default; + BinanceDepthBootstrapper &operator=(const BinanceDepthBootstrapper &) = + delete; + BinanceDepthBootstrapper &operator=(BinanceDepthBootstrapper &&) noexcept = + default; + ~BinanceDepthBootstrapper(); + + using OnDepthChanged = + spartan::Delegate; + + void on_snapshot(const BinanceDepthSnapshot &snapshot); + + void on_diff_update(const BinanceDiffDepthUpdate &diff_update); + + OnDepthChanged &on_depth_changed(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthSnapshot.cpp b/src/lib/md/binance/BinanceDepthSnapshot.cpp new file mode 100644 index 000000000..e8a80d451 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthSnapshot.cpp @@ -0,0 +1,127 @@ +#include "BinanceDepthSnapshot.h" +#include "BinanceBookLevelComp.h" +#include "BinanceDiffDepthUpdate.h" +#include "lib/domain/Price.h" +#include "lib/md/binance/BinanceBookLevel.h" +#include + +namespace bts::md::binance { + +static void apply_diff( + const std::vector &changes, + std::vector &book_side, + BinanceBookLevelComp comp) { + for (const auto &ch : changes) { + auto it = + std::lower_bound(book_side.begin(), book_side.end(), ch.price, comp); + if (ch.quantity == 0) { + // remove + if (it != book_side.end() && it->price == ch.price) { + book_side.erase(it); + } + continue; + } + if (it->price == ch.price) { + // update + it->quantity = ch.quantity; + continue; + } + auto new_level = book_side.emplace(it); + new_level->price = ch.price; + new_level->quantity = ch.quantity; + } +} + +BinanceDepthSnapshot BinanceDepthSnapshot::apply_diff( + const BinanceDiffDepthUpdate &diff_update) const { + auto bids_out = bids; + binance::apply_diff( + diff_update.changed_bids, bids_out, + BinanceBookLevelComp(domain::Side::Buy)); + auto asks_out = asks; + binance::apply_diff( + diff_update.changed_asks, asks_out, + BinanceBookLevelComp(domain::Side::Sell)); + BinanceDepthSnapshot rv; + rv.last_update_id = last_update_id; + rv.bids = bids_out; + rv.asks = asks_out; + return rv; +} + +BinanceDiffDepthUpdate BinanceDepthSnapshot::as_initial_update() const { + BinanceDiffDepthUpdate rv; + rv.first_update_id = this->last_update_id; + rv.last_update_id = this->last_update_id; + rv.changed_bids = bids; + rv.changed_asks = asks; + return rv; +} + +void from_json(const nlohmann::json &j, BinanceDepthSnapshot &snap) { + j["lastUpdateId"].get_to(snap.last_update_id); + j["bids"].get_to(snap.bids); + j["asks"].get_to(snap.asks); +} + +void to_json(nlohmann::json &j, const BinanceDepthSnapshot &snap) { + j["lastUpdateId"] = snap.last_update_id; + j["bids"] = snap.bids; + j["asks"] = snap.asks; +} + +struct ChangedLevelsIter { + const std::vector *minuend_levels; + const std::vector *subtrahend_levels; + std::size_t i = 0; + std::size_t j = 0; + + const BinanceBookLevel *next() { + if (i >= minuend_levels->size()) { + return nullptr; + } + const auto &mlevel = (*minuend_levels)[i]; + if (j >= subtrahend_levels->size()) { + return &mlevel; + } + const auto &slevel = (*subtrahend_levels)[i]; + if (mlevel != slevel) { + return nullptr; + } + return &mlevel; + } + + bool is_done() const { return i >= minuend_levels->size(); } +}; + +static std::vector get_changed_levels( + const std::vector &old_levels, + const std::vector &new_levels) { + std::vector changed_levels; + ChangedLevelsIter diff_iter{&new_levels, &old_levels}; + const auto *level = diff_iter.next(); + while (level != nullptr) { + changed_levels.push_back(*level); + level = diff_iter.next(); + } + return changed_levels; +} + +BinanceDiffDepthUpdate operator-( + const BinanceDepthSnapshot &minuend, + const BinanceDepthSnapshot &subtrahend) { + BinanceDiffDepthUpdate diff; + diff.first_update_id = subtrahend.last_update_id; + diff.last_update_id = minuend.last_update_id; + diff.changed_bids = get_changed_levels(subtrahend.bids, minuend.bids); + diff.changed_asks = get_changed_levels(subtrahend.asks, minuend.asks); + return diff; +} + +std::ostream &operator<<( + std::ostream &out, const BinanceDepthSnapshot &snapshot) noexcept { + out << "bids: " << fmt::format("{}", fmt::join(snapshot.bids, ", ")); + return out; +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthSnapshot.h b/src/lib/md/binance/BinanceDepthSnapshot.h new file mode 100644 index 000000000..6ff6f4a11 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthSnapshot.h @@ -0,0 +1,36 @@ +#pragma once +#include "BinanceBookLevel.h" +#include +#include +#include + +namespace bts::md::binance { + +class BinanceDiffDepthUpdate; + +class BinanceDepthSnapshot { + public: + // json name: lastUpdateId + std::size_t last_update_id; + // json name: bids + std::vector bids; + // json name: asks + std::vector asks; + + BinanceDepthSnapshot apply_diff( + const BinanceDiffDepthUpdate &diff_update) const; + + BinanceDiffDepthUpdate as_initial_update() const; +}; + +void from_json(const nlohmann::json &j, BinanceDepthSnapshot &snap); +void to_json(nlohmann::json &j, const BinanceDepthSnapshot &snap); + +BinanceDiffDepthUpdate operator-( + const BinanceDepthSnapshot &minuend, + const BinanceDepthSnapshot &subtrahend); + +std::ostream &operator<<( + std::ostream &out, const BinanceDepthSnapshot &snapshot) noexcept; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthStreamParams.cpp b/src/lib/md/binance/BinanceDepthStreamParams.cpp new file mode 100644 index 000000000..a9a11b93c --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamParams.cpp @@ -0,0 +1,123 @@ +#include "BinanceDepthStreamParams.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/core/VectorAdapter.h" +#include +#include +#include +#include + +namespace bts::md::binance { + +BinanceDepthStreamParams::BinanceDepthStreamParams( + const api::md::binance::BinanceDepthStreamParams ¶ms) + : symbols_(params.symbols().begin(), params.symbols().end()), + stream_url_(params.stream_url()), snapshot_url_(params.snapshot_url()), + num_levels_(params.num_levels()) { + stream_url_.fill_protocol("wss"); + stream_url_.fill_host("stream.binance.com"); + stream_url_.fill_port(9443); + stream_url_.fill_path("streams"); + if (stream_url_.query_params().empty()) { + stream_url_.query_params()["streams"] = fmt::format( + "{}", + fmt::join( + ranges::transform_view( + params.symbols(), + [this](const auto &sym) { return symbol_stream_name(sym); }), + "/")); + } + + // snapshot + for (const auto &sym : params.symbols()) { + auto &sym_snap_url = + snapshot_urls_.try_emplace(sym, snapshot_url_).first->second; + sym_snap_url.fill_protocol("https"); + sym_snap_url.fill_host("api.binance.com"); + sym_snap_url.fill_port(443); + sym_snap_url.fill_path("api/v3/depth"); + if (sym_snap_url.query_params().empty()) { + for (const auto &sym : params.symbols()) { + snapshot_urls_[sym].query_params()["symbol"] = sym; + snapshot_urls_[sym].query_params()["limit"] = + std::to_string(params.num_levels()); + } + } + } +} + +std::string BinanceDepthStreamParams::symbol_stream_name( + const std::string &symbol) const { + return fmt::format("{}@depth{}", symbol, num_levels_); +} + +const std::vector &BinanceDepthStreamParams::symbols() const { + return symbols_; +} + +io::URL &BinanceDepthStreamParams::stream_url() { return stream_url_; } + +const io::URL &BinanceDepthStreamParams::stream_url() const { + return stream_url_; +} + +io::URL &BinanceDepthStreamParams::snapshot_url() { return snapshot_url_; } +const io::URL &BinanceDepthStreamParams::snapshot_url() const { + return snapshot_url_; +} + +io::URL *BinanceDepthStreamParams::snapshot_url(const std::string &symbol) { + return &snapshot_urls_[symbol]; +} + +const io::URL *BinanceDepthStreamParams::snapshot_url( + const std::string &symbol) const { + auto it = snapshot_urls_.find(symbol); + if (it == snapshot_urls_.end()) { + return nullptr; + } + return &it->second; +} + +std::uint32_t &BinanceDepthStreamParams::num_levels() { return num_levels_; } + +std::uint32_t BinanceDepthStreamParams::num_levels() const { + return num_levels_; +} + +std::string BinanceDepthStreamParams::live_subscribe_request_body( + std::size_t send_id, const std::vector &symbols) { + auto stream_names = core::VectorAdapter::to( + symbols, [](const auto &sym) { return sym + "@depth"; }); + nlohmann::json j; + j["method"] = "SUBSCRIBE"; + j["params"] = stream_names; + j["id"] = send_id; + std::stringstream ss; + ss >> j; + return ss.str(); +} + +bool operator==( + const BinanceDepthStreamParams &lhs, const BinanceDepthStreamParams &rhs) { + if (lhs.stream_url() != rhs.stream_url()) { + return false; + } + if (lhs.snapshot_url() != rhs.snapshot_url()) { + return false; + } + return true; +} + +bool operator!=( + const BinanceDepthStreamParams &lhs, const BinanceDepthStreamParams &rhs) { + return !(lhs == rhs); +} + +std::ostream &operator<<( + std::ostream &out, const BinanceDepthStreamParams &stream_params) noexcept { + out << fmt::format("{}", fmt::join(stream_params.symbols(), ", ")) << " @ " + << stream_params.stream_url(); + return out; +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthStreamParams.h b/src/lib/md/binance/BinanceDepthStreamParams.h new file mode 100644 index 000000000..7d9aa85a1 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamParams.h @@ -0,0 +1,76 @@ +#pragma once +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/io/QueryParams.h" +#include "lib/io/URL.h" +#include +#include +#include +#include + +namespace bts::md::binance { + +/** + * @brief The parameters associated with a binance depth stream + */ +class BinanceDepthStreamParams { + public: + BinanceDepthStreamParams() = default; + explicit BinanceDepthStreamParams( + const api::md::binance::BinanceDepthStreamParams ¶ms); + + const std::vector &symbols() const; + + template + static io::QueryParams query_params(const Container ¶ms); + + io::URL &stream_url(); + const io::URL &stream_url() const; + + io::URL &snapshot_url(); + const io::URL &snapshot_url() const; + + io::URL *snapshot_url(const std::string &symbol); + const io::URL *snapshot_url(const std::string &symbol) const; + + std::string symbol_stream_name(const std::string &symbol) const; + + std::uint32_t &num_levels(); + std::uint32_t num_levels() const; + + static std::string live_subscribe_request_body( + std::size_t send_id, const std::vector &symbols); + + private: + std::vector symbols_; + io::URL stream_url_; + io::URL snapshot_url_; + std::unordered_map snapshot_urls_; + std::uint32_t num_levels_; +}; + +bool operator==( + const BinanceDepthStreamParams &lhs, const BinanceDepthStreamParams &rhs); +bool operator!=( + const BinanceDepthStreamParams &lhs, const BinanceDepthStreamParams &rhs); + +std::ostream &operator<<( + std::ostream &out, const BinanceDepthStreamParams &stream_params) noexcept; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +io::QueryParams BinanceDepthStreamParams::query_params( + const Container ¶ms) { + io::QueryParams rv; + if (params.empty()) { + return rv; + } + auto streams = ranges::transform_view( + params, [](const auto &p) { return BinanceDepthStreamParams(p); }); + rv.try_emplace("streams", fmt::format("{}", fmt::join(streams, "/"))); + return rv; +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthStreamSite.cpp b/src/lib/md/binance/BinanceDepthStreamSite.cpp new file mode 100644 index 000000000..dabddedf7 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamSite.cpp @@ -0,0 +1,75 @@ +#include "BinanceDepthStreamSite.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/domain/SecurityID.h" +#include "lib/domain/SecurityResolver.h" +#include "lib/domain/Venue.h" +#include "lib/io/URL.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/MarketDataListenerData.h" +#include "lib/md/MarketDataListenerID.h" +#include "lib/md/binance/BinanceDepthStreamSiteKey.h" +#include "lib/md/binance/BinanceDiffDepthSubscription.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/utils/ContainsKey.h" +#include "lib/utils/bts_assert.h" +#include +#include + +namespace bts::md::binance { + +BinanceDepthStreamSite::BinanceDepthStreamSite( + BinanceDepthStreamSiteKey site_key, + std::unordered_map *ref_counts_ptr, + std::unordered_map + *listeners_ptr) + : site_key_(std::move(site_key)), ref_counts_ptr_(ref_counts_ptr), + listeners_ptr_(listeners_ptr) {} + +std::unordered_map & +BinanceDepthStreamSite::ref_counts() { + return *ref_counts_ptr_; +} + +const std::unordered_map & +BinanceDepthStreamSite::ref_counts() const { + return *ref_counts_ptr_; +} + +std::unordered_map & +BinanceDepthStreamSite::listeners() { + return *listeners_ptr_; +} + +const std::unordered_map & +BinanceDepthStreamSite::listeners() const { + return *listeners_ptr_; +} + +void BinanceDepthStreamSite::connect() { + auto &b = binance_.emplace(site_key_.params); + // (re)bind the callback + b.on_depth_changed().bind<&BinanceDepthStreamSite::fwd_on_depth_changed_>( + *this); + b.connect(); +} + +void BinanceDepthStreamSite::ensure_connect_() { + if (!binance_) { + connect(); + } +} + +BinanceDiffDepthSubscription::OnDepthChanged & +BinanceDepthStreamSite::on_depth_changed() { + return on_depth_changed_proxy_; +} + +void BinanceDepthStreamSite::fwd_on_depth_changed_( + const std::string &symbol, + bts::md::binance::BinanceDiffDepthUpdate update) { + on_depth_changed_proxy_(symbol, update); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthStreamSite.h b/src/lib/md/binance/BinanceDepthStreamSite.h new file mode 100644 index 000000000..0f70e7db7 --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamSite.h @@ -0,0 +1,128 @@ +#pragma once +#include "BinanceDepthStreamSiteKey.h" +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/domain/SecurityID.h" +#include "lib/domain/SecurityResolver.h" +#include "lib/domain/Venue.h" +#include "lib/io/URL.h" +#include "lib/logging/logging.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/MarketDataListenerData.h" +#include "lib/md/MarketDataListenerID.h" +#include "lib/md/binance/BinanceDiffDepthSubscription.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include "lib/utils/ContainsKey.h" +#include "lib/utils/bts_assert.h" +#include +#include + +namespace bts::md { +// struct MarketDataListenerData; +} // namespace bts::md + +namespace bts::md::binance { + +class BinanceDepthStreamSite { + public: + BinanceDepthStreamSite() = default; + BinanceDepthStreamSite( + BinanceDepthStreamSiteKey site_key, + std::unordered_map *ref_counts_ptr, + std::unordered_map + *listeners_ptr); + + std::unordered_map &ref_counts(); + const std::unordered_map & + ref_counts() const; + + std::unordered_map & + listeners(); + const std::unordered_map & + listeners() const; + + void connect(); + + template > + void subscribe(MarketDataListenerID listener_id, const Symbols &symbols); + + template > + void unsubscribe(MarketDataListenerID listener_id, const Symbols &symbols); + + BinanceDiffDepthSubscription::OnDepthChanged &on_depth_changed(); + + private: + BinanceDepthStreamSiteKey site_key_; + std::unordered_map *ref_counts_ptr_ = + nullptr; + std::unordered_map + *listeners_ptr_ = nullptr; + std::optional binance_ = std::nullopt; + // Use a proxy so the internal connection, `binance_`, can be changed + // (disposed and recreated) without unbinding the existing callback. + BinanceDiffDepthSubscription::OnDepthChanged on_depth_changed_proxy_; + + void ensure_connect_(); + void fwd_on_depth_changed_( + const std::string &symbol, + bts::md::binance::BinanceDiffDepthUpdate update); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +void BinanceDepthStreamSite::subscribe( + MarketDataListenerID listener_id, const Symbols &symbols) { + bts_assert(listener_id.value() != 0); + bts_assert(listeners_ptr_); + auto &ld = listeners()[listener_id]; + for (const auto &sym : symbols) { + auto sid = + domain::SecurityResolver::symbol_to_id(domain::Venue::Binance, sym); + bts_assert_msgf( + ld.securities.insert(sid).second, + "Cannot subscribe. Listener already subscribed to sec. sid: " + "{}; sym: {}", + sym, sid); + if (ref_counts().try_emplace(sid, 0).first->second++ == 0) { + ensure_connect_(); + // first subscription for this symbol + binance_->add_symbol(sym); + } + } +} + +template +void BinanceDepthStreamSite::unsubscribe( + MarketDataListenerID listener_id, const Symbols &symbols) { + bts_assert(listener_id.value() != 0); + bts_assert(listeners_ptr_); + bts_assert(listeners_ptr_->find(listener_id) != listeners_ptr_->end()); + auto &ld = listeners()[listener_id]; + LOG(md, bts::Diag, "Unsubscribing {} symbols for listener {} on site {}", + symbols.size(), listener_id); + for (const auto &sym : symbols) { + auto sid = + domain::SecurityResolver::symbol_to_id(domain::Venue::Binance, sym); + bts_assert_msgf( + ld.securities.erase(sid) == 1, + "Cannot unsubscribe. Listener not subscribed to sec. sid: {}; " + "sym: {}", + sid, sym); + auto rc_it = ref_counts().find(sid); + bts_assert_msg( + rc_it != ref_counts().end(), + "Inter-listener security subscription ref count out of sync " + "with listener's subscribed securities."); + if (--rc_it->second == 0) { + // last subscription for this symbol + ref_counts().erase(rc_it); + binance_->remove_symbol(sym); + } + } +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDepthStreamSiteKey.cpp b/src/lib/md/binance/BinanceDepthStreamSiteKey.cpp new file mode 100644 index 000000000..5e630cd7e --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamSiteKey.cpp @@ -0,0 +1,41 @@ +#include "BinanceDepthStreamSiteKey.h" +#include "lib/core/HashPhaser.h" + +namespace bts::md::binance { + +const io::URL &BinanceDepthStreamSiteKey::stream_url() const { + return params.stream_url(); +} + +const io::URL &BinanceDepthStreamSiteKey::snapshot_url() const { + return params.snapshot_url(); +} + +bool operator==( + const BinanceDepthStreamSiteKey &lhs, + const BinanceDepthStreamSiteKey &rhs) { + if (lhs.stream_url() != rhs.stream_url()) { + return false; + } + if (lhs.snapshot_url() != rhs.snapshot_url()) { + return false; + } + return true; +} + +bool operator!=( + const BinanceDepthStreamSiteKey &lhs, + const BinanceDepthStreamSiteKey &rhs) { + return !(lhs == rhs); +} + +} // namespace bts::md::binance + +namespace std { + +std::size_t hash::operator()( + const bts::md::binance::BinanceDepthStreamSiteKey &k) const { + return bts::core::HashPhaser::auto_phase(k.stream_url(), k.snapshot_url()); +} + +} // namespace std diff --git a/src/lib/md/binance/BinanceDepthStreamSiteKey.h b/src/lib/md/binance/BinanceDepthStreamSiteKey.h new file mode 100644 index 000000000..209bacc5d --- /dev/null +++ b/src/lib/md/binance/BinanceDepthStreamSiteKey.h @@ -0,0 +1,39 @@ +#pragma once +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/domain/SecurityID.h" +#include "lib/io/URL.h" +#include "lib/md/binance/BinanceMarketDataSubscription.h" +#include + +namespace bts::md::binance { + +class BinanceDepthStreamSiteKey { + public: + BinanceDepthStreamSiteKey() = default; + explicit BinanceDepthStreamSiteKey( + const api::md::binance::BinanceDepthStreamParams ¶ms) + : params(params) {} + + binance::BinanceDepthStreamParams params; + + const io::URL &stream_url() const; + const io::URL &snapshot_url() const; +}; + +bool operator==( + const BinanceDepthStreamSiteKey &lhs, const BinanceDepthStreamSiteKey &rhs); + +bool operator!=( + const BinanceDepthStreamSiteKey &lhs, const BinanceDepthStreamSiteKey &rhs); + +} // namespace bts::md::binance + +namespace std { + +template <> +struct hash { + std::size_t operator()( + const bts::md::binance::BinanceDepthStreamSiteKey &k) const; +}; + +} // namespace std diff --git a/src/lib/md/binance/BinanceDiffDepthSubscription.cpp b/src/lib/md/binance/BinanceDiffDepthSubscription.cpp new file mode 100644 index 000000000..69964a3ff --- /dev/null +++ b/src/lib/md/binance/BinanceDiffDepthSubscription.cpp @@ -0,0 +1,231 @@ +#include "BinanceDiffDepthSubscription.h" +#include "BinanceDepthBootstrapper.h" +#include "BinanceDepthSnapshot.h" +#include "BinanceDepthStreamParams.h" +#include "BinanceDiffDepthUpdate.h" +#include "BinanceWebsocketStreamDemuxer.h" +#include "lib/io/http/HTTPClient.h" +#include "lib/io/http/HTTPRequest.h" +#include "lib/io/http/HTTPResponse.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/io/websocket/WebsocketClientConfiguration.h" +#include "lib/logging/logging.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/binance/BinanceDepthStreamParams.h" +#include "server/sparkd/cmds/spartan/system/Delegate.h" +#include +#include +#include +#include +#include + +namespace bts::md::binance { + +static std::string get_stream_name(const std::string &symbol) { + return fmt::format("{}@depth", symbol); +} + +struct DiffDepthReq { + std::string symbol; + BinanceDepthBootstrapper bootstrapper; + + DiffDepthReq() { + bootstrapper.on_depth_changed().bind<&DiffDepthReq::on_depth_changed>( + *this); + } + + DiffDepthReq(const DiffDepthReq &) = delete; + DiffDepthReq(DiffDepthReq &&) noexcept = default; + DiffDepthReq &operator=(const DiffDepthReq &) = delete; + DiffDepthReq &operator=(DiffDepthReq &&) noexcept = default; + ~DiffDepthReq() = default; + + BinanceDiffDepthSubscription::OnDepthChanged *mux_callback; + + void on_depth_changed(const BinanceDiffDepthUpdate &upd) { + if (mux_callback) { + (*mux_callback)(symbol, upd); + } + } +}; + +struct BinanceDiffDepthSubscription::PImpl { + BinanceDepthStreamParams params; + bts::io::http::HTTPClient http_client; + std::optional socket; + std::unordered_map depth_reqs; + // Listens directly to the socket, and demuxes book updates by symbol. + // (invokes a delegate with args for the symbol and book-update itself). + BinanceWebsocketStreamDemuxer demuxer; + // Once connected, the websocket accepts live subscribe/unsubscribe requests. + // Requests are json strings with 3 params, one of which is the send_id. + // It's only purpose is to associate a response with a request. + // { + // "method": <"SUBSCRIBE" | "UNSUBSCRIBE">, + // "params": [ + // , + // , + // + // ], + // "send_id": + // } + std::uint64_t send_id_counter; + + OnDepthChanged on_depth_changed; + bool is_connected = false; + + DiffDepthReq &subscribe_symbol(const std::string &symbol) { + auto [req_it, is_new] = depth_reqs.try_emplace(symbol); + auto &req = req_it->second; + if (!is_new) { + return req; + } + + auto &cb = + demuxer.add_handler(get_stream_name(symbol)); + cb.bind<&BinanceDepthBootstrapper::on_diff_update>(req.bootstrapper); + req.symbol = symbol; + req.mux_callback = &on_depth_changed; + if (!socket.has_value()) { + return req; + } + + // live subscribe + auto send_id = send_id_counter++; + auto req_body = BinanceDepthStreamParams::live_subscribe_request_body( + send_id, {symbol}); + LOG(md, Info, "Subscribing {} depth", symbol); + socket.value().send_message(io::websocket::WebsocketMessage{ + send_id, req_body.c_str(), req_body.size()}); + return req; + } + + void unsubscribe_symbol(const std::string &symbol) { + if (!socket.has_value()) { + return; + } + auto it = depth_reqs.find(symbol); + if (it == depth_reqs.end()) { + return; + } + depth_reqs.erase(it); + + // live unsubscribe + auto stream_name = get_stream_name(symbol); + nlohmann::json j; + auto send_id = send_id_counter++; + j["method"] = "UNSUBSCRIBE"; + j["params"] = std::vector{stream_name}; + j["id"] = send_id; + std::stringstream payload_ss; + payload_ss >> j; + auto payload = payload_ss.str(); + LOG(md, Info, "Unsubscribing {} depth", symbol); + socket.value().send_message(io::websocket::WebsocketMessage{ + send_id, payload.c_str(), payload.size()}); + } +}; + +BinanceDiffDepthSubscription::BinanceDiffDepthSubscription() + : me_(std::make_unique()) {} + +BinanceDiffDepthSubscription::BinanceDiffDepthSubscription( + BinanceDepthStreamParams params) + : me_(std::make_unique()) { + me_->params = std::move(params); +} + +BinanceDiffDepthSubscription::BinanceDiffDepthSubscription( + BinanceDiffDepthSubscription &&) noexcept = default; + +BinanceDiffDepthSubscription &BinanceDiffDepthSubscription::operator=( + BinanceDiffDepthSubscription &&) noexcept = default; + +BinanceDiffDepthSubscription::~BinanceDiffDepthSubscription() { + if (me_->socket) { + LOG(md, bts::Info, "Disconnecting socket. url: {}", + me_->params.stream_url()); + } +} + +BinanceDiffDepthSubscription::OnDepthChanged & +BinanceDiffDepthSubscription::on_depth_changed() { + return me_->on_depth_changed; +} + +void BinanceDiffDepthSubscription::connect() { + if (me_->is_connected) { + return; + } + me_->is_connected = true; + // This implementation is a little tricky. Multiple depth update streams (1 + // per symbol) come in on a single websocket, and each stream must be + // bootstrapped independently. Market data flow is as follows + // + // 1) demux updates by symbol: + // * The demuxer gets data directly from the websocket, and invokes + // per-symbol callbacks. + // + // 2) bootstrap incremental stream for each symbol: + // * The bootstrappers bind to the demuxed callbacks, and buffer the + // updates until it can synchronize them with a depth snapshot (it gets + // the snapshot via http get req). + // + // 3) send output: + // * Each DepthReq (one per symbol) gets a seamless incremental update + // stream from its bootstrapper, and forwards them to this class's + // outgoing delegate along with its symbol. + + // Initialize the per-symbol DepthReq's + for (const auto &sym : me_->params.symbols()) { + me_->subscribe_symbol(sym); + } + + // Now that the DepthReq's are bound to the demuxer, connect the demuxer to + // the websocket. + auto conf = io::websocket::WebsocketClientConfiguration::from_url( + me_->params.stream_url()); + me_->socket.emplace(conf, &me_->demuxer).start(); + + // Finally, give the per-symbol bootstrappers snapshots of their respective + // symbol's depth. This is deliberately done after the bootstrappers are + // connected to the websocket, so the snapshots are less likely to be stale. + // + // TODO: The proper way to bootstrap each stream would be to pass the + // listeners the snapshot as soon as it is received from the exchange, + // then search the buffered updates for the first update after the snapshot. + // + // If this update is found, merge it with all subsequent buffered updates, + // feed the listener the result, then continue to feed the listener with + // updates as they arrive. + // + // If this update is not found, get a new snapshot (if the + // buffered updates are ahead of the current snapshot), and try to bootstrap + // the sequence again. In the unlikely event that the snapshot is ahead of + // the buffer, simply wait for the next update before attempting to bootstrap + // the sequence again. + + for (const auto &sym : me_->params.symbols()) { + io::http::HTTPRequest req; + req.url() = bts::io::URL(*me_->params.snapshot_url(sym)); + io::http::HTTPResponse res = me_->http_client.get(req); + std::stringstream res_str; + res_str << res; + LOG(md, bts::Info, "Received depth snapshot from {}:\n\n{}\n", req.url(), + res_str.str()); + + nlohmann::json j = nlohmann::json::parse(res.body()); + auto snap = j.get(); + me_->depth_reqs[sym].bootstrapper.on_snapshot(snap); + } +} + +void BinanceDiffDepthSubscription::add_symbol(const std::string &symbol) { + me_->subscribe_symbol(symbol); +} + +void BinanceDiffDepthSubscription::remove_symbol(const std::string &symbol) { + me_->unsubscribe_symbol(symbol); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDiffDepthSubscription.h b/src/lib/md/binance/BinanceDiffDepthSubscription.h new file mode 100644 index 000000000..db125ea08 --- /dev/null +++ b/src/lib/md/binance/BinanceDiffDepthSubscription.h @@ -0,0 +1,44 @@ +#pragma once +#include "lib/io/URL.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "server/sparkd/cmds/spartan/system/Delegate.h" +#include + +namespace bts::api::md { +// class BinanceDepthStreamParams; +} + +namespace bts::md::binance { + +class BinanceDepthStreamParams; + +class BinanceDiffDepthSubscription { + public: + BinanceDiffDepthSubscription(); + explicit BinanceDiffDepthSubscription( + bts::md::binance::BinanceDepthStreamParams params); + + BinanceDiffDepthSubscription(const BinanceDiffDepthSubscription &) = delete; + BinanceDiffDepthSubscription(BinanceDiffDepthSubscription &&) noexcept; + BinanceDiffDepthSubscription &operator=( + const BinanceDiffDepthSubscription &) = delete; + BinanceDiffDepthSubscription &operator=( + BinanceDiffDepthSubscription &&) noexcept; + + ~BinanceDiffDepthSubscription(); + + void connect(); + void add_symbol(const std::string &symbol); + void remove_symbol(const std::string &symbol); + + using OnDepthChanged = spartan::Delegate; + + OnDepthChanged &on_depth_changed(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDiffDepthUpdate.cpp b/src/lib/md/binance/BinanceDiffDepthUpdate.cpp new file mode 100644 index 000000000..c97b9bd16 --- /dev/null +++ b/src/lib/md/binance/BinanceDiffDepthUpdate.cpp @@ -0,0 +1,147 @@ +#include "BinanceDiffDepthUpdate.h" +#include "BinanceBookLevelComp.h" +#include "BinanceDepthSnapshot.h" +#include "lib/md/binance/BinanceBookLevel.h" +#include + +namespace bts::md::binance { + +static void merge_side( + std::vector &target, + const std::vector &changes, + domain::Side side) { + BinanceBookLevelComp comp(side); + // Don't assume book level changes are sorted (they should be sorted, but + // the code is more resilient this way). + for (const auto &ch : changes) { + auto it = std::lower_bound(target.begin(), target.end(), ch.price, comp); + if (it == target.end() || it->price != ch.price) { + // Price doesn't match that of an existing level, so it cannot be a + // 'remove' op. + bts_assert(it->quantity > 0); + target.insert(it, ch); + continue; + } + // Price does match an existing level. If quantity is 0, then this is a + // 'remove' op, otherwise it's an 'update.' + if (ch.quantity == 0) { + target.erase(it); + continue; + } + it->quantity = ch.quantity; + } +} + +static void apply_changes( + domain::Side side, + domain::BookSide &bs, + const std::vector &changes) { + auto cursor = bs.begin(); + auto it = changes.begin(); + domain::BookLevelComp cmp(side); + for (; it != changes.end(); it++) { + // Create price instance from it->price to support cases where + // it->price is not of type `Price` (e.g., if it is a double). Treat + // it->quantity in the same manner. + domain::Price ch_price(it->price); + cursor = std::lower_bound(cursor, bs.end(), ch_price, cmp); + if (it->quantity == 0) { + if (cursor != bs.end() && cursor->price == ch_price) { + bs.erase(cursor); + } + continue; + } + domain::Quantity ch_quantity(it->quantity); + if (cursor->price == ch_price) { + cursor->total_quantity = ch_quantity; + cursor->direct_quantity = ch_quantity; + } else { + bs.insert( + cursor, domain::BookLevel{ch_price, ch_quantity, ch_quantity, 0}); + } + } +} + +static void strip_side_non_changes( + const std::vector &origin, + std::vector &changed_levels, + domain::Side side) { + BinanceBookLevelComp comp(side); + if (changed_levels.empty()) { + return; + } + auto it = changed_levels.begin(); + for (const auto &bl : origin) { + it = std::lower_bound(it, changed_levels.end(), bl.price, comp); + if (it == changed_levels.end()) { + return; + } + it = *it == bl ? changed_levels.erase(it) : it + 1; + } +} + +bool BinanceDiffDepthUpdate::has_changes() const { + return !changed_bids.empty() || !changed_asks.empty(); +} + +void BinanceDiffDepthUpdate::merge(const BinanceDiffDepthUpdate &update) { + update.validate(); + bts_assert(update.first_update_id >= last_update_id); + merge_side(changed_bids, update.changed_bids, domain::Side::Buy); + merge_side(changed_asks, update.changed_asks, domain::Side::Sell); +} + +bool BinanceDiffDepthUpdate::is_before_event(std::size_t event_id) const { + return first_update_id <= event_id; +} + +bool BinanceDiffDepthUpdate::is_after_event(std::size_t event_id) const { + return last_update_id > event_id; +} + +bool BinanceDiffDepthUpdate::includes_event(std::size_t event_id) const { + return is_before_event(event_id + 1) && is_after_event(event_id); +} + +void BinanceDiffDepthUpdate::apply_to_book(domain::Book &book) const { + apply_changes(domain::Side::Buy, book[domain::Side::Buy], changed_bids); + apply_changes(domain::Side::Sell, book[domain::Side::Sell], changed_asks); +} + +void BinanceDiffDepthUpdate::strip_non_changes( + const BinanceDepthSnapshot &origin) { + strip_side_non_changes(origin.bids, changed_bids, domain::Side::Buy); + strip_side_non_changes(origin.asks, changed_asks, domain::Side::Sell); +} + +void BinanceDiffDepthUpdate::validate() const { + bts_assert(last_update_id >= first_update_id); +} + +void from_json(const nlohmann::json &j, BinanceDiffDepthUpdate &upd) { + j["e"].get_to(upd.event_type); + j["E"].get_to(upd.event_time); + j["s"].get_to(upd.symbol); + j["U"].get_to(upd.first_update_id); + j["u"].get_to(upd.last_update_id); + j["b"].get_to(upd.changed_bids); + j["a"].get_to(upd.changed_asks); +} + +void to_json(nlohmann::json &j, const BinanceDiffDepthUpdate &upd) { + j["e"] = upd.event_type; + j["E"] = upd.event_time; + j["s"] = upd.symbol; + j["U"] = upd.first_update_id; + j["u"] = upd.last_update_id; + j["b"] = upd.changed_bids; + j["a"] = upd.changed_asks; +} + +BinanceDiffDepthUpdate &operator+=( + BinanceDiffDepthUpdate &augend, const BinanceDiffDepthUpdate &addend) { + augend.merge(addend); + return augend; +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceDiffDepthUpdate.h b/src/lib/md/binance/BinanceDiffDepthUpdate.h index ed66aa9c6..9b4b5f9f5 100644 --- a/src/lib/md/binance/BinanceDiffDepthUpdate.h +++ b/src/lib/md/binance/BinanceDiffDepthUpdate.h @@ -1,11 +1,15 @@ #pragma once #include "BinanceBookLevel.h" +#include "lib/domain/Book.h" #include +#include #include #include namespace bts::md::binance { +class BinanceDepthSnapshot; + class BinanceDiffDepthUpdate { public: // json name: e @@ -24,6 +28,23 @@ class BinanceDiffDepthUpdate { std::vector changed_bids; // json name: a std::vector changed_asks; + + bool has_changes() const; + + bool is_before_event(std::size_t event_id) const; + bool is_after_event(std::size_t event_id) const; + bool includes_event(std::size_t event_id) const; + + void apply_to_book(domain::Book &book) const; + void merge(const BinanceDiffDepthUpdate &update); + void strip_non_changes(const BinanceDepthSnapshot &origin); + void validate() const; }; +void from_json(const nlohmann::json &j, BinanceDiffDepthUpdate &upd); +void to_json(nlohmann::json &j, const BinanceDiffDepthUpdate &upd); + +BinanceDiffDepthUpdate &operator+=( + BinanceDiffDepthUpdate &lhs, const BinanceDiffDepthUpdate &rhs); + } // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceMarketDataSubscription.cpp b/src/lib/md/binance/BinanceMarketDataSubscription.cpp new file mode 100644 index 000000000..a9baec547 --- /dev/null +++ b/src/lib/md/binance/BinanceMarketDataSubscription.cpp @@ -0,0 +1,72 @@ +#include "BinanceMarketDataSubscription.h" +#include "BinanceDepthSnapshot.h" +#include "BinanceDiffDepthSubscription.h" +#include "BinanceWebsocketStreamDemuxer.h" +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include "lib/api/md/binance/BinanceMarketDataSubscriptionParams.pb.h" +#include "lib/domain/Book.h" +#include "lib/io/URL.h" +#include "lib/io/http/HTTPClient.h" +#include "lib/io/http/HTTPRequest.h" +#include "lib/io/http/HTTPResponse.h" +#include "lib/io/websocket/IWebsocketListener.h" +#include "lib/io/websocket/WebsocketClient.h" +#include "lib/io/websocket/WebsocketClientConfiguration.h" +#include "lib/io/websocket/WebsocketError.h" +#include "lib/io/websocket/WebsocketMessage.h" +#include "lib/logging/logging.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/md/binance/BinanceDepthBootstrapper.h" +#include "lib/md/binance/BinanceDepthStreamParams.h" +#include "lib/md/binance/BinanceDiffDepthUpdate.h" +#include "lib/utils/bts_assert.h" +#include +#include +#include +#include + +namespace bts::md::binance { + +using json = nlohmann::json; + +struct BinanceMarketDataSubscription::PImpl { + IMarketDataListener *listener; + api::md::binance::BinanceMarketDataSubscriptionParams params; + io::URL url; + std::vector depth_subs; + std::unordered_map books; + + void on_depth_changed( + const std::string &symbol, const BinanceDiffDepthUpdate &update) { + auto &book = books[symbol]; + update.apply_to_book(book); + bts_assert(listener != nullptr); + // TODO: set the security id + listener->on_book(book); + } +}; + +BinanceMarketDataSubscription::BinanceMarketDataSubscription( + IMarketDataListener *listener, + const api::md::binance::BinanceMarketDataSubscriptionParams ¶ms) + : me_(std::make_unique()) { + me_->listener = listener; + me_->params = params; + for (const auto &stream : me_->params.depth_streams()) { + auto &depth_sub = + me_->depth_subs.emplace_back(BinanceDepthStreamParams(stream)); + depth_sub.on_depth_changed() + .bind<&BinanceMarketDataSubscription::PImpl::on_depth_changed>(*me_); + depth_sub.connect(); + } +} + +BinanceMarketDataSubscription::BinanceMarketDataSubscription( + BinanceMarketDataSubscription &&other) = default; + +BinanceMarketDataSubscription &BinanceMarketDataSubscription::operator=( + BinanceMarketDataSubscription &&) = default; + +BinanceMarketDataSubscription::~BinanceMarketDataSubscription() = default; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceMarketDataSubscription.h b/src/lib/md/binance/BinanceMarketDataSubscription.h new file mode 100644 index 000000000..f323d9876 --- /dev/null +++ b/src/lib/md/binance/BinanceMarketDataSubscription.h @@ -0,0 +1,45 @@ +#pragma once +#include "BinanceDepthStreamParams.h" +#include "lib/api/md/MarketDataSubscriptionParams.pb.h" +#include +#include +#include +#include + +namespace bts::api::md::binance { +class BinanceMarketDataSubscriptionParams; +} + +namespace bts::md { +class IMarketDataListener; +} + +namespace bts::md::binance { + +struct BinanceMarketDataSubscription { + BinanceMarketDataSubscription() = default; + + explicit BinanceMarketDataSubscription( + IMarketDataListener *listener, + const api::md::binance::BinanceMarketDataSubscriptionParams ¶ms); + + BinanceMarketDataSubscription(const BinanceMarketDataSubscription &) = + delete; + + BinanceMarketDataSubscription &operator=( + const BinanceMarketDataSubscription &) = delete; + + BinanceMarketDataSubscription(BinanceMarketDataSubscription &&other); + BinanceMarketDataSubscription &operator=(BinanceMarketDataSubscription &&); + + ~BinanceMarketDataSubscription(); + + private: + struct PImpl; + std::unique_ptr me_; + + void connect(); + void connect(const BinanceDepthStreamParams &depth_stream); +}; + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceStreamListener.h b/src/lib/md/binance/BinanceStreamListener.h new file mode 100644 index 000000000..21a1c71e0 --- /dev/null +++ b/src/lib/md/binance/BinanceStreamListener.h @@ -0,0 +1,54 @@ +#pragma once +#include "lib/io/websocket/IWebsocketListener.h" +#include "lib/io/websocket/WebsocketMessage.h" +#include "server/sparkd/cmds/spartan/system/Delegate.h" +#include +#include + +namespace bts::md::binance { + +class BinanceStreamListenerBase { + public: + BinanceStreamListenerBase() = default; + + BinanceStreamListenerBase(const BinanceStreamListenerBase &) noexcept = + default; + BinanceStreamListenerBase(BinanceStreamListenerBase &&) noexcept = default; + BinanceStreamListenerBase &operator=( + const BinanceStreamListenerBase &) noexcept = default; + BinanceStreamListenerBase &operator=(BinanceStreamListenerBase &&) noexcept = + default; + + virtual ~BinanceStreamListenerBase() {} + + virtual void on_data(const std::string &data) = 0; +}; + +template +class BinanceStreamListener : public BinanceStreamListenerBase { + public: + ~BinanceStreamListener() override = default; + void on_data(const std::string &data) override; + void on_data(io::websocket::WebsocketMessage &message); + spartan::Delegate on_parsed_data; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +void BinanceStreamListener::on_data( + io::websocket::WebsocketMessage &message) { + on_data(std::string(message.data, message.data_size)); +} + +template +void BinanceStreamListener::on_data(const std::string &data) { + nlohmann::json j(data); + T parsed_data; + j.get_to(parsed_data); + on_parsed_data(parsed_data); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceWebsocketStreamDemuxer.cpp b/src/lib/md/binance/BinanceWebsocketStreamDemuxer.cpp new file mode 100644 index 000000000..58dcf2d52 --- /dev/null +++ b/src/lib/md/binance/BinanceWebsocketStreamDemuxer.cpp @@ -0,0 +1,50 @@ +#include "BinanceWebsocketStreamDemuxer.h" +#include "lib/io/websocket/WebsocketError.h" +#include "lib/logging/logging.h" +#include + +namespace bts::md::binance { + +#define _LOG(level, msg_template, ...) \ + LOG(md, bts::level, "BinanceWebsocketStreamDemuxer " msg_template, \ + __VA_ARGS__) + +#define _LOGFN(level) _LOG(level, "{}", std::string(__FUNCTION__)) +#define _LOGFNF(level, msg_template, ...) \ + _LOG(level, "{}. " msg_template, std::string(__FUNCTION__), __VA_ARGS__) + +void BinanceWebsocketStreamDemuxer::on_connection_established() { + _LOGFN(Info); +} + +void BinanceWebsocketStreamDemuxer::on_error( + const io::websocket::WebsocketError &error) { + _LOGFNF(Error, "{}", error); +} + +void BinanceWebsocketStreamDemuxer::on_write_complete(std::size_t message_id) { + _LOGFNF(Info, "message_id: {}", message_id); +} + +void BinanceWebsocketStreamDemuxer::on_timer() { _LOGFN(Diag); } + +void BinanceWebsocketStreamDemuxer::on_connection_closed(bool gracefully) { + _LOGFNF(Info, "gracefully: {}", gracefully); +} + +void BinanceWebsocketStreamDemuxer::on_data( + io::websocket::WebsocketMessage &msg) { + _LOGFNF(Diag, "data: {}", msg); + nlohmann::json j(std::string(msg.data, msg.data_size)); + auto stream_name = j["stream"].get(); + auto listener_it = listeners_.find(stream_name); + if (listener_it == listeners_.end()) { + _LOG(Error, "received data from unknown stream '{}'", stream_name); + return; + } + auto &listener = *listener_it->second; + auto payload = j["data"].get(); + listener.on_data(payload); +} + +} // namespace bts::md::binance diff --git a/src/lib/md/binance/BinanceWebsocketStreamDemuxer.h b/src/lib/md/binance/BinanceWebsocketStreamDemuxer.h new file mode 100644 index 000000000..37c41ea00 --- /dev/null +++ b/src/lib/md/binance/BinanceWebsocketStreamDemuxer.h @@ -0,0 +1,51 @@ +#pragma once +#include "BinanceStreamListener.h" +#include "lib/io/websocket/IWebsocketListener.h" +#include "system/Delegate.h" +#include +#include + +namespace bts::md::binance { + +class BinanceWebsocketStreamDemuxer : public io::websocket::IWebsocketListener { + public: + BinanceWebsocketStreamDemuxer() = default; + BinanceWebsocketStreamDemuxer(const BinanceWebsocketStreamDemuxer &) = + delete; + BinanceWebsocketStreamDemuxer(BinanceWebsocketStreamDemuxer &&) noexcept = + default; + BinanceWebsocketStreamDemuxer &operator=( + const BinanceWebsocketStreamDemuxer &) = delete; + BinanceWebsocketStreamDemuxer &operator=( + BinanceWebsocketStreamDemuxer &&) noexcept = default; + ~BinanceWebsocketStreamDemuxer() = default; + + void on_connection_established() override; + void on_error(const io::websocket::WebsocketError &error) override; + void on_write_complete(std::size_t message_id) override; + void on_data(io::websocket::WebsocketMessage &msg) override; + void on_timer() override; + void on_connection_closed(bool gracefully) override; + + template + spartan::Delegate &add_handler( + const std::string &stream_name); + + private: + std::unordered_map> + listeners_; +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +spartan::Delegate &BinanceWebsocketStreamDemuxer::add_handler( + const std::string &stream_name) { + auto handler = std::make_shared>(); + listeners_[stream_name] = handler; + return handler->on_parsed_data; +} + +} // namespace bts::md::binance diff --git a/src/lib/md/listeners/LiveLadderPrinter.cpp b/src/lib/md/listeners/LiveLadderPrinter.cpp new file mode 100644 index 000000000..dd4267608 --- /dev/null +++ b/src/lib/md/listeners/LiveLadderPrinter.cpp @@ -0,0 +1,71 @@ +#include "LiveLadderPrinter.h" +#include "lib/md/MarketDataError.h" +#include +#include + +namespace bts::md::listeners { + +template +static inline std::ostream &fmt_ladder( + Iter first, + Iter last, + std::function get_price, + std::function get_qty, + std::ostream &output, + bool reverse_incr = false) { + // + const uint32_t BOOK_COL_WIDTH = 12; + const uint32_t max_levels = 4; + uint32_t level = 0; + // + while (first != last) { + auto qty = get_qty(*first); + if (qty.value() == 0) + continue; + if (level++ == max_levels) + break; + output << std::setw(BOOK_COL_WIDTH) << qty << std::setw(BOOK_COL_WIDTH) + << get_price(*first) << std::endl; + if (reverse_incr) + first--; + else + first++; + } + return output; +} + +template +static inline std::ostream &fmt_ladder( + Iter first_bid, + Iter last_bid, + Iter first_ask, + Iter last_ask, + std::function get_price, + std::function get_qty, + std::ostream &output) { + fmt_ladder(last_ask, first_ask, get_price, get_qty, output, true); + if (first_bid != last_bid && get_qty(*first_bid).value() != 0) { + if (first_ask != last_ask && get_qty(*last_ask).value() != 0) + output << std::setw(24) << "---------------" << std::endl; + fmt_ladder(first_bid, last_bid, get_price, get_qty, output); + } + return output; +} + +void LiveLadderPrinter::on_book(const domain::Book &book) { + auto bids = book[domain::Side::Buy]; + auto asks = book[domain::Side::Sell]; + fmt_ladder( + bids.begin(), bids.end(), asks.begin(), asks.end(), + std::function( + [](const domain::BookLevel &bl) { return bl.price; }), + std::function( + [](const domain::BookLevel &bl) { return bl.total_quantity; }), + std::cout); +} + +void LiveLadderPrinter::on_error(const MarketDataError &error) { + LOG(md, bts::Error, "MarketDataError: {}", error); +} + +} // namespace bts::md::listeners diff --git a/src/lib/md/listeners/LiveLadderPrinter.h b/src/lib/md/listeners/LiveLadderPrinter.h new file mode 100644 index 000000000..06b6c47c9 --- /dev/null +++ b/src/lib/md/listeners/LiveLadderPrinter.h @@ -0,0 +1,12 @@ +#pragma once +#include "lib/md/MarketDataListener.h" + +namespace bts::md::listeners { + +class LiveLadderPrinter : public MarketDataListener { + public: + void on_book(const domain::Book &book) override; + void on_error(const MarketDataError &error) override; +}; + +} // namespace bts::md::listeners diff --git a/src/server/sparkd/cmds/crypto/BinanceDemo.cpp b/src/server/sparkd/cmds/crypto/BinanceDemo.cpp new file mode 100644 index 000000000..b6f4e0eab --- /dev/null +++ b/src/server/sparkd/cmds/crypto/BinanceDemo.cpp @@ -0,0 +1,44 @@ +#include "BinanceDemo.h" +#include "lib/config/config.h" +#include "lib/config/protos/CryptoConfig.pb.h" +#include "lib/md/MarketDataGateway.h" +#include "lib/md/MarketDataRegistration.h" +#include "lib/md/MarketDataSubscription.h" +#include "lib/md/listeners/LiveLadderPrinter.h" +#include "server/sparkd/cmds/spartan/utils/FileUtils.h" +#include + +namespace bts::cmds { + +struct BinanceDemo::PImpl { + std::vector subs; +}; + +BinanceDemo::BinanceDemo() : me_(std::make_unique()) { + char ssl_cert_file[] = "SSL_CERT_FILE=/etc/ssl/cert/ca-certificates.crt"; + putenv(ssl_cert_file); + md::MarketDataGateway gw; + md::listeners::LiveLadderPrinter ladder_printer; + auto crypto = config::get(); + for (const auto &sub_params : crypto.crypto_md()) { + me_->subs.emplace_back(sub_params); + md::MarketDataSubscription sub(sub_params); + switch (sub_params.VenueParams_case()) { + case api::md::MarketDataSubscriptionParams::kBinance: { + gw.register_listener(sub, &ladder_printer); + break; + } + default: + break; + } + } + const std::size_t n_loops = 16; + for (std::size_t n = 0; n < n_loops; n++) { + std::cout << "Main loop iter " << n + 1; + std::this_thread::sleep_for(std::chrono::seconds(5)); + } +} + +BinanceDemo::~BinanceDemo() = default; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/BinanceDemo.h b/src/server/sparkd/cmds/crypto/BinanceDemo.h new file mode 100644 index 000000000..b7de78026 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/BinanceDemo.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::cmds { + +class BinanceDemo { + public: + BinanceDemo(); + ~BinanceDemo(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/BinanceDemoCmd.cpp b/src/server/sparkd/cmds/crypto/BinanceDemoCmd.cpp new file mode 100644 index 000000000..e1777faf4 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/BinanceDemoCmd.cpp @@ -0,0 +1,20 @@ +#include "BinanceDemoCmd.h" +#include "BinanceDemo.h" +#include +#include + +namespace bts::cmds { + +struct BinanceDemoCmd::PImpl { + std::optional demo; +}; + +BinanceDemoCmd::BinanceDemoCmd() + : CLI::App("Display binance live depth", "binance-demo"), + me_(std::make_unique()) { + callback([this]() { me_->demo.emplace(); }); +} + +BinanceDemoCmd::~BinanceDemoCmd() = default; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/BinanceDemoCmd.h b/src/server/sparkd/cmds/crypto/BinanceDemoCmd.h new file mode 100644 index 000000000..c67be80c0 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/BinanceDemoCmd.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::cmds { + +class BinanceDemoCmd : public CLI::App { + public: + BinanceDemoCmd(); + ~BinanceDemoCmd(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/CryptoCmd.cpp b/src/server/sparkd/cmds/crypto/CryptoCmd.cpp new file mode 100644 index 000000000..cf0594e12 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/CryptoCmd.cpp @@ -0,0 +1,19 @@ +#include "CryptoCmd.h" +#include "BinanceDemoCmd.h" +#include + +namespace bts::cmds { + +struct CryptoCmd::Args { + // Placeholder for args +}; + +CryptoCmd::CryptoCmd() + : CLI::App("Execute commands for the new crypto system", "crypto"), + args_(std::make_unique()) { + add_subcommand(std::make_shared()); +} + +CryptoCmd::~CryptoCmd() = default; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/CryptoCmd.h b/src/server/sparkd/cmds/crypto/CryptoCmd.h new file mode 100644 index 000000000..c9a09bf9d --- /dev/null +++ b/src/server/sparkd/cmds/crypto/CryptoCmd.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::cmds { + +class CryptoCmd : public CLI::App { + public: + CryptoCmd(); + ~CryptoCmd(); + + private: + struct Args; + std::unique_ptr args_; +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index bb2b4e425..930deaac7 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -1,16 +1,15 @@ #include "lib/testing/catch_test_runner.h" #include "lib/utils/init_spark_lib.h" -#include - #include "server/sparkd/cmds/AdminReport.h" #include "server/sparkd/cmds/Benchmark.h" #include "server/sparkd/cmds/ConfigCheck.h" #include "server/sparkd/cmds/Md.h" #include "server/sparkd/cmds/QuickTest.h" #include "server/sparkd/cmds/Run.h" - #include "server/sparkd/cmds/Spartan.h" #include "server/sparkd/cmds/Web.h" +#include "server/sparkd/cmds/crypto/CryptoCmd.h" +#include using namespace bts; @@ -26,6 +25,7 @@ int main(int argc, char **argv) { app.require_subcommand(); app.add_subcommand(CLI::App_p(new cmds::AdminReport())); app.add_subcommand(CLI::App_p(new cmds::Benchmark())); + app.add_subcommand(CLI::App_p(new cmds::CryptoCmd())); app.add_subcommand(CLI::App_p(new cmds::ConfigCheck())); app.add_subcommand(CLI::App_p(new cmds::Md())); app.add_subcommand(CLI::App_p(new cmds::QuickTest())); From 6ca7d3904d68a1a646fa6dcb213f0a0c5a32ca22 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 24 Sep 2021 21:55:59 -0400 Subject: [PATCH 069/100] Make plugin.py use env python (not hardcoded path) --- src/lib/api/service_compiler/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/api/service_compiler/plugin.py b/src/lib/api/service_compiler/plugin.py index fa8b1f39d..2b8a7f73d 100755 --- a/src/lib/api/service_compiler/plugin.py +++ b/src/lib/api/service_compiler/plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import os, sys from collections import namedtuple From dccb50d2693b03b4732487e9259b350bab4201db Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 24 Sep 2021 21:57:30 -0400 Subject: [PATCH 070/100] fix build: Satisfy new compilers gcc10, clang12 --- src/lib/config/tests/config_tests.cpp | 2 +- src/lib/jetfix/connection/IConnection.h | 1 + src/lib/md/UserSymbol.h | 13 +++++++------ src/lib/md/test/md2_tests.cpp | 4 ++-- src/lib/orderman/events/MDRequestEvent.h | 5 +++++ src/lib/orderman/events/SettlementRequestEvent.h | 7 +++++++ .../algo/algo_orders/limit_cover/LimitCoverGate.h | 2 ++ .../spreader/quoter/QuoteLegDriver.cpp | 5 ++++- .../spreader/quoter/QuoteLegDriver.h | 3 +++ src/lib/utils/ConcurrentAppendCollection.h | 4 +++- src/lib/utils/TempDir.h | 2 +- src/lib/utils/bts_chrono.h | 1 + src/server/sparkd/cmds/AdminReport.cpp | 2 +- .../spartan/back_testing/common/security_parser.cpp | 4 ++-- .../feed_handler/detail/FeedHandler_Recovery.cpp | 2 +- .../cmds/spartan/gateway/PartyDetailsSetter.h | 1 + .../cmds/spartan/gateway/detail/IL3MsgFramer.h | 1 + src/server/sparkd/cmds/spartan/system/PCapReader.h | 1 + src/server/sparkd/position/import/DownloadWindow.h | 3 +++ 19 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib/config/tests/config_tests.cpp index 7e8867909..18a5632f3 100644 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib/config/tests/config_tests.cpp @@ -351,7 +351,7 @@ TEST_CASE("Configuration Tests", "[config]") { " \xA0 }" "} ", false); - } catch (const bts::config::ConfigurationException) { + } catch (const bts::config::ConfigurationException &) { parse_error = true; } REQUIRE(parse_error); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index 00e844614..ce680a7dd 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace bts { namespace trace { diff --git a/src/lib/md/UserSymbol.h b/src/lib/md/UserSymbol.h index dc8e8c6aa..842bffb4b 100644 --- a/src/lib/md/UserSymbol.h +++ b/src/lib/md/UserSymbol.h @@ -8,12 +8,13 @@ namespace md { // etc around it struct UserSymbol { - UserSymbol() : _symbol(), _exchange(), _type() {} + UserSymbol() = default; + UserSymbol(const std::string &s, api::Venue e, SecurityType t) : _symbol(s), _exchange(e), _type(t) {} - UserSymbol(const UserSymbol &other) - : _symbol(other._symbol), _exchange(other._exchange), - _type(other._type) {} + + UserSymbol(const UserSymbol &other) = default; + UserSymbol &operator=(const UserSymbol &other) = default; const std::string &symbol() const { return _symbol; } api::Venue exchange() const { return _exchange; } @@ -57,8 +58,8 @@ struct UserSymbol { private: std::string _symbol; - api::Venue _exchange; - SecurityType _type; + api::Venue _exchange = api::Venue::VENUE_UNSET; + SecurityType _type = SecurityType::SECURITYTYPE_UNSET; }; std::ostream &operator<<(std::ostream &os, const UserSymbol &sym); diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib/md/test/md2_tests.cpp index 4c902443f..fdc20aa90 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib/md/test/md2_tests.cpp @@ -227,7 +227,7 @@ class Co2Tests { SecurityIDRecorder idsvc{ {db, [&](ExchangeKey k) -> SecurityKey { - for (const auto fut : + for (const auto &fut : {f1handle->producer(), f2handle->producer()}) { if (k.value() == fut.security().numeric_id) return SecurityKey(fut.key()); @@ -2566,4 +2566,4 @@ TEST_CASE("IntPrice", "[md]") { } // namespace test } // namespace md } // namespace bts -#endif \ No newline at end of file +#endif diff --git a/src/lib/orderman/events/MDRequestEvent.h b/src/lib/orderman/events/MDRequestEvent.h index f04da5631..e88c453f2 100644 --- a/src/lib/orderman/events/MDRequestEvent.h +++ b/src/lib/orderman/events/MDRequestEvent.h @@ -17,11 +17,16 @@ class MDRequestEvent : public mercury::Event { MDRequestEvent(SecurityKey k, MDRequestType md_type) : security_key(k), md_type(md_type) {} + MDRequestEvent(const MDRequestEvent &other) { + *this = other; + } + MDRequestEvent &operator=(MDRequestEvent const &rhs) { security_key = rhs.security_key; md_type = rhs.md_type; return *this; } + SecurityKey security_key; MDRequestType md_type; }; diff --git a/src/lib/orderman/events/SettlementRequestEvent.h b/src/lib/orderman/events/SettlementRequestEvent.h index ec893c114..92c137235 100644 --- a/src/lib/orderman/events/SettlementRequestEvent.h +++ b/src/lib/orderman/events/SettlementRequestEvent.h @@ -11,11 +11,18 @@ namespace orderman { class SettlementRequestEvent : public mercury::Event { public: using SynopsisPolicy = mercury::CacheAll; + SettlementRequestEvent(SecurityKey k) : security_key(k) {} + + SettlementRequestEvent(const SettlementRequestEvent &other) { + *this = other; + } + SettlementRequestEvent &operator=(SettlementRequestEvent const &rhs) { security_key = rhs.security_key; return *this; } + SecurityKey security_key; }; diff --git a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h b/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h index 3c73dff6f..3a1add6b3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h +++ b/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h @@ -22,6 +22,8 @@ struct LimitCoverGate { delete_threshold(delete_thresh); } + LimitCoverGate & operator=(const LimitCoverGate &other) = default; + // activation threshold uint32_t activation_threshold() const { return _activation_threshold; } void activation_threshold(uint32_t value) { _activation_threshold = value; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp index 807f20ade..9a3c96aa6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp @@ -5,5 +5,8 @@ namespace orderman { QuoteLegDriver::QuoteLegDriver() : _driver_price(0.0), _driver_quantity(0), _quoter_leg_quantity(0) {} + +QuoteLegDriver::QuoteLegDriver(const QuoteLegDriver &other) { *this = other; } + } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h index 6d9938e92..49b25fbe0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h @@ -19,6 +19,9 @@ class QuoteLegDriver { // in the hedging (or driver) leg that can drive a quoter_leg_quantity // sized order in the quoting leg QuoteLegDriver(); + + QuoteLegDriver(const QuoteLegDriver &other); + QuoteLegDriver &operator=(const QuoteLegDriver &s) { set(s.driver_price(), s.driver_quantity(), s.quoter_leg_quantity()); return *this; diff --git a/src/lib/utils/ConcurrentAppendCollection.h b/src/lib/utils/ConcurrentAppendCollection.h index 25ff4e035..849a81b88 100644 --- a/src/lib/utils/ConcurrentAppendCollection.h +++ b/src/lib/utils/ConcurrentAppendCollection.h @@ -67,6 +67,8 @@ class ConcurrentAppendCollectionIterator { const ConcurrentAppendCollection &owner, size_t pos) : _owner(owner), _pos(pos), _cache(nullptr) {} + ConcurrentAppendCollectionIterator(const ConcurrentAppendCollectionIterator &other) = default; + ConcurrentAppendCollectionIterator & operator=(const ConcurrentAppendCollectionIterator &other) { _owner = other._owner; @@ -135,4 +137,4 @@ bool operator!=( return &left._owner != &right._owner || left._pos != right._pos; } -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/utils/TempDir.h b/src/lib/utils/TempDir.h index b66bfc326..a38ec6e46 100644 --- a/src/lib/utils/TempDir.h +++ b/src/lib/utils/TempDir.h @@ -25,7 +25,7 @@ class TempDir { try { path_ /= boost::filesystem::unique_path("bts-utest-%%%%-%%%%-%%%%-%%%%"); - } catch (std::exception) { + } catch (const std::exception &) { std::ostringstream digits; digits << "bts-utest"; for (int i = 0; i < 21; i++) { diff --git a/src/lib/utils/bts_chrono.h b/src/lib/utils/bts_chrono.h index dabe07dcf..afc75b070 100644 --- a/src/lib/utils/bts_chrono.h +++ b/src/lib/utils/bts_chrono.h @@ -1,6 +1,7 @@ #pragma once #include #include +#include #include namespace bts { diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index f887afad0..7c9709bc6 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -31,7 +31,7 @@ void md_report() { // auto& ports = config::get(); // qb_cfg.set_my_port(ports.qbus_port()); // qbus::Quickbus quickbus(); - api::ServiceContext(sc); // for Eric + api::ServiceContext sc; // for Eric api::admin::AdminService admin = sc.locate(); auto res = admin.get_admin_data(api::VoidMessage()); diff --git a/src/server/sparkd/cmds/spartan/back_testing/common/security_parser.cpp b/src/server/sparkd/cmds/spartan/back_testing/common/security_parser.cpp index 20ea622cc..c58eed145 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/common/security_parser.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/common/security_parser.cpp @@ -47,7 +47,7 @@ static uint32_t _get_exp_year(const std::string &sym) { try { uint32_t y = static_cast(std::stoul(ystr)); return y + 2020; - } catch (std::invalid_argument ex) { + } catch (const std::invalid_argument &ex) { std::cout << "Error getting exp year from " << sym << ": "; std::cout << ex.what() << std::endl; } @@ -83,4 +83,4 @@ void parse_legs( std::get<0>(l) = std::get<0>(l).substr(0, std::get<0>(l).size() - 2); } } -} // namespace bts::spartan \ No newline at end of file +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp index 8ad1fe76c..321b4e4f4 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp @@ -230,7 +230,7 @@ FeedHandler_Recovery::try_build_snapshot_and_reset() { // ready to go auto result = rt_handler.move_all_securities_and_reset(); reset(); - return std::move(result); + return result; } // Instrument feed ------------------------------------------- diff --git a/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.h b/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.h index 0d507647a..1e3ee41cf 100644 --- a/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.h +++ b/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.h @@ -3,6 +3,7 @@ #include "gateway/detail/gen/il3_fwd.h" #include "system/Delegate.h" #include +#include namespace bts::spartan { diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h index a09d52f06..ce64db8d7 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h @@ -2,6 +2,7 @@ #include "gateway/detail/IL3MsgHeader.h" #include +#include // Simple class that takes an input byte stream and frames it into // discrete IL3 Messages. Avoids copying whenever possible. diff --git a/src/server/sparkd/cmds/spartan/system/PCapReader.h b/src/server/sparkd/cmds/spartan/system/PCapReader.h index 9fe6835fb..f52d2b4c9 100644 --- a/src/server/sparkd/cmds/spartan/system/PCapReader.h +++ b/src/server/sparkd/cmds/spartan/system/PCapReader.h @@ -2,6 +2,7 @@ #include #include +#include namespace pcpp { class RawPacket; diff --git a/src/server/sparkd/position/import/DownloadWindow.h b/src/server/sparkd/position/import/DownloadWindow.h index 7ddbad19b..fdd98466a 100644 --- a/src/server/sparkd/position/import/DownloadWindow.h +++ b/src/server/sparkd/position/import/DownloadWindow.h @@ -14,6 +14,9 @@ class DownloadWindow { boost::posix_time::time_duration window_begin, boost::posix_time::time_duration window_end); DownloadWindow(datetime::PTime const &, datetime::PTime const &); + + DownloadWindow &operator=(const DownloadWindow &other) = default; + DownloadWindow next() const; bool is_inside(datetime::PTime const &time) const; datetime::PTime start() const; From 94a91215fb5ebfe8f7e043440c4dc8e6451f8865 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 7 Oct 2021 18:54:05 -0500 Subject: [PATCH 071/100] Upgrade dev/john Dockerfile to ubuntu 21.04 --- dev/john/Dockerfile | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 dev/john/Dockerfile diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile new file mode 100644 index 000000000..72cf7ad4e --- /dev/null +++ b/dev/john/Dockerfile @@ -0,0 +1,81 @@ +FROM spark-crypto + +# RUN echo "BT5u53r" | sudo -S apt-get install -y \ +RUN apt-get install -y \ +htop \ +locales \ +source-highlight \ +powerline \ +powerline-gitstatus \ +fonts-powerline \ +fish + + +ARG repo_root="/home/bts/Documents/repos" + +# Create dirs for public/private repos +USER bts +RUN mkdir -p /home/bts/Documents/repos/public && \ +mkdir -p /home/bts/Documents/repos/private + + +## Get latest fish (build from source) +# 1) get build deps +USER root +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common +RUN apt-add-repository ppa:fish-shell/release-3 && \ +sed -i "s/^# deb/deb/g" /etc/apt/sources.list + +RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get build-dep -y fish + + +# 2) Clone repo +USER bts +RUN cd $repo_root/public && \ +git clone https://github.com/fish-shell/fish-shell.git + +RUN cd $repo_root/public/fish-shell && \ +mkdir build && \ +cd build && \ +cmake -DCMAKE_BUILD_TYPE=Release .. && \ +make && \ +echo "BT5u53r" | sudo -S make install + + +## Get oh-my-fish +RUN cd $repo_root/public && \ +git clone https://github.com/oh-my-fish/oh-my-fish.git + +RUN cd $repo_root/public/oh-my-fish && \ +./bin/install --noninteractive --yes + + +## Get my fish config +RUN cd $repo_root/private && \ +git clone https://github.com/johncolvin-og/myfishconfig + +RUN cd $repo_root/private/myfishconfig && \ +cp src/config.fish /home/bts/.config/fish/ && \ +cp src/aliases.fish /home/bts/.config/fish/ && \ +cp -r src/functions /home/bts/.config/fish/ && \ +cp -r src/themes/johncolvin /home/bts/.local/share/omf/themes/ && \ +fish --command "omf theme johncolvin" + + +# Some fonts look sketchy if the language isn't set to english: +# * The powerline git glyphs in the fish prompt are all displayed as question +# marks. +# +# * The shell confuses the position of the cursor, so characters are left +# around when they should have been cleared, and the cursor's home position +# is pushed one or two places to the right. +# +# * Most likely, the bad cursor position is caused by some dependencies the +# interpretation of escape sequences have on the language setting. At this +# point I don't even care anymore (literally took 8 hours to figure this +# out). I just know this shit is needed to make the prompt work correctly. +RUN echo "BT5u53r" | sudo -S locale-gen "en_US.UTF-8" +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 +RUN fc-cache -vf From ff1d561f7bf47812e407634aa30c63399022c4cc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Oct 2021 14:21:28 -0500 Subject: [PATCH 072/100] docker (john): Change user to 'john' --- dev/john/Dockerfile | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 72cf7ad4e..81010fad2 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -11,12 +11,15 @@ fonts-powerline \ fish -ARG repo_root="/home/bts/Documents/repos" +# Hide these in the .docker directory to avoid conflicts with existing repos on +# this computer (in case a parent dir, such as $HOME, is mounted inside a +# container) +ARG repo_root="/home/john/Documents/repos/.docker" # Create dirs for public/private repos -USER bts -RUN mkdir -p /home/bts/Documents/repos/public && \ -mkdir -p /home/bts/Documents/repos/private +USER john +RUN mkdir -p $repo_root/public && \ +mkdir -p $repo_root/private ## Get latest fish (build from source) @@ -30,7 +33,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get build-dep -y fish # 2) Clone repo -USER bts +USER john RUN cd $repo_root/public && \ git clone https://github.com/fish-shell/fish-shell.git @@ -38,8 +41,13 @@ RUN cd $repo_root/public/fish-shell && \ mkdir build && \ cd build && \ cmake -DCMAKE_BUILD_TYPE=Release .. && \ -make && \ -echo "BT5u53r" | sudo -S make install +cmake --build . + +# Switch to root, rather than running inline w/ sudo cmd, to avoid having to +# enter a password +USER root +RUN cd $repo_root/public/fish-shell/build && make install +USER john ## Get oh-my-fish @@ -55,10 +63,10 @@ RUN cd $repo_root/private && \ git clone https://github.com/johncolvin-og/myfishconfig RUN cd $repo_root/private/myfishconfig && \ -cp src/config.fish /home/bts/.config/fish/ && \ -cp src/aliases.fish /home/bts/.config/fish/ && \ -cp -r src/functions /home/bts/.config/fish/ && \ -cp -r src/themes/johncolvin /home/bts/.local/share/omf/themes/ && \ +cp src/config.fish /home/john/.config/fish/ && \ +cp src/aliases.fish /home/john/.config/fish/ && \ +cp -r src/functions /home/john/.config/fish/ && \ +cp -r src/themes/johncolvin /home/john/.local/share/omf/themes/ && \ fish --command "omf theme johncolvin" @@ -74,7 +82,9 @@ fish --command "omf theme johncolvin" # interpretation of escape sequences have on the language setting. At this # point I don't even care anymore (literally took 8 hours to figure this # out). I just know this shit is needed to make the prompt work correctly. -RUN echo "BT5u53r" | sudo -S locale-gen "en_US.UTF-8" +USER root +RUN locale-gen "en_US.UTF-8" +USER john ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 From a28f667df5aa36122abc736dc14debeffab642cc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 15:53:21 -0400 Subject: [PATCH 073/100] docker (john): Get john's bash config in Dockerfile --- dev/john/Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 81010fad2..b74cf2d66 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -70,6 +70,17 @@ cp -r src/themes/johncolvin /home/john/.local/share/omf/themes/ && \ fish --command "omf theme johncolvin" +## Get my bash config (back up existing) +RUN +mkdir -p /home/john/.docker_orig_rc && \ +cp /home/john/*.rc /home/john/.docker_orig_rc/ && \ +cp /home/john/.profile /home/john/.docker_orig_rc/ && \ +cd $repo_root/private && \ +git clone https://github.com/johncolvin-og/mybashconfig && \ +cd mybashconfig && \ +cp src/* /home/john/ + + # Some fonts look sketchy if the language isn't set to english: # * The powerline git glyphs in the fish prompt are all displayed as question # marks. From f42568bed4988c34362345b03346dc007eed494d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 15:54:38 -0400 Subject: [PATCH 074/100] docker (john): Get john's vim files in Dockerfile --- dev/john/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index b74cf2d66..614b91d6c 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -81,6 +81,15 @@ cd mybashconfig && \ cp src/* /home/john/ +# Get vim files/tools +USER root +RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ +apt-get install -y curl +USER john +curl -fLo home/john/.vim/autoload/plug.vim --create-dirs \ + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + + # Some fonts look sketchy if the language isn't set to english: # * The powerline git glyphs in the fish prompt are all displayed as question # marks. From 2891e01de12ae5b7f5499307d116f640a0d34266 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Oct 2021 14:25:04 -0500 Subject: [PATCH 075/100] Add john's dev scripts (docker-related) --- dev/john/build_docker.fish | 10 ++ dev/john/docker_container_name.fish | 14 +++ dev/john/docker_image_name.fish | 2 + dev/john/docker_shell.fish | 11 ++ dev/john/setup_builds.fish | 3 + dev/john/setup_builds_new.fish | 153 ++++++++++++++++++++++++++++ dev/john/spartan_path.fish | 92 +++++++++++++++++ dev/john/start_docker.fish | 43 ++++++++ 8 files changed, 328 insertions(+) create mode 100755 dev/john/build_docker.fish create mode 100755 dev/john/docker_container_name.fish create mode 100755 dev/john/docker_image_name.fish create mode 100755 dev/john/docker_shell.fish create mode 100755 dev/john/setup_builds.fish create mode 100755 dev/john/setup_builds_new.fish create mode 100755 dev/john/spartan_path.fish create mode 100755 dev/john/start_docker.fish diff --git a/dev/john/build_docker.fish b/dev/john/build_docker.fish new file mode 100755 index 000000000..b1f3f7df4 --- /dev/null +++ b/dev/john/build_docker.fish @@ -0,0 +1,10 @@ +#!/usr/bin/env fish + +set image_name $argv[1] +if test (count $argv) -eq 0 + set image_name_cmd (realpath (dirname (status -f)))"/docker_image_name.fish" + set image_name (eval $image_name_cmd) +end + +echo $image_name +docker build -t $image_name . diff --git a/dev/john/docker_container_name.fish b/dev/john/docker_container_name.fish new file mode 100755 index 000000000..50cd7e27f --- /dev/null +++ b/dev/john/docker_container_name.fish @@ -0,0 +1,14 @@ +#!/usr/bin/env fish + +if test (count $argv) -gt 1 + echo $argv[2] + exit 0 +end + +set image_name $argv[1] +if test (count $argv) -eq 0 + set image_name_cmd (realpath (dirname (status -f)))"/docker_image_name.fish" + set image_name (eval $image_name_cmd) +end +echo $USER"s_"$image_name + diff --git a/dev/john/docker_image_name.fish b/dev/john/docker_image_name.fish new file mode 100755 index 000000000..cc82841a2 --- /dev/null +++ b/dev/john/docker_image_name.fish @@ -0,0 +1,2 @@ +#!/usr/bin/env fish +basename (git rev-parse --show-toplevel)"-dev" diff --git a/dev/john/docker_shell.fish b/dev/john/docker_shell.fish new file mode 100755 index 000000000..b18c3ea68 --- /dev/null +++ b/dev/john/docker_shell.fish @@ -0,0 +1,11 @@ +#!/usr/bin/env fish + +set inst_name $argv[1] +if test (count $argv) -eq 0 + set script_dir (realpath (dirname (status -f))) + set inst_name (eval $script_dir"/docker_container_name.fish") +end + +set working_dir (realpath (pwd)) +echo $inst_name +docker exec -w $working_dir -it "$inst_name" bash diff --git a/dev/john/setup_builds.fish b/dev/john/setup_builds.fish new file mode 100755 index 000000000..e333360fd --- /dev/null +++ b/dev/john/setup_builds.fish @@ -0,0 +1,3 @@ +#!/usr/bin/env fish + +echo Hello diff --git a/dev/john/setup_builds_new.fish b/dev/john/setup_builds_new.fish new file mode 100755 index 000000000..c88698a2c --- /dev/null +++ b/dev/john/setup_builds_new.fish @@ -0,0 +1,153 @@ +#!/usr/bin/env fish + +function print_help_and_exit + echo "\ +Usage: setup_builds.sh [OPTIONS] compiler build-type + +Positionals: + gcc Compile with gcc + clang Compile with clang + debug Build debug + release Build release + +Options: + --compiler Specify the compiler + --type Specify the type of build + -f,--force Overwrite existing build directories + -h,--help Print this help message and exit + +" + exit $argv[1] +end + +function assert_dir + if test ! -d "$argv[1]" + if test -n "$argv[2]" + echo "Invalid variable "$argv[2]": '"$argv[1]"' is not a directory" + else + echo "'"$argv[1]"' is not a directory" + end + exit 1 + end +end + +# common variables + +#set tools_path (readlink -f (pwd)) +#set tools_path (cd (dirname (status --current-filename)); and pwd) +set tools_path (realpath (dirname (status -f))) +set spartan_path_cmd $tools_path/spartan_path.fish +set repo_root (eval $spartan_path_cmd "repo-root") +# Don't call 'spartan_path_cmd "build"' bc it returns specific build path +# (i.e., for a particular compiler/build type), not the root build path +# set build_root (eval $spartan_path_cmd "build") +set build_root "$repo_root"/"build" +mkdir -p "$build_root" + +# Initialize the build directory. Expected arguments: , +# Note: this method assumes the variables 'repot_root' and 'build_root' have +# already been properly initialized +function setup_build + assert_dir $repo_root + assert_dir $build_root + set compiler "$argv[1]" + set build_type "$argv[2]" + + if test \( -z "$build_type" \) -o \( \( "$build_type" != "debug" \) -a \( "$build_type" != "release" \) \) + print_help_and_exit 1 + end + + if test "$build_type" = "debug" + set build_type_arg "Debug" + if test "$compiler" = "gcc" + set compiler_arg "/usr/lib/ccache/g++" + else + set compiler_arg "/usr/lib/ccache/clang++" + end + else if test "$build_type" = "release" + set build_type_arg "Release" + if test "$compiler" = "gcc" + set compiler_arg "g++" + else + set compiler_arg "clang++" + end + end + + if test \( -z "$compiler" \) -o \( \( "$compiler" != "gcc" \) -a \( "$compiler" != "clang" \) \) + print_help_and_exit 1 + end + + set build_dest $build_root"/"$compiler"/"$build_type + set conan_dest $repo_root"/conan/"$compiler"_"$build_type + + echo "Set up build: "$compiler" "$build_type + + if test \( -z "$force" \) -a \( -d $build_dest \) + echo "The build directory '"$build_dest"' already exists (use -f to overwrite)" + return 1 + end + + rm -rf "$build_dest" + mkdir -p "$build_dest" + mkdir -p "$conan_dest" + cd "$build_dest" + conan install --build missing --profile $conan_dest $repo_root + cmake -G Ninja -DCMAKE_BUILD_TYPE=$build_type_arg -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=$compiler_arg $repo_root +end + +# The while loop below removes arguments (via shift) as it parses them. +# Additional information that needs to be extracted from the arguments must be +# done so before the loop is executed. + +set i 1 +while test $i -le (count $argv) + switch $argv[$i] + case '--compiler' + set i (math "$i + 1") + set compiler $argv[$i] + case 'clang' + set compiler 'clang' + case 'gcc' + set compiler 'gcc' + case '--type' + set i (math "$i + 1") + set build_type $argv[$i] + case 'release' + set build_type 'release' + case 'debug' + set build_type 'debug' + case '-f' + set force 1 + case '--force' + set force 1 + case '-h' + print_help_and_exit 0 + case '--help' + print_help_and_exit 0 + case '*' + print_help_and_exit 1 + end + set i (math "$i + 1") +end + +echo "compiler in "$compiler +echo "build type in "$build_type +if test -n "$compiler" + if test -n "$build_type" + setup_build $compiler $build_type + else + # all builds for the specified compiler + setup_build $compiler "debug" + setup_build $compiler "release" + end +else if test -n "$build_type" + # all builds for the specified build type + setup_build "gcc" $build_type + setup_build "clang" $build_type +else + # all builds + setup_build "gcc" "debug" + setup_build "gcc" "release" + setup_build "clang" "debug" + setup_build "clang" "release" +end diff --git a/dev/john/spartan_path.fish b/dev/john/spartan_path.fish new file mode 100755 index 000000000..eb20cbbb0 --- /dev/null +++ b/dev/john/spartan_path.fish @@ -0,0 +1,92 @@ +#!/usr/bin/env fish + +#basename (git rev-parse --show-toplevel) + +function print_help_and_exit + echo "\ +Print paths to core parts of the repository +Usage: sparkd_path.sh SUBCOMMAND + +Subcommands: + build Print build path + repo-root Print repo root path + +" + exit $argv[1] +end + +function print_build_help_and_exit + echo "\ +Print build path +Usage: sparkd_path.sh build [OPTIONS] compiler build-type + +Positionals: + gcc Print gcc build path + clang Print clang build path + debug Print debug build path + release Print release build path + +Options: + --compiler Specify the compiler + --type Specify the type of build + -h,--help Print this help message and exit + +" + exit $argv[1] +end + +function print_repo_root + git rev-parse --show-toplevel +end + +function run_repo_root + print_repo_root +end + +function run_build + set compiler "gcc" + set build_type "release" + set i 1 + while test $i -lt (count $argv) + switch $argv[$i] + case '--compiler' + set i (math "$i + 1") + set compiler $argv[$i] + case 'clang' + set compiler 'clang' + case 'gcc' + set compiler 'gcc' + case '--type' + set i (math "$i + 1") + set build_type $argv[$i] + case 'release' + set build_type 'release' + case 'debug' + set build_type 'debug' + '-h' + print_build_help_and_exit 0 + '--help' + print_build_help_and_exit 0 + '*' + print_build_help_and_exit 1 + end + set i (math "$i + 1") + end + if test \( $compiler = "clang" \) -o \( $compiler = "gcc" \) + set comp_path $compiler + else + print_build_help_and_exit 1 + end + set src_root (print_repo_root) + set build_root (readlink -f "$src_root""/build") + set build_dest $build_root"/"$compiler"/"$build_type + echo $build_dest +end + +if test "$argv[1]" = "repo-root" + print_repo_root $argv[2..-1] +else if test "$argv[1]" = "build" + run_build $argv[2..-1] +else + print_help_and_exit 1 +end diff --git a/dev/john/start_docker.fish b/dev/john/start_docker.fish new file mode 100755 index 000000000..6a8c708f1 --- /dev/null +++ b/dev/john/start_docker.fish @@ -0,0 +1,43 @@ +#!/usr/bin/env fish + +set image_name $argv[1] +set cont_name $argv[2] + +if test (count $argv) -lt 2 + if test (count $argv) -lt 1 + set image_name_cmd (realpath (dirname (status -f)))"/docker_image_name.fish" + set image_name (eval $image_name_cmd) + end + set cont_name_cmd (realpath (dirname (status -f)))"/docker_container_name.fish "$image_name + set cont_name (eval $cont_name_cmd) +end + +set working_dir (realpath (pwd)) + +set home_path /home/john +set repo_path (git rev-parse --show-toplevel) +set repo_path_out /home/john/Documents/repos/private/(basename $repo_path) +set working_dir $repo_path_out + +echo "starting docker instance '"$cont_name"' (image '"$image_name"')" +echo "working dir "$working_dir + +docker run \ + --rm \ + --net host \ + -h (hostname) \ + -e "TZ=America/New_York" \ + --cap-add=SYS_PTRACE \ + --security-opt seccomp=unconfined \ + --name $cont_name \ + -v $repo_path:$repo_path_out \ + -u (id -u $USER) \ + -w $working_dir \ + --shm-size=4024m \ + -t \ + -i \ + -d \ + -e DISPLAY="$DISPLAY" \ + "$image_name" \ + bash + From 254dcff1f65f83bf063b276238bb1136b9ca5248 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Oct 2021 21:29:17 -0400 Subject: [PATCH 076/100] Try to fix the goddamn web build These dependencies are way to fragile. It is a nightmare trying to upgrade them. --- src/web/api/build.sh | 4 +- src/web/api/package-lock.json | 12223 ++++++++++--------- src/web/api/package.json | 33 +- src/web/ui/package-lock.json | 20583 ++++++++++++++++++++------------ src/web/ui/package.json | 50 +- src/web/ui/src/State.fs | 4 +- src/web/ui/webpack.config.js | 37 +- 7 files changed, 19293 insertions(+), 13641 deletions(-) diff --git a/src/web/api/build.sh b/src/web/api/build.sh index 3dfa68038..42287ff38 100755 --- a/src/web/api/build.sh +++ b/src/web/api/build.sh @@ -85,8 +85,8 @@ if [ "$FULL" == "1" ]; then cp -r ../public/* $OUT/ui/ dotnet restore -s ../../../../externals/nuget/packages if [ "$MODE" == "release" ]; then - dotnet fable webpack -- --env.BUILD_PATH=$OUT -p + dotnet fable webpack -- --env BUILD_PATH=$OUT -p else - dotnet fable webpack -- --env.BUILD_PATH=$OUT + dotnet fable webpack -- --env BUILD_PATH=$OUT fi fi diff --git a/src/web/api/package-lock.json b/src/web/api/package-lock.json index 29e3dec15..0933a3d20 100644 --- a/src/web/api/package-lock.json +++ b/src/web/api/package-lock.json @@ -1,27 +1,4887 @@ { - "name": "spark-api", - "version": "1.0.0", - "lockfileVersion": 1, + "name": "api", + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "dependencies": { + "protobufjs": "^6.11.2", + "tslib": "^2.3.1", + "watch": "^1.0.2" + }, + "devDependencies": { + "jest": "^27.2.5", + "ts-jest": "^27.0.5", + "ts2fable": "^0.7.1", + "tsutils": "^3.21.0", + "typescript": "^4.4.3", + "ws": "^8.2.3" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", + "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.15.8", + "@babel/generator": "^7.15.8", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.8", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.8", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@babel/generator": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.6", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", + "dev": true, + "dependencies": { + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-get-function-arity": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", + "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/helper-validator-identifier": "^7.15.7", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-optimise-call-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-replace-supers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", + "dev": true, + "dependencies": { + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", + "dev": true, + "dependencies": { + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.14.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/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=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz", + "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.14.9", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@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 + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.2.5.tgz", + "integrity": "sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.2.5", + "jest-util": "^27.2.5", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/core": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.2.5.tgz", + "integrity": "sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==", + "dev": true, + "dependencies": { + "@jest/console": "^27.2.5", + "@jest/reporters": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^27.2.5", + "jest-config": "^27.2.5", + "jest-haste-map": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-resolve-dependencies": "^27.2.5", + "jest-runner": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "jest-watcher": "^27.2.5", + "micromatch": "^4.0.4", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/environment": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.2.5.tgz", + "integrity": "sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.2.5.tgz", + "integrity": "sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "@sinonjs/fake-timers": "^8.0.1", + "@types/node": "*", + "jest-message-util": "^27.2.5", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.2.5.tgz", + "integrity": "sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==", + "dev": true, + "dependencies": { + "@jest/environment": "^27.2.5", + "@jest/types": "^27.2.5", + "expect": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.2.5.tgz", + "integrity": "sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==", + "dev": true, + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "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": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^8.1.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/source-map": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz", + "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.4", + "source-map": "^0.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.2.5.tgz", + "integrity": "sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==", + "dev": true, + "dependencies": { + "@jest/console": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz", + "integrity": "sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==", + "dev": true, + "dependencies": { + "@jest/test-result": "^27.2.5", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-runtime": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz", + "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/types": "^27.2.5", + "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": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-util": "^27.2.5", + "micromatch": "^4.0.4", + "pirates": "^4.0.1", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/types": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz", + "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", + "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz", + "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/babel__core": { + "version": "7.1.16", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz", + "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz", + "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.14.2", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz", + "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.3.0" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", + "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@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 + }, + "node_modules/@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, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + }, + "node_modules/@types/node": { + "version": "16.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", + "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" + }, + "node_modules/@types/prettier": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==", + "dev": true + }, + "node_modules/@types/stack-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "20.2.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", + "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/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, + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/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, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "node_modules/babel-jest": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.2.5.tgz", + "integrity": "sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==", + "dev": true, + "dependencies": { + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^27.2.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/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, + "dependencies": { + "@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" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz", + "integrity": "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==", + "dev": true, + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "dependencies": { + "@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", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz", + "integrity": "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==", + "dev": true, + "dependencies": { + "babel-plugin-jest-hoist": "^27.2.0", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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 + }, + "node_modules/browserslist": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", + "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", + "dev": true, + "dependencies": { + "caniuse-lite": "^1.0.30001264", + "electron-to-chromium": "^1.3.857", + "escalade": "^3.1.1", + "node-releases": "^1.1.77", + "picocolors": "^0.2.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/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, + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001265", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", + "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/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, + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", + "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", + "dev": true + }, + "node_modules/cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true, + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/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 + }, + "node_modules/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, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/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 + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/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, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/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, + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", + "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", + "dev": true + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/diff-sequences": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz", + "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==", + "dev": true, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", + "dev": true + }, + "node_modules/emittery": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", + "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/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, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/exec-sh": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz", + "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", + "dependencies": { + "merge": "^1.2.0" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.5.tgz", + "integrity": "sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "ansi-styles": "^5.0.0", + "jest-get-type": "^27.0.6", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-regex-util": "^27.0.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/expect/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/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 + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "node_modules/fb-watchman": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "dev": true, + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/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==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/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, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/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, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/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, + "engines": { + "node": ">=4" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", + "dev": true + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/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 + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "dev": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-ci": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz", + "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==", + "dev": true, + "dependencies": { + "ci-info": "^3.1.1" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", + "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-reports": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.2.5.tgz", + "integrity": "sha512-vDMzXcpQN4Ycaqu+vO7LX8pZwNNoKMhc+gSp6q1D8S6ftRk8gNW8cni3YFxknP95jxzQo23Lul0BI2FrWgnwYQ==", + "dev": true, + "dependencies": { + "@jest/core": "^27.2.5", + "import-local": "^3.0.2", + "jest-cli": "^27.2.5" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.2.5.tgz", + "integrity": "sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "execa": "^5.0.0", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-circus": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.2.5.tgz", + "integrity": "sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==", + "dev": true, + "dependencies": { + "@jest/environment": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.2.5", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-cli": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.2.5.tgz", + "integrity": "sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==", + "dev": true, + "dependencies": { + "@jest/core": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "import-local": "^3.0.2", + "jest-config": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "prompts": "^2.0.1", + "yargs": "^16.2.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.2.5.tgz", + "integrity": "sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^27.2.5", + "@jest/types": "^27.2.5", + "babel-jest": "^27.2.5", + "chalk": "^4.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.4", + "is-ci": "^3.0.0", + "jest-circus": "^27.2.5", + "jest-environment-jsdom": "^27.2.5", + "jest-environment-node": "^27.2.5", + "jest-get-type": "^27.0.6", + "jest-jasmine2": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-runner": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.5.tgz", + "integrity": "sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^27.0.6", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz", + "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==", + "dev": true, + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.2.5.tgz", + "integrity": "sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz", + "integrity": "sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==", + "dev": true, + "dependencies": { + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5", + "jsdom": "^16.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-node": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.2.5.tgz", + "integrity": "sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==", + "dev": true, + "dependencies": { + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz", + "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==", + "dev": true, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz", + "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.4", + "jest-regex-util": "^27.0.6", + "jest-serializer": "^27.0.6", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "micromatch": "^4.0.4", + "walker": "^1.0.7" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-jasmine2": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz", + "integrity": "sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^27.2.5", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^27.2.5", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-leak-detector": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz", + "integrity": "sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==", + "dev": true, + "dependencies": { + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz", + "integrity": "sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^27.2.5", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.5.tgz", + "integrity": "sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.2.5", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.5", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-mock": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.2.5.tgz", + "integrity": "sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "@types/node": "*" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/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, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz", + "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==", + "dev": true, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz", + "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "escalade": "^3.1.1", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "resolve": "^1.20.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz", + "integrity": "sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-snapshot": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runner": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.2.5.tgz", + "integrity": "sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==", + "dev": true, + "dependencies": { + "@jest/console": "^27.2.5", + "@jest/environment": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-docblock": "^27.0.6", + "jest-environment-jsdom": "^27.2.5", + "jest-environment-node": "^27.2.5", + "jest-haste-map": "^27.2.5", + "jest-leak-detector": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "source-map-support": "^0.5.6", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.2.5.tgz", + "integrity": "sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==", + "dev": true, + "dependencies": { + "@jest/console": "^27.2.5", + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/globals": "^27.2.5", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-mock": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^16.2.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-serializer": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz", + "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==", + "dev": true, + "dependencies": { + "@types/node": "*", + "graceful-fs": "^4.2.4" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.2.5.tgz", + "integrity": "sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/parser": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.0.0", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.2.5", + "graceful-fs": "^4.2.4", + "jest-diff": "^27.2.5", + "jest-get-type": "^27.0.6", + "jest-haste-map": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-util": "^27.2.5", + "natural-compare": "^1.4.0", + "pretty-format": "^27.2.5", + "semver": "^7.3.2" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz", + "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^3.0.0", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-validate": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.2.5.tgz", + "integrity": "sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "leven": "^3.1.0", + "pretty-format": "^27.2.5" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.2.5.tgz", + "integrity": "sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==", + "dev": true, + "dependencies": { + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.2.5", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-worker": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz", + "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==", + "dev": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "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.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/ws": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/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, + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/makeerror": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", + "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "dev": true, + "dependencies": { + "tmpl": "1.0.x" + } + }, + "node_modules/merge": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "dev": true, + "dependencies": { + "braces": "^3.0.1", + "picomatch": "^2.2.3" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "dev": true, + "dependencies": { + "mime-db": "1.50.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "node_modules/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/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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-releases": { + "version": "1.1.77", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", + "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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 + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/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, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pirates": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", + "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", + "dev": true, + "dependencies": { + "node-modules-regexp": "^1.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/pretty-format": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz", + "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==", + "dev": true, + "dependencies": { + "@jest/types": "^27.2.5", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/protobufjs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "hasInstallScript": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + } + }, + "node_modules/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 + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "dependencies": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/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, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", + "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==", + "dev": true + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "node_modules/stack-utils": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", + "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/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, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", + "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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 + }, + "node_modules/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, + "dependencies": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/throat": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", + "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", + "dev": true + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "node_modules/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, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ts-jest": { + "version": "27.0.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.0.5.tgz", + "integrity": "sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w==", + "dev": true, + "dependencies": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", + "json5": "2.x", + "lodash": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "20.x" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@types/jest": "^27.0.0", + "babel-jest": ">=27.0.0 <28", + "jest": "^27.0.0", + "typescript": ">=3.8 <5.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@types/jest": { + "optional": true + }, + "babel-jest": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts2fable": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ts2fable/-/ts2fable-0.7.1.tgz", + "integrity": "sha512-4CiCzuWF9ueSLlr+OozcwaehhCno1frnPZbHM7Jd4EfKzSlHk3hyjrhFKttnXQ2Sx0tGe8C4xwjDhnZaOSqFkw==", + "dev": true, + "dependencies": { + "typescript": "3.7.4" + }, + "bin": { + "ts2fable": "dist/ts2fable.js" + } + }, + "node_modules/ts2fable/node_modules/typescript": { + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz", + "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/v8-to-istanbul/node_modules/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, + "engines": { + "node": ">= 8" + } + }, + "node_modules/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, + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/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, + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/walker": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", + "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "dev": true, + "dependencies": { + "makeerror": "1.0.x" + } + }, + "node_modules/watch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz", + "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=", + "dependencies": { + "exec-sh": "^0.2.0", + "minimist": "^1.2.0" + }, + "bin": { + "watch": "cli.js" + }, + "engines": { + "node": ">=0.1.95" + } + }, + "node_modules/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, + "engines": { + "node": ">=10.4" + } + }, + "node_modules/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, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/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 + }, + "node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/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 + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + } + }, "dependencies": { "@babel/code-frame": { - "version": "7.0.0-beta.44", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz", - "integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "dev": true, "requires": { - "@babel/highlight": "7.0.0-beta.44" + "@babel/highlight": "^7.14.5" + } + }, + "@babel/compat-data": { + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", + "dev": true + }, + "@babel/core": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", + "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.15.8", + "@babel/generator": "^7.15.8", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.8", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.8", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", + "dev": true, + "requires": { + "@babel/types": "^7.15.6", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-compilation-targets": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" + } + }, + "@babel/helper-function-name": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-module-imports": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", + "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/helper-validator-identifier": "^7.15.7", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", + "dev": true + }, + "@babel/helper-replace-supers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-simple-access": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", + "dev": true + }, + "@babel/helpers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", + "dev": true, + "requires": { + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/highlight": { - "version": "7.0.0-beta.44", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz", - "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", "dev": true, "requires": { + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "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=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", + "dev": true + }, + "@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.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@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/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz", + "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/template": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/traverse": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.14.9", + "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 + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true + }, + "@jest/console": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.2.5.tgz", + "integrity": "sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.2.5", + "jest-util": "^27.2.5", + "slash": "^3.0.0" + } + }, + "@jest/core": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.2.5.tgz", + "integrity": "sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==", + "dev": true, + "requires": { + "@jest/console": "^27.2.5", + "@jest/reporters": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^27.2.5", + "jest-config": "^27.2.5", + "jest-haste-map": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-resolve-dependencies": "^27.2.5", + "jest-runner": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "jest-watcher": "^27.2.5", + "micromatch": "^4.0.4", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "@jest/environment": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.2.5.tgz", + "integrity": "sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==", + "dev": true, + "requires": { + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5" + } + }, + "@jest/fake-timers": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.2.5.tgz", + "integrity": "sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "@sinonjs/fake-timers": "^8.0.1", + "@types/node": "*", + "jest-message-util": "^27.2.5", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5" + } + }, + "@jest/globals": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.2.5.tgz", + "integrity": "sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==", + "dev": true, + "requires": { + "@jest/environment": "^27.2.5", + "@jest/types": "^27.2.5", + "expect": "^27.2.5" + } + }, + "@jest/reporters": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.2.5.tgz", + "integrity": "sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "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": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^8.1.0" + } + }, + "@jest/source-map": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz", + "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.4", + "source-map": "^0.6.0" + } + }, + "@jest/test-result": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.2.5.tgz", + "integrity": "sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==", + "dev": true, + "requires": { + "@jest/console": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz", + "integrity": "sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==", + "dev": true, + "requires": { + "@jest/test-result": "^27.2.5", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-runtime": "^27.2.5" + } + }, + "@jest/transform": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz", + "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^27.2.5", + "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": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-util": "^27.2.5", + "micromatch": "^4.0.4", + "pirates": "^4.0.1", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + } + }, + "@jest/types": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz", + "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" } }, "@protobufjs/aspromise": { @@ -78,387 +4938,218 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, - "@types/jest": { - "version": "22.2.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-22.2.3.tgz", - "integrity": "sha512-e74sM9W/4qqWB6D4TWV9FQk0WoHtX1X4FJpbjxucMSVJHtFjbQOH3H6yp+xno4br0AKG0wz/kPtaN599GUOvAg==", + "@sinonjs/commons": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", + "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz", + "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, + "@types/babel__core": { + "version": "7.1.16", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz", + "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz", + "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.14.2", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz", + "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==", + "dev": true, + "requires": { + "@babel/types": "^7.3.0" + } + }, + "@types/graceful-fs": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", + "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@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/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" }, "@types/node": { - "version": "8.10.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.8.tgz", - "integrity": "sha512-BvcUxNZe9JgiiUVivtiQt3NrPVu9OAQzkxR1Ko9ESftCYU7V6Np5kpDzQwxd+34lsop7SNRdL292Flv52OvCaw==" + "version": "16.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", + "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" + }, + "@types/prettier": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==", + "dev": true + }, + "@types/stack-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "dev": true + }, + "@types/yargs": { + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "20.2.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", + "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", + "dev": true }, "abab": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", "dev": true }, "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "dev": true }, "acorn-globals": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz", - "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==", + "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": { - "acorn": "^5.0.0" - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "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" + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" }, "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true - }, - "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 - }, - "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" - } - } - } - }, - "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": { - "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": { - "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" - } - }, - "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": { - "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-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": { - "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-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" - } - }, - "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 - } - } - }, - "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" - } - } - } - }, - "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-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" - } - }, - "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" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "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" - } } } }, - "append-transform": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "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": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "debug": "4" + } + }, + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, "argparse": { @@ -470,489 +5161,89 @@ "sprintf-js": "~1.0.2" } }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "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-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", - "dev": true - }, - "array-filter": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz", - "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", - "dev": true - }, - "array-map": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", - "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=", - "dev": true - }, - "array-reduce": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz", - "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "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 - }, - "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.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "^4.14.0" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, - "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", - "dev": true - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, - "atob": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz", - "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw==", - "dev": true - }, - "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 - }, - "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==", - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.0", - "debug": "^2.6.8", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.7", - "slash": "^1.0.0", - "source-map": "^0.5.6" - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, "babel-jest": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-22.4.3.tgz", - "integrity": "sha512-BgSjmtl3mW3i+VeVHEr9d2zFSAT66G++pJcHQiUjd00pkW+voYXFctIm/indcqOWWXw5a1nUpR1XWszD9fJ1qg==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.2.5.tgz", + "integrity": "sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==", "dev": true, "requires": { - "babel-plugin-istanbul": "^4.1.5", - "babel-preset-jest": "^22.4.3" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^27.2.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "slash": "^3.0.0" } }, "babel-plugin-istanbul": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz", - "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==", + "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": { - "babel-plugin-syntax-object-rest-spread": "^6.13.0", - "find-up": "^2.1.0", - "istanbul-lib-instrument": "^1.10.1", - "test-exclude": "^4.2.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" } }, "babel-plugin-jest-hoist": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz", - "integrity": "sha512-zhvv4f6OTWy2bYevcJftwGCWXMFe7pqoz41IhMi4xna7xNsX5NygdagsrE0y6kkfuXq8UalwvPwKTyAxME2E/g==", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", - "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz", + "integrity": "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" } }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "@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", + "@babel/plugin-syntax-top-level-await": "^7.8.3" } }, "babel-preset-jest": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz", - "integrity": "sha512-a+M3LTEXTq3gxv0uBN9Qm6ahUl7a8pj923nFbCUdqFUSsf3YrX8Uc+C3MEwji5Af3LiQjSC7w4ooYewlz8HRTA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz", + "integrity": "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^22.4.3", - "babel-plugin-syntax-object-rest-spread": "^6.13.0" + "babel-plugin-jest-hoist": "^27.2.0", + "babel-preset-current-node-syntax": "^1.0.0" } }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - }, - "dependencies": { - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } - } - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "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" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -964,195 +5255,112 @@ } }, "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "fill-range": "^7.0.1" } }, "browser-process-hrtime": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz", - "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, - "browser-resolve": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", - "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", + "browserslist": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", + "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", "dev": true, "requires": { - "resolve": "1.1.7" + "caniuse-lite": "^1.0.30001264", + "electron-to-chromium": "^1.3.857", + "escalade": "^3.1.1", + "node-releases": "^1.1.77", + "picocolors": "^0.2.1" + } + }, + "bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "2.x" } }, "bser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", - "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=", + "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": { "node-int64": "^0.4.0" } }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "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": { - "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" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } - }, "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } + "caniuse-lite": { + "version": "1.0.30001265", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", + "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==", + "dev": true }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - }, - "dependencies": { - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - } - } - } - }, - "ci-info": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", - "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", + "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 }, - "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": { - "is-descriptor": "^0.1.0" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } + "ci-info": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", + "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true }, "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, - "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - } + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, "co": { @@ -1161,58 +5369,36 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, - "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=", + "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": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "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.1" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "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 }, "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { "delayed-stream": "~1.0.0" } }, - "compare-versions": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.1.0.tgz", - "integrity": "sha512-4hAxDSBypT/yp2ySFD346So6Ragw5xmBn/e/agIGl3bZr6DLUqnoRZPusxKrXdYRZpgexO9daejmIenlq/wrIQ==", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1220,372 +5406,211 @@ "dev": true }, "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "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-js": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz", - "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs=", - "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=", - "dev": true - }, - "cpx": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/cpx/-/cpx-1.5.0.tgz", - "integrity": "sha1-GFvgGFEdhycN7czCkxceN2VauI8=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "dev": true, "requires": { - "babel-runtime": "^6.9.2", - "chokidar": "^1.6.0", - "duplexer": "^0.1.1", - "glob": "^7.0.5", - "glob2base": "^0.0.12", - "minimatch": "^3.0.2", - "mkdirp": "^0.5.1", - "resolve": "^1.1.7", - "safe-buffer": "^5.0.1", - "shell-quote": "^1.6.1", - "subarg": "^1.0.0" + "safe-buffer": "~5.1.1" } }, "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "dev": true, - "requires": { - "boom": "5.x.x" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - } + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "cssom": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", - "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=", + "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": "0.2.37", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", - "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "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.x" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "data-urls": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz", - "integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==", - "dev": true, - "requires": { - "abab": "^1.0.4", - "whatwg-mimetype": "^2.0.0", - "whatwg-url": "^6.4.0" - } - }, - "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" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "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 - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "default-require-extensions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", - "dev": true, - "requires": { - "strip-bom": "^2.0.0" - } - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, - "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" - } - }, - "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": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "cssom": "~0.3.6" }, "dependencies": { - "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" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", "dev": true } } }, + "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": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "decimal.js": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", + "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", + "dev": true + }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true + }, + "deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "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 + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, "detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", + "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": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "diff-sequences": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz", + "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==", "dev": true }, "domexception": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", - "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "requires": { - "webidl-conversions": "^4.0.2" - } - }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", - "dev": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz", - "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==", - "dev": true, - "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" - } - }, - "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=", - "dev": true - }, - "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", - "dev": true, - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "webidl-conversions": "^5.0.0" }, "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true } } }, + "electron-to-chromium": { + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", + "dev": true + }, + "emittery": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", + "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "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==", + "dev": true + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, + "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 + }, + "escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dev": true, + "requires": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "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 }, "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", "dev": true }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, "exec-sh": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz", - "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==", - "dev": true, + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz", + "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "requires": { - "merge": "^1.1.3" + "merge": "^1.2.0" } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.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" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" } }, "exit": { @@ -1594,90 +5619,32 @@ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "^2.1.0" - } - }, "expect": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-22.4.3.tgz", - "integrity": "sha512-XcNXEPehqn8b/jm8FYotdX0YrXn36qp4HWlrVT4ktwQas1l1LPxiVWncYnnL2eyMtKAmVIaG0XAp0QlrqJaxaA==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.5.tgz", + "integrity": "sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "jest-diff": "^22.4.3", - "jest-get-type": "^22.4.3", - "jest-matcher-utils": "^22.4.3", - "jest-message-util": "^22.4.3", - "jest-regex-util": "^22.4.3" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "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" + "@jest/types": "^27.2.5", + "ansi-styles": "^5.0.0", + "jest-get-type": "^27.0.6", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-regex-util": "^27.0.6" }, "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" - } + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true } } }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", - "dev": true - }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "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": { @@ -1687,116 +5654,44 @@ "dev": true }, "fb-watchman": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", - "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=", - "dev": true, - "requires": { - "bser": "^2.0.0" - } - }, - "filename-regex": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", "dev": true, "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" + "bser": "2.1.1" } }, "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^1.1.3", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "to-regex-range": "^5.0.1" } }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", - "dev": true - }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "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": "^2.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "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.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } }, - "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" - } - }, - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1804,951 +5699,11 @@ "dev": true }, "fsevents": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", - "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "optional": true, - "requires": { - "nan": "^2.3.0", - "node-pre-gyp": "^0.6.39" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "inherits": "~2.0.0" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "hoek": "2.x.x" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^0.4.1", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.x.x" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "^1.0.0", - "inherits": "2", - "minimatch": "^3.0.0" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "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" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true, - "optional": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true, - "optional": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^0.2.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "~0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true, - "optional": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true, - "optional": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "hawk": "3.1.3", - "mkdirp": "^0.5.1", - "nopt": "^4.0.1", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "request": "2.81.0", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^2.2.1", - "tar-pack": "^3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true, - "optional": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "~0.4.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "buffer-shims": "~1.0.0", - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~1.0.0", - "util-deprecate": "~1.0.1" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", - "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~4.2.1", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "performance-now": "^0.2.0", - "qs": "~6.4.0", - "safe-buffer": "^5.0.1", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.0.0" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "hoek": "2.x.x" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": true, - "optional": 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", - "jodid25519": "^1.0.0", - "jsbn": "~0.1.0", - "tweetnacl": "~0.14.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^2.2.0", - "fstream": "^1.0.10", - "fstream-ignore": "^1.0.5", - "once": "^1.3.3", - "readable-stream": "^2.1.4", - "rimraf": "^2.5.1", - "tar": "^2.2.1", - "uid-number": "^0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "^1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - } - } + "optional": true }, "function-bind": { "version": "1.1.1", @@ -2756,37 +5711,34 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "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-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-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true }, - "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.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2797,249 +5749,92 @@ "path-is-absolute": "^1.0.0" } }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", - "dev": true, - "requires": { - "find-index": "^0.1.1" - } - }, "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "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 }, "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", "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 - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "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.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "dev": true, - "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" - } - }, "has": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "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.0.2" - } - }, - "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" + "function-bind": "^1.1.1" } }, "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "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" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } - }, - "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-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" - } - } - } - }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", - "dev": true, - "requires": { - "boom": "4.x.x", - "cryptiles": "3.x.x", - "hoek": "4.x.x", - "sntp": "2.x.x" - } - }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", - "dev": true - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "hosted-git-info": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "html-encoding-sniffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "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.1" + "whatwg-encoding": "^1.0.5" } }, - "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" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "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 }, - "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" } }, "imurmurhash": { @@ -3059,245 +5854,57 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.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 - }, - "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" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.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-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, "is-ci": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz", + "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==", "dev": true, "requires": { - "ci-info": "^1.0.0" + "ci-info": "^3.1.1" } }, - "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=", + "is-core-module": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", + "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", "dev": true, "requires": { - "kind-of": "^3.0.2" - } - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "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-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, - "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": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" + "has": "^1.0.3" } }, "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 }, "is-generator-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", - "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", + "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": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-odd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", - "dev": true, - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "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" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "dev": true }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "^1.0.1" - } - }, "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, "is-typedarray": { @@ -3306,699 +5913,643 @@ "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-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 - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "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" - } - }, - "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-api": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz", - "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==", - "dev": true, - "requires": { - "async": "^2.1.4", - "compare-versions": "^3.1.0", - "fileset": "^2.0.2", - "istanbul-lib-coverage": "^1.2.0", - "istanbul-lib-hook": "^1.2.0", - "istanbul-lib-instrument": "^1.10.1", - "istanbul-lib-report": "^1.1.4", - "istanbul-lib-source-maps": "^1.2.4", - "istanbul-reports": "^1.3.0", - "js-yaml": "^3.7.0", - "mkdirp": "^0.5.1", - "once": "^1.4.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz", - "integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.2.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - } - } - } - }, "istanbul-lib-coverage": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz", - "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==", + "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": "1.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz", - "integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==", - "dev": true, - "requires": { - "append-transform": "^0.4.0" - } - }, "istanbul-lib-instrument": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz", - "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==", + "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-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.2.0", - "semver": "^5.3.0" + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" } }, "istanbul-lib-report": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz", - "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==", + "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": "^1.2.0", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" } }, "istanbul-lib-source-maps": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz", - "integrity": "sha512-fDa0hwU/5sDXwAklXgAoCJCOsFsBplVQ6WBldz5UwaqOzmDhUK4nfuR7/G//G2lERlblUNJB8P6e8cXq3a7MlA==", + "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": "^3.1.0", - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" } }, "istanbul-reports": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz", - "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==", "dev": true, "requires": { - "handlebars": "^4.0.3" + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" } }, "jest": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-22.4.3.tgz", - "integrity": "sha512-FFCdU/pXOEASfHxFDOWUysI/+FFoqiXJADEIXgDKuZyqSmBD3tZ4BEGH7+M79v7czj7bbkhwtd2LaEDcJiM/GQ==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.2.5.tgz", + "integrity": "sha512-vDMzXcpQN4Ycaqu+vO7LX8pZwNNoKMhc+gSp6q1D8S6ftRk8gNW8cni3YFxknP95jxzQo23Lul0BI2FrWgnwYQ==", "dev": true, "requires": { - "import-local": "^1.0.0", - "jest-cli": "^22.4.3" + "@jest/core": "^27.2.5", + "import-local": "^3.0.2", + "jest-cli": "^27.2.5" + } + }, + "jest-changed-files": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.2.5.tgz", + "integrity": "sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "execa": "^5.0.0", + "throat": "^6.0.1" + } + }, + "jest-circus": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.2.5.tgz", + "integrity": "sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==", + "dev": true, + "requires": { + "@jest/environment": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.2.5", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + } + }, + "jest-cli": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.2.5.tgz", + "integrity": "sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==", + "dev": true, + "requires": { + "@jest/core": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "import-local": "^3.0.2", + "jest-config": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "prompts": "^2.0.1", + "yargs": "^16.2.0" + } + }, + "jest-config": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.2.5.tgz", + "integrity": "sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^27.2.5", + "@jest/types": "^27.2.5", + "babel-jest": "^27.2.5", + "chalk": "^4.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.4", + "is-ci": "^3.0.0", + "jest-circus": "^27.2.5", + "jest-environment-jsdom": "^27.2.5", + "jest-environment-node": "^27.2.5", + "jest-get-type": "^27.0.6", + "jest-jasmine2": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-runner": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.5" + } + }, + "jest-diff": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.5.tgz", + "integrity": "sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^27.0.6", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + } + }, + "jest-docblock": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz", + "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.2.5.tgz", + "integrity": "sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5" + } + }, + "jest-environment-jsdom": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz", + "integrity": "sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==", + "dev": true, + "requires": { + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5", + "jsdom": "^16.6.0" + } + }, + "jest-environment-node": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.2.5.tgz", + "integrity": "sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==", + "dev": true, + "requires": { + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "jest-mock": "^27.2.5", + "jest-util": "^27.2.5" + } + }, + "jest-get-type": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz", + "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==", + "dev": true + }, + "jest-haste-map": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz", + "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.4", + "jest-regex-util": "^27.0.6", + "jest-serializer": "^27.0.6", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "micromatch": "^4.0.4", + "walker": "^1.0.7" + } + }, + "jest-jasmine2": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz", + "integrity": "sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==", + "dev": true, + "requires": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^27.2.5", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^27.2.5", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "pretty-format": "^27.2.5", + "throat": "^6.0.1" + } + }, + "jest-leak-detector": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz", + "integrity": "sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==", + "dev": true, + "requires": { + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + } + }, + "jest-matcher-utils": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz", + "integrity": "sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^27.2.5", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.5" + } + }, + "jest-message-util": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.5.tgz", + "integrity": "sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.2.5", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.5", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-mock": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.2.5.tgz", + "integrity": "sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "@types/node": "*" + } + }, + "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, + "requires": {} + }, + "jest-regex-util": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz", + "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==", + "dev": true + }, + "jest-resolve": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz", + "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "chalk": "^4.0.0", + "escalade": "^3.1.1", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "resolve": "^1.20.0", + "slash": "^3.0.0" + } + }, + "jest-resolve-dependencies": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz", + "integrity": "sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==", + "dev": true, + "requires": { + "@jest/types": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-snapshot": "^27.2.5" + } + }, + "jest-runner": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.2.5.tgz", + "integrity": "sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==", + "dev": true, + "requires": { + "@jest/console": "^27.2.5", + "@jest/environment": "^27.2.5", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-docblock": "^27.0.6", + "jest-environment-jsdom": "^27.2.5", + "jest-environment-node": "^27.2.5", + "jest-haste-map": "^27.2.5", + "jest-leak-detector": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-runtime": "^27.2.5", + "jest-util": "^27.2.5", + "jest-worker": "^27.2.5", + "source-map-support": "^0.5.6", + "throat": "^6.0.1" + } + }, + "jest-runtime": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.2.5.tgz", + "integrity": "sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==", + "dev": true, + "requires": { + "@jest/console": "^27.2.5", + "@jest/environment": "^27.2.5", + "@jest/fake-timers": "^27.2.5", + "@jest/globals": "^27.2.5", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.5", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-mock": "^27.2.5", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.5", + "jest-snapshot": "^27.2.5", + "jest-util": "^27.2.5", + "jest-validate": "^27.2.5", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^16.2.0" + } + }, + "jest-serializer": { + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz", + "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==", + "dev": true, + "requires": { + "@types/node": "*", + "graceful-fs": "^4.2.4" + } + }, + "jest-snapshot": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.2.5.tgz", + "integrity": "sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==", + "dev": true, + "requires": { + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/parser": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.0.0", + "@jest/transform": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.2.5", + "graceful-fs": "^4.2.4", + "jest-diff": "^27.2.5", + "jest-get-type": "^27.0.6", + "jest-haste-map": "^27.2.5", + "jest-matcher-utils": "^27.2.5", + "jest-message-util": "^27.2.5", + "jest-resolve": "^27.2.5", + "jest-util": "^27.2.5", + "natural-compare": "^1.4.0", + "pretty-format": "^27.2.5", + "semver": "^7.3.2" }, "dependencies": { - "jest-cli": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-22.4.3.tgz", - "integrity": "sha512-IiHybF0DJNqZPsbjn4Cy4vcqcmImpoFwNFnkehzVw8lTUSl4axZh5DHewu5bdpZF2Y5gUqFKYzH0FH4Qx2k+UA==", + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "import-local": "^1.0.0", - "is-ci": "^1.0.10", - "istanbul-api": "^1.1.14", - "istanbul-lib-coverage": "^1.1.1", - "istanbul-lib-instrument": "^1.8.0", - "istanbul-lib-source-maps": "^1.2.1", - "jest-changed-files": "^22.4.3", - "jest-config": "^22.4.3", - "jest-environment-jsdom": "^22.4.3", - "jest-get-type": "^22.4.3", - "jest-haste-map": "^22.4.3", - "jest-message-util": "^22.4.3", - "jest-regex-util": "^22.4.3", - "jest-resolve-dependencies": "^22.4.3", - "jest-runner": "^22.4.3", - "jest-runtime": "^22.4.3", - "jest-snapshot": "^22.4.3", - "jest-util": "^22.4.3", - "jest-validate": "^22.4.3", - "jest-worker": "^22.4.3", - "micromatch": "^2.3.11", - "node-notifier": "^5.2.1", - "realpath-native": "^1.0.0", - "rimraf": "^2.5.4", - "slash": "^1.0.0", - "string-length": "^2.0.0", - "strip-ansi": "^4.0.0", - "which": "^1.2.12", - "yargs": "^10.0.3" + "lru-cache": "^6.0.0" } } } }, - "jest-changed-files": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-22.4.3.tgz", - "integrity": "sha512-83Dh0w1aSkUNFhy5d2dvqWxi/y6weDwVVLU6vmK0cV9VpRxPzhTeGimbsbRDSnEoszhF937M4sDLLeS7Cu/Tmw==", - "dev": true, - "requires": { - "throat": "^4.0.0" - } - }, - "jest-config": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-22.4.3.tgz", - "integrity": "sha512-KSg3EOToCgkX+lIvenKY7J8s426h6ahXxaUFJxvGoEk0562Z6inWj1TnKoGycTASwiLD+6kSYFALcjdosq9KIQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "glob": "^7.1.1", - "jest-environment-jsdom": "^22.4.3", - "jest-environment-node": "^22.4.3", - "jest-get-type": "^22.4.3", - "jest-jasmine2": "^22.4.3", - "jest-regex-util": "^22.4.3", - "jest-resolve": "^22.4.3", - "jest-util": "^22.4.3", - "jest-validate": "^22.4.3", - "pretty-format": "^22.4.3" - } - }, - "jest-diff": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz", - "integrity": "sha512-/QqGvCDP5oZOF6PebDuLwrB2BMD8ffJv6TAGAdEVuDx1+uEgrHpSFrfrOiMRx2eJ1hgNjlQrOQEHetVwij90KA==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "diff": "^3.2.0", - "jest-get-type": "^22.4.3", - "pretty-format": "^22.4.3" - } - }, - "jest-docblock": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-22.4.3.tgz", - "integrity": "sha512-uPKBEAw7YrEMcXueMKZXn/rbMxBiSv48fSqy3uEnmgOlQhSX+lthBqHb1fKWNVmFqAp9E/RsSdBfiV31LbzaOg==", - "dev": true, - "requires": { - "detect-newline": "^2.1.0" - } - }, - "jest-environment-jsdom": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz", - "integrity": "sha512-FviwfR+VyT3Datf13+ULjIMO5CSeajlayhhYQwpzgunswoaLIPutdbrnfUHEMyJCwvqQFaVtTmn9+Y8WCt6n1w==", - "dev": true, - "requires": { - "jest-mock": "^22.4.3", - "jest-util": "^22.4.3", - "jsdom": "^11.5.1" - } - }, - "jest-environment-node": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-22.4.3.tgz", - "integrity": "sha512-reZl8XF6t/lMEuPWwo9OLfttyC26A5AMgDyEQ6DBgZuyfyeNUzYT8BFo6uxCCP/Av/b7eb9fTi3sIHFPBzmlRA==", - "dev": true, - "requires": { - "jest-mock": "^22.4.3", - "jest-util": "^22.4.3" - } - }, - "jest-get-type": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", - "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", - "dev": true - }, - "jest-haste-map": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-22.4.3.tgz", - "integrity": "sha512-4Q9fjzuPVwnaqGKDpIsCSoTSnG3cteyk2oNVjBX12HHOaF1oxql+uUiqZb5Ndu7g/vTZfdNwwy4WwYogLh29DQ==", - "dev": true, - "requires": { - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.1.11", - "jest-docblock": "^22.4.3", - "jest-serializer": "^22.4.3", - "jest-worker": "^22.4.3", - "micromatch": "^2.3.11", - "sane": "^2.0.0" - } - }, - "jest-jasmine2": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-22.4.3.tgz", - "integrity": "sha512-yZCPCJUcEY6R5KJB/VReo1AYI2b+5Ky+C+JA1v34jndJsRcLpU4IZX4rFJn7yDTtdNbO/nNqg+3SDIPNH2ecnw==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "co": "^4.6.0", - "expect": "^22.4.3", - "graceful-fs": "^4.1.11", - "is-generator-fn": "^1.0.0", - "jest-diff": "^22.4.3", - "jest-matcher-utils": "^22.4.3", - "jest-message-util": "^22.4.3", - "jest-snapshot": "^22.4.3", - "jest-util": "^22.4.3", - "source-map-support": "^0.5.0" - } - }, - "jest-leak-detector": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz", - "integrity": "sha512-NZpR/Ls7+ndO57LuXROdgCGz2RmUdC541tTImL9bdUtU3WadgFGm0yV+Ok4Fuia/1rLAn5KaJ+i76L6e3zGJYQ==", - "dev": true, - "requires": { - "pretty-format": "^22.4.3" - } - }, - "jest-matcher-utils": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz", - "integrity": "sha512-lsEHVaTnKzdAPR5t4B6OcxXo9Vy4K+kRRbG5gtddY8lBEC+Mlpvm1CJcsMESRjzUhzkz568exMV1hTB76nAKbA==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "jest-get-type": "^22.4.3", - "pretty-format": "^22.4.3" - } - }, - "jest-message-util": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz", - "integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0-beta.35", - "chalk": "^2.0.1", - "micromatch": "^2.3.11", - "slash": "^1.0.0", - "stack-utils": "^1.0.1" - } - }, - "jest-mock": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz", - "integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q==", - "dev": true - }, - "jest-regex-util": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-22.4.3.tgz", - "integrity": "sha512-LFg1gWr3QinIjb8j833bq7jtQopiwdAs67OGfkPrvy7uNUbVMfTXXcOKXJaeY5GgjobELkKvKENqq1xrUectWg==", - "dev": true - }, - "jest-resolve": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz", - "integrity": "sha512-u3BkD/MQBmwrOJDzDIaxpyqTxYH+XqAXzVJP51gt29H8jpj3QgKof5GGO2uPGKGeA1yTMlpbMs1gIQ6U4vcRhw==", - "dev": true, - "requires": { - "browser-resolve": "^1.11.2", - "chalk": "^2.0.1" - } - }, - "jest-resolve-dependencies": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz", - "integrity": "sha512-06czCMVToSN8F2U4EvgSB1Bv/56gc7MpCftZ9z9fBgUQM7dzHGCMBsyfVA6dZTx8v0FDcnALf7hupeQxaBCvpA==", - "dev": true, - "requires": { - "jest-regex-util": "^22.4.3" - } - }, - "jest-runner": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-22.4.3.tgz", - "integrity": "sha512-U7PLlQPRlWNbvOHWOrrVay9sqhBJmiKeAdKIkvX4n1G2tsvzLlf77nBD28GL1N6tGv4RmuTfI8R8JrkvCa+IBg==", - "dev": true, - "requires": { - "exit": "^0.1.2", - "jest-config": "^22.4.3", - "jest-docblock": "^22.4.3", - "jest-haste-map": "^22.4.3", - "jest-jasmine2": "^22.4.3", - "jest-leak-detector": "^22.4.3", - "jest-message-util": "^22.4.3", - "jest-runtime": "^22.4.3", - "jest-util": "^22.4.3", - "jest-worker": "^22.4.3", - "throat": "^4.0.0" - } - }, - "jest-runtime": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-22.4.3.tgz", - "integrity": "sha512-Eat/esQjevhx9BgJEC8udye+FfoJ2qvxAZfOAWshYGS22HydHn5BgsvPdTtt9cp0fSl5LxYOFA1Pja9Iz2Zt8g==", - "dev": true, - "requires": { - "babel-core": "^6.0.0", - "babel-jest": "^22.4.3", - "babel-plugin-istanbul": "^4.1.5", - "chalk": "^2.0.1", - "convert-source-map": "^1.4.0", - "exit": "^0.1.2", - "graceful-fs": "^4.1.11", - "jest-config": "^22.4.3", - "jest-haste-map": "^22.4.3", - "jest-regex-util": "^22.4.3", - "jest-resolve": "^22.4.3", - "jest-util": "^22.4.3", - "jest-validate": "^22.4.3", - "json-stable-stringify": "^1.0.1", - "micromatch": "^2.3.11", - "realpath-native": "^1.0.0", - "slash": "^1.0.0", - "strip-bom": "3.0.0", - "write-file-atomic": "^2.1.0", - "yargs": "^10.0.3" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, - "jest-serializer": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-22.4.3.tgz", - "integrity": "sha512-uPaUAppx4VUfJ0QDerpNdF43F68eqKWCzzhUlKNDsUPhjOon7ZehR4C809GCqh765FoMRtTVUVnGvIoskkYHiw==", - "dev": true - }, - "jest-snapshot": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz", - "integrity": "sha512-JXA0gVs5YL0HtLDCGa9YxcmmV2LZbwJ+0MfyXBBc5qpgkEYITQFJP7XNhcHFbUvRiniRpRbGVfJrOoYhhGE0RQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "jest-diff": "^22.4.3", - "jest-matcher-utils": "^22.4.3", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "pretty-format": "^22.4.3" - } - }, "jest-util": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz", - "integrity": "sha512-rfDfG8wyC5pDPNdcnAlZgwKnzHvZDu8Td2NJI/jAGKEGxJPYiE4F0ss/gSAkG4778Y23Hvbz+0GMrDJTeo7RjQ==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz", + "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==", "dev": true, "requires": { - "callsites": "^2.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.11", - "is-ci": "^1.0.10", - "jest-message-util": "^22.4.3", - "mkdirp": "^0.5.1", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "@jest/types": "^27.2.5", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^3.0.0", + "picomatch": "^2.2.3" } }, "jest-validate": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-22.4.3.tgz", - "integrity": "sha512-CfFM18W3GSP/xgmA4UouIx0ljdtfD2mjeBC6c89Gg17E44D4tQhAcTrZmf9djvipwU30kSTnk6CzcxdCCeSXfA==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.2.5.tgz", + "integrity": "sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-config": "^22.4.3", - "jest-get-type": "^22.4.3", - "leven": "^2.1.0", - "pretty-format": "^22.4.3" + "@jest/types": "^27.2.5", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "leven": "^3.1.0", + "pretty-format": "^27.2.5" + }, + "dependencies": { + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", + "dev": true + } + } + }, + "jest-watcher": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.2.5.tgz", + "integrity": "sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==", + "dev": true, + "requires": { + "@jest/test-result": "^27.2.5", + "@jest/types": "^27.2.5", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.2.5", + "string-length": "^4.0.1" } }, "jest-worker": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-22.4.3.tgz", - "integrity": "sha512-B1ucW4fI8qVAuZmicFxI1R3kr2fNeYJyvIQ1rKcuLYnenFV5K5aMbxFj6J0i00Ju83S8jP2d7Dz14+AvbIHRYQ==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz", + "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==", "dev": true, "requires": { - "merge-stream": "^1.0.1" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, "js-yaml": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", - "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true - }, "jsdom": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.8.0.tgz", - "integrity": "sha512-fZZSH6P8tVqYIQl0WKpZuQljPu2cW41Uj/c9omtyGwjwZCB8c82UAi7BSQs/F1FgWovmZsoU02z3k28eHp0Cdw==", + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", "dev": true, "requires": { - "abab": "^1.0.4", - "acorn": "^5.3.0", - "acorn-globals": "^4.1.0", - "array-equal": "^1.0.0", - "cssom": ">= 0.3.2 < 0.4.0", - "cssstyle": ">= 0.2.37 < 0.3.0", - "data-urls": "^1.0.0", - "domexception": "^1.0.0", - "escodegen": "^1.9.0", - "html-encoding-sniffer": "^1.0.2", - "left-pad": "^1.2.0", - "nwmatcher": "^1.4.3", - "parse5": "4.0.0", - "pn": "^1.1.0", - "request": "^2.83.0", - "request-promise-native": "^1.0.5", - "sax": "^1.2.4", - "symbol-tree": "^3.2.2", - "tough-cookie": "^2.3.3", - "w3c-hr-time": "^1.0.1", - "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.3", - "whatwg-mimetype": "^2.1.0", - "whatwg-url": "^6.4.0", - "ws": "^4.0.0", + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "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.5.0", + "ws": "^7.4.6", "xml-name-validator": "^3.0.0" }, "dependencies": { "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0" - } + "requires": {} } } }, "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - }, - "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.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "requires": { - "jsonify": "~0.0.0" - } - }, - "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=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "minimist": "^1.2.5" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, - "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" - } - }, - "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" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true - }, - "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" - } - }, - "left-pad": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", - "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true }, "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=", + "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": { @@ -4011,39 +6562,19 @@ "type-check": "~0.3.2" } }, - "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" - } - }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "^4.1.0" } }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", - "dev": true - }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "long": { @@ -4051,32 +6582,30 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, - "requires": { - "js-tokens": "^3.0.0" - } - }, "lru-cache": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", - "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^4.0.0" } }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, "makeerror": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", @@ -4086,85 +6615,46 @@ "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" - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", - "dev": true + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" }, "merge-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", - "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "braces": "^3.0.1", + "picomatch": "^2.2.3" } }, "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", "dev": true }, "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", "dev": true, "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.50.0" } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, "minimatch": { @@ -4177,94 +6667,16 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "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.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, - "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "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-odd": "^2.0.0", - "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" - }, - "dependencies": { - "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 - }, - "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 - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -4277,154 +6689,39 @@ "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", "dev": true }, - "node-notifier": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", - "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", - "dev": true, - "requires": { - "growly": "^1.3.0", - "semver": "^5.4.1", - "shellwords": "^0.1.1", - "which": "^1.3.0" - } + "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 }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } + "node-releases": { + "version": "1.1.77", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", + "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==", + "dev": true }, "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" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "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=", + "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": "^2.0.0" + "path-key": "^3.0.0" } }, - "number-is-nan": { - "version": "1.0.1", - "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 }, - "nwmatcher": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz", - "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==", - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "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=", - "dev": true - }, - "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" - } - } - } - }, - "object-keys": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", - "dev": true - }, - "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" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } - }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - }, - "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" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } - } - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -4434,128 +6731,63 @@ "wrappy": "1" } }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "mimic-fn": "^2.1.0" } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } + "word-wrap": "~1.2.3" } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "p-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": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "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": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.2.0" } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - } - }, - "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" - } + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true }, "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "path-is-absolute": { @@ -4565,122 +6797,87 @@ "dev": true }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "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" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", "dev": true }, - "pify": { + "picomatch": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "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=", + "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": { - "pinkie": "^2.0.0" + "node-modules-regexp": "^1.0.0" } }, "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "^4.0.0" } }, - "pn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", - "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", - "dev": true - }, - "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", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, "pretty-format": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz", - "integrity": "sha512-S4oT9/sT6MN7/3COoOy+ZJeA92VmOnveLHgrwBE3Z1W5N9S2A1QGNYiE1z75DAENbJrXXUb+OWXhpJcg05QKQQ==", + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz", + "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==", "dev": true, "requires": { - "ansi-regex": "^3.0.0", - "ansi-styles": "^3.2.0" + "@jest/types": "^27.2.5", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true } } }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true + "prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } }, "protobufjs": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", - "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -4692,917 +6889,143 @@ "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", - "@types/long": "^3.0.32", - "@types/node": "^8.9.4", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", "long": "^4.0.0" } }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "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 }, "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "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" - } - } - } - }, - "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" - } - }, - "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.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" - } - }, - "realpath-native": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.0.tgz", - "integrity": "sha512-XJtlRJ9jf0E1H1SLeJyQ9PGzQD7S65h1pRXEcAeK48doKOnKxcgPeNohJvD5u/2sI9J1oke6E8bZHS/fmW1UiQ==", - "dev": true, - "requires": { - "util.promisify": "^1.0.0" - } - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, - "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" - } - }, - "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.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "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=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "hawk": "~6.0.2", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "stringstream": "~0.0.5", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - } - }, - "request-promise-core": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", - "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", - "dev": true, - "requires": { - "lodash": "^4.13.1" - } - }, - "request-promise-native": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", - "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", - "dev": true, - "requires": { - "request-promise-core": "1.1.1", - "stealthy-require": "^1.1.0", - "tough-cookie": ">=2.3.3" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, - "require-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 - }, "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "is-core-module": "^2.2.0", + "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" } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, - "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 - }, - "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 - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "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.0.5" + "glob": "^7.1.3" } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, - "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" - } - }, - "sane": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.0.tgz", - "integrity": "sha512-glfKd7YH4UCrh/7dD+UESsr8ylKWRE7UQPoXuz28FgmcF0ViJQhCTCCZHICRKxf8G8O1KdLEn20dcICK54c7ew==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "exec-sh": "^0.2.0", - "fb-watchman": "^2.0.0", - "fsevents": "^1.1.1", - "micromatch": "^3.1.4", - "minimist": "^1.1.1", - "walker": "~1.0.5", - "watch": "~0.18.0" - }, - "dependencies": { - "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 - }, - "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 - }, - "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" - } - } - } - }, - "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": { - "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": { - "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" - } - }, - "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": { - "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-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": { - "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-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" - } - }, - "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 - } - } - }, - "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" - } - } - } - }, - "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-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" - } - }, - "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" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "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" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "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.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "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" - } - } - } - }, "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "^3.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 - }, - "shell-quote": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", - "dev": true, - "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" - } - }, - "shellwords": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", + "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==", + "dev": true + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, - "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": { - "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" - } - } - } - }, - "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" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "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" - } - }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "source-map-resolve": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", - "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", - "dev": true, - "requires": { - "atob": "^2.0.0", - "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.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "dev": true, "requires": { + "buffer-from": "^1.0.0", "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "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 - }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", - "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": { @@ -5611,648 +7034,216 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", - "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", - "tweetnacl": "~0.14.0" - } - }, "stack-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz", - "integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", + "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", "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" - } - } + "escape-string-regexp": "^2.0.0" } }, - "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-length": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", - "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, "requires": { - "astral-regex": "^1.0.0", - "strip-ansi": "^4.0.0" + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" } }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true - }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - } + "ansi-regex": "^5.0.1" } }, "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" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, - "subarg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", - "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=", - "dev": true, - "requires": { - "minimist": "^1.1.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "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": "^3.0.0" + "has-flag": "^4.0.0" + } + }, + "supports-hyperlinks": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", + "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", + "dev": true, + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" } }, "symbol-tree": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", - "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", + "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 }, - "test-exclude": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz", - "integrity": "sha512-qpqlP/8Zl+sosLxBcVKl9vYy26T9NPalxSzzCP/OY6K7j938ui2oKgo+kRZYfxAeIpLqpbVnsHq1tyV70E4lWQ==", + "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": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" - }, - "dependencies": { - "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 - }, - "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 - }, - "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" - } - } - } - }, - "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": { - "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": { - "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" - } - }, - "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": { - "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-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": { - "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-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" - } - }, - "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 - } - } - }, - "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" - } - } - } - }, - "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-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" - } - }, - "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" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "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" - } - } + "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", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" } }, "throat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", - "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", + "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", "dev": true }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "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 }, - "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" - } - }, - "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": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "dependencies": { - "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" - } - } + "is-number": "^7.0.0" } }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", "dev": true, "requires": { - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" } }, "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "^2.1.1" } }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, "ts-jest": { - "version": "22.4.3", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-22.4.3.tgz", - "integrity": "sha512-5jlt03bFh8rAtFPQ7f6mFbqagi0NAT8OG+Fi2qizvQB/jr8xyZ0cjqApAw48zD+lMmV24V/ety3F4YNIuGngXg==", + "version": "27.0.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.0.5.tgz", + "integrity": "sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w==", "dev": true, "requires": { - "babel-core": "^6.26.0", - "babel-plugin-istanbul": "^4.1.4", - "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", - "babel-preset-jest": "^22.4.0", - "cpx": "^1.5.0", - "fs-extra": "4.0.3", - "jest-config": "^22.4.2", - "pkg-dir": "^2.0.0", - "yargs": "^11.0.0" + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", + "json5": "2.x", + "lodash": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "20.x" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", - "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" + "lru-cache": "^6.0.0" } } } }, "ts2fable": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/ts2fable/-/ts2fable-0.6.1.tgz", - "integrity": "sha1-Jkrvzde3XdMzpnUOFAyX0ivgf9Q=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ts2fable/-/ts2fable-0.7.1.tgz", + "integrity": "sha512-4CiCzuWF9ueSLlr+OozcwaehhCno1frnPZbHM7Jd4EfKzSlHk3hyjrhFKttnXQ2Sx0tGe8C4xwjDhnZaOSqFkw==", "dev": true, "requires": { - "typescript": "2.6.1", - "yargs": "^10.0.3" + "typescript": "3.7.4" }, "dependencies": { "typescript": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz", - "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", "dev": true } } }, "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tsutils": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.24.0.tgz", - "integrity": "sha512-rOIkvoe17acR3r96IPnqwa1+Z7zx9AroEtEKl20IeExXtoWptqG/zb806cYOvdbQGcxh1eOaZQNruOQ716Edig==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, - "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, - "optional": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6262,206 +7253,74 @@ "prelude-ls": "~1.1.2" } }, - "typescript": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz", - "integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg==", + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "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" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", + "dev": true + }, "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "v8-to-istanbul": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz", + "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==", "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" }, "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 - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "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 } } }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, - "use": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" - } - }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "w3c-hr-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz", - "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=", + "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": "^0.1.2" + "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": { @@ -6474,122 +7333,70 @@ } }, "watch": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", - "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz", + "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=", "requires": { "exec-sh": "^0.2.0", "minimist": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } } }, "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "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.3", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", - "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", + "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.19" + "iconv-lite": "0.4.24" } }, "whatwg-mimetype": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz", - "integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew==", + "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": "6.4.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.0.tgz", - "integrity": "sha512-Z0CVh/YE217Foyb488eo+iBv+r7eAQ0wSTyApi9n06jhcA3z6Nidg/EGvl0UFkg7kMdKxfBzzr+o9JF+cevgMg==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.0", - "webidl-conversions": "^4.0.1" + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" } }, "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "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=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "wrappy": { @@ -6599,24 +7406,23 @@ "dev": true }, "write-file-atomic": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, "ws": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz", - "integrity": "sha512-bOusvpCb09TOBLbpMKszd45WKC2KPtxiyiHanv+H2DE3Az+1db5a/L7sVJZVDPUC1Br8f0SKRr1KjLpD1U/IAw==", + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } + "requires": {} }, "xml-name-validator": { "version": "3.0.0", @@ -6624,67 +7430,44 @@ "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 + }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yargs": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz", - "integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^8.1.0" - }, - "dependencies": { - "cliui": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", - "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - } + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } }, "yargs-parser": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz", - "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true } } } diff --git a/src/web/api/package.json b/src/web/api/package.json index ddfcde968..f1ddf842d 100644 --- a/src/web/api/package.json +++ b/src/web/api/package.json @@ -1,25 +1,16 @@ { - "name": "spark-api", - "version": "1.0.0", - "description": "Blue Trading Systems Spark API", - "repository": {}, - "engineStrict": true, - "engines": { - "node": ">= 8.9.0" + "dependencies": { + "protobufjs": "^6.11.2", + "tslib": "^2.3.1", + "watch": "^1.0.2" }, "devDependencies": { - "@types/jest": "~22.2.2", - "@types/node": "~8.10.0", - "jest": "~22.4.3", - "ts-jest": "~22.4.2", - "ts2fable": "^0.6.1", - "tsutils": "~2.24.0", - "typescript": "~2.8.1", - "ws": "^5.1.1" - }, - "dependencies": { - "tslib": "~1.9.0", - "protobufjs": "^6.8.6" + "jest": "^27.2.5", + "ts-jest": "^27.0.5", + "ts2fable": "^0.7.1", + "tsutils": "^3.21.0", + "typescript": "^4.4.3", + "ws": "^8.2.3" }, "scripts": { "build": "tsc -p tsconfig.release.json", @@ -28,7 +19,5 @@ "test": "jest", "test:watch": "jest --watch", "fable": "ts2fable %build%/ServiceContext.d.ts %build%/ServiceContext.fs && ts2fable %build%/HelloService.d.ts %build%/HelloService.fs" - }, - "author": "Blue Trading Systems", - "license": "ISC" + } } diff --git a/src/web/ui/package-lock.json b/src/web/ui/package-lock.json index 43fc558b5..76e2f0616 100644 --- a/src/web/ui/package-lock.json +++ b/src/web/ui/package-lock.json @@ -1,9 +1,9391 @@ { "name": "ui", - "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "dependencies": { + "@babel/preset-env": "^7.15.8", + "babel-preset-env": "^1.7.0", + "babel-runtime": "^6.26.0", + "fable-loader": "^2.1.9", + "fable-utils": "^1.2.0", + "loglevel": "^1.7.1", + "node-sass": "^6.0.1", + "protobufjs": "^6.11.2", + "react": "^16.14.0", + "react-data-grid-addons": "^7.0.0-alpha.24", + "upgrade": "^1.1.0", + "webpack": "^5.58.1", + "webpack-cli": "^4.9.0" + }, + "devDependencies": { + "babel-core": "^6.26.3", + "babel-plugin-transform-runtime": "^6.23.0", + "bulma": "^0.9.3", + "css-loader": "^6.4.0", + "remotedev": "^0.2.9", + "sass-loader": "^12.1.0", + "style-loader": "^3.3.0", + "tslib": "^2.3.1", + "webpack-dev-server": "^4.3.1" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", + "dependencies": { + "@babel/highlight": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", + "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.15.8", + "@babel/generator": "^7.15.8", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.8", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.8", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", + "dependencies": { + "@babel/types": "^7.15.6", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-annotate-as-pure": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz", + "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz", + "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==", + "dependencies": { + "@babel/helper-explode-assignable-expression": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", + "dependencies": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-create-class-features-plugin": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz", + "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz", + "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.14.5", + "regexpu-core": "^4.7.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/regexpu-core": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz", + "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==", + "dependencies": { + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^9.0.0", + "regjsgen": "^0.5.2", + "regjsparser": "^0.7.0", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/regjsgen": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", + "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" + }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/regjsparser": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz", + "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==", + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", + "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", + "dependencies": { + "@babel/helper-compilation-targets": "^7.13.0", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/traverse": "^7.13.0", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2", + "semver": "^6.1.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0-0" + } + }, + "node_modules/@babel/helper-explode-assignable-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz", + "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", + "dependencies": { + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-get-function-arity": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", + "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", + "dependencies": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/helper-validator-identifier": "^7.15.7", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-optimise-call-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz", + "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-wrap-function": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-replace-supers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", + "dependencies": { + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz", + "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", + "dependencies": { + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-wrap-function": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz", + "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==", + "dependencies": { + "@babel/helper-function-name": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", + "peer": true, + "dependencies": { + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.14.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz", + "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4", + "@babel/plugin-proposal-optional-chaining": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.13.0" + } + }, + "node_modules/@babel/plugin-proposal-async-generator-functions": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz", + "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.15.4", + "@babel/plugin-syntax-async-generators": "^7.8.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-class-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz", + "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-class-static-block": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz", + "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.12.0" + } + }, + "node_modules/@babel/plugin-proposal-dynamic-import": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz", + "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-export-namespace-from": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz", + "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-json-strings": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz", + "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-logical-assignment-operators": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz", + "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz", + "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-numeric-separator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz", + "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-object-rest-spread": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz", + "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==", + "dependencies": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-optional-catch-binding": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz", + "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-optional-chaining": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz", + "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-private-methods": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz", + "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz", + "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-unicode-property-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz", + "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@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==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", + "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz", + "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==", + "dependencies": { + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz", + "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz", + "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-classes": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz", + "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz", + "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz", + "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz", + "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-duplicate-keys": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz", + "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz", + "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==", + "dependencies": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-for-of": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz", + "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-function-name": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz", + "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==", + "dependencies": { + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz", + "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-member-expression-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz", + "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-amd": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz", + "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==", + "dependencies": { + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "babel-plugin-dynamic-import-node": "^2.3.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-commonjs": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz", + "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==", + "dependencies": { + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-simple-access": "^7.15.4", + "babel-plugin-dynamic-import-node": "^2.3.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-systemjs": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz", + "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==", + "dependencies": { + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.9", + "babel-plugin-dynamic-import-node": "^2.3.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-umd": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz", + "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==", + "dependencies": { + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", + "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-new-target": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz", + "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-super": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz", + "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz", + "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz", + "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-regenerator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz", + "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==", + "dependencies": { + "regenerator-transform": "^0.14.2" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-regenerator/node_modules/regenerator-transform": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", + "dependencies": { + "@babel/runtime": "^7.8.4" + } + }, + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz", + "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-shorthand-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", + "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-spread": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz", + "integrity": "sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-sticky-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz", + "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-template-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz", + "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-typeof-symbol": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz", + "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-escapes": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz", + "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz", + "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz", + "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==", + "dependencies": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4", + "@babel/plugin-proposal-async-generator-functions": "^7.15.8", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.15.4", + "@babel/plugin-proposal-dynamic-import": "^7.14.5", + "@babel/plugin-proposal-export-namespace-from": "^7.14.5", + "@babel/plugin-proposal-json-strings": "^7.14.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-numeric-separator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-private-methods": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.15.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-async-to-generator": "^7.14.5", + "@babel/plugin-transform-block-scoped-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.15.3", + "@babel/plugin-transform-classes": "^7.15.4", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.7", + "@babel/plugin-transform-dotall-regex": "^7.14.5", + "@babel/plugin-transform-duplicate-keys": "^7.14.5", + "@babel/plugin-transform-exponentiation-operator": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.15.4", + "@babel/plugin-transform-function-name": "^7.14.5", + "@babel/plugin-transform-literals": "^7.14.5", + "@babel/plugin-transform-member-expression-literals": "^7.14.5", + "@babel/plugin-transform-modules-amd": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.4", + "@babel/plugin-transform-modules-systemjs": "^7.15.4", + "@babel/plugin-transform-modules-umd": "^7.14.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", + "@babel/plugin-transform-new-target": "^7.14.5", + "@babel/plugin-transform-object-super": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.15.4", + "@babel/plugin-transform-property-literals": "^7.14.5", + "@babel/plugin-transform-regenerator": "^7.14.5", + "@babel/plugin-transform-reserved-words": "^7.14.5", + "@babel/plugin-transform-shorthand-properties": "^7.14.5", + "@babel/plugin-transform-spread": "^7.15.8", + "@babel/plugin-transform-sticky-regex": "^7.14.5", + "@babel/plugin-transform-template-literals": "^7.14.5", + "@babel/plugin-transform-typeof-symbol": "^7.14.5", + "@babel/plugin-transform-unicode-escapes": "^7.14.5", + "@babel/plugin-transform-unicode-regex": "^7.14.5", + "@babel/preset-modules": "^0.1.4", + "@babel/types": "^7.15.6", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.5", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "core-js-compat": "^3.16.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-modules": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, + "node_modules/@babel/template": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", + "dependencies": { + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", + "dependencies": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.14.9", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", + "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "node_modules/@types/eslint": { + "version": "7.28.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.1.tgz", + "integrity": "sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + }, + "node_modules/@types/http-proxy": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz", + "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + }, + "node_modules/@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + }, + "node_modules/@types/minimist": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" + }, + "node_modules/@types/node": { + "version": "16.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", + "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" + }, + "node_modules/@types/retry": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz", + "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", + "dev": true + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", + "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/helper-wasm-section": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-opt": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "@webassemblyjs/wast-printer": "1.11.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webpack-cli/configtest": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", + "peerDependencies": { + "webpack": "4.x.x || 5.x.x", + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/info": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", + "dependencies": { + "envinfo": "^7.7.3" + }, + "peerDependencies": { + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/serve": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", + "peerDependencies": { + "webpack-cli": "4.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dev": true, + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "peerDependencies": { + "acorn": "^8" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", + "dev": true, + "engines": [ + "node >= 0.8.0" + ], + "bin": { + "ansi-html": "bin/ansi-html" + } + }, + "node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "node_modules/are-we-there-yet": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "node_modules/array-flatten": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", + "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", + "dev": true + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", + "engines": { + "node": "*" + } + }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/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=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, + "node_modules/babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dependencies": { + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + } + }, + "node_modules/babel-code-frame/node_modules/ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/babel-code-frame/node_modules/chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dependencies": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/babel-code-frame/node_modules/js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "node_modules/babel-code-frame/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/babel-core": { + "version": "6.26.3", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", + "dev": true, + "dependencies": { + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" + } + }, + "node_modules/babel-core/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/babel-core/node_modules/json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/babel-core/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "dev": true, + "dependencies": { + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + } + }, + "node_modules/babel-generator/node_modules/jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dependencies": { + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-call-delegate": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", + "dependencies": { + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-define-map": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", + "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", + "dependencies": { + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" + } + }, + "node_modules/babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "dependencies": { + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-hoist-variables": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-optimise-call-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", + "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-regex": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", + "dependencies": { + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" + } + }, + "node_modules/babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dependencies": { + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helper-replace-supers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", + "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", + "dependencies": { + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-helpers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "dev": true, + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" + } + }, + "node_modules/babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-check-es2015-constants": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "dependencies": { + "object.assign": "^4.1.0" + } + }, + "node_modules/babel-plugin-polyfill-corejs2": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", + "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", + "dependencies": { + "@babel/compat-data": "^7.13.11", + "@babel/helper-define-polyfill-provider": "^0.2.2", + "semver": "^6.1.1" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/babel-plugin-polyfill-corejs3": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz", + "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.2.2", + "core-js-compat": "^3.16.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/babel-plugin-polyfill-regenerator": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.2.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=" + }, + "node_modules/babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=" + }, + "node_modules/babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=" + }, + "node_modules/babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dependencies": { + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-arrow-functions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", + "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-block-scoped-functions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", + "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-block-scoping": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", + "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", + "dependencies": { + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" + } + }, + "node_modules/babel-plugin-transform-es2015-classes": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", + "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", + "dependencies": { + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-computed-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", + "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-destructuring": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-duplicate-keys": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", + "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-for-of": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", + "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", + "dependencies": { + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-literals": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", + "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-modules-amd": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", + "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", + "dependencies": { + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-modules-commonjs": { + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", + "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", + "dependencies": { + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" + } + }, + "node_modules/babel-plugin-transform-es2015-modules-systemjs": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", + "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", + "dependencies": { + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-modules-umd": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", + "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", + "dependencies": { + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-object-super": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", + "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", + "dependencies": { + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-parameters": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", + "dependencies": { + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-shorthand-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", + "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-spread": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-sticky-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", + "dependencies": { + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-plugin-transform-es2015-template-literals": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", + "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-typeof-symbol": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", + "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-es2015-unicode-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", + "dependencies": { + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" + } + }, + "node_modules/babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dependencies": { + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-regenerator": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", + "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", + "dependencies": { + "regenerator-transform": "^0.10.0" + } + }, + "node_modules/babel-plugin-transform-runtime": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", + "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", + "dev": true, + "dependencies": { + "babel-runtime": "^6.22.0" + } + }, + "node_modules/babel-plugin-transform-strict-mode": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "dependencies": { + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, + "node_modules/babel-preset-env": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", + "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", + "dependencies": { + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-to-generator": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.23.0", + "babel-plugin-transform-es2015-classes": "^6.23.0", + "babel-plugin-transform-es2015-computed-properties": "^6.22.0", + "babel-plugin-transform-es2015-destructuring": "^6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", + "babel-plugin-transform-es2015-for-of": "^6.23.0", + "babel-plugin-transform-es2015-function-name": "^6.22.0", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.22.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-umd": "^6.23.0", + "babel-plugin-transform-es2015-object-super": "^6.22.0", + "babel-plugin-transform-es2015-parameters": "^6.23.0", + "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", + "babel-plugin-transform-exponentiation-operator": "^6.22.0", + "babel-plugin-transform-regenerator": "^6.22.0", + "browserslist": "^3.2.6", + "invariant": "^2.2.2", + "semver": "^5.3.0" + } + }, + "node_modules/babel-preset-env/node_modules/browserslist": { + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", + "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", + "dependencies": { + "caniuse-lite": "^1.0.30000844", + "electron-to-chromium": "^1.3.47" + }, + "bin": { + "browserslist": "cli.js" + } + }, + "node_modules/babel-preset-env/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "dev": true, + "dependencies": { + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" + } + }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dependencies": { + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" + } + }, + "node_modules/babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dependencies": { + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + } + }, + "node_modules/babel-traverse/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/babel-traverse/node_modules/globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/babel-traverse/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dependencies": { + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + } + }, + "node_modules/babel-types/node_modules/to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "bin": { + "babylon": "bin/babylon.js" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/base-64": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", + "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs=", + "dev": true + }, + "node_modules/batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", + "dev": true + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/body-parser/node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/bonjour": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", + "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "dev": true, + "dependencies": { + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", + "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", + "dependencies": { + "caniuse-lite": "^1.0.30001264", + "electron-to-chromium": "^1.3.857", + "escalade": "^3.1.1", + "node-releases": "^1.1.77", + "picocolors": "^0.2.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/buffer-indexof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", + "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "dev": true + }, + "node_modules/bulma": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz", + "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==", + "dev": true + }, + "node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001265", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", + "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/classnames": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" + }, + "node_modules/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, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/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=", + "engines": { + "node": ">=4" + } + }, + "node_modules/cliui/node_modules/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==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clsx": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", + "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/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=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "node_modules/colorette": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/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=" + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dev": true, + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/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==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/convert-source-map": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, + "node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true + }, + "node_modules/core-js-compat": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz", + "integrity": "sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==", + "dependencies": { + "browserslist": "^4.17.3", + "semver": "7.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/core-js-compat/node_modules/semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-loader": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.4.0.tgz", + "integrity": "sha512-Dlt6qfsxI/w1vU0r8qDd4BtMPxWqJeY5qQU7SmmZfvbpe6Xl18McO4GhyaMLns24Y2VNPiZwJPQ8JSbg4qvQLw==", + "dev": true, + "dependencies": { + "icss-utils": "^5.1.0", + "postcss": "^8.2.15", + "postcss-modules-extract-imports": "^3.0.0", + "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-scope": "^3.0.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.1.0", + "semver": "^7.3.5" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/css-loader/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", + "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "dependencies": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/default-gateway": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", + "dev": true, + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/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==", + "dependencies": { + "object-keys": "^1.0.12" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "dev": true, + "dependencies": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/del/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "node_modules/detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "dependencies": { + "repeating": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "dev": true + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/disposables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.2.tgz", + "integrity": "sha1-NsamdEdfVaLWkTVnpgFETkh7S24=" + }, + "node_modules/dnd-core": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.6.0.tgz", + "integrity": "sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=", + "dependencies": { + "asap": "^2.0.6", + "invariant": "^2.0.0", + "lodash": "^4.2.0", + "redux": "^3.7.1" + } + }, + "node_modules/dns-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", + "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", + "dev": true + }, + "node_modules/dns-packet": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", + "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", + "dev": true, + "dependencies": { + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/dns-txt": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", + "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", + "dev": true, + "dependencies": { + "buffer-indexof": "^1.0.0" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, + "node_modules/electron-to-chromium": { + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==" + }, + "node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/enhanced-resolve": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/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==", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-module-lexer": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, + "node_modules/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=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/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==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse/node_modules/estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "engines": { + "node": ">=0.8.x" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/express/node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/express/node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fable-babel-plugins": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/fable-babel-plugins/-/fable-babel-plugins-2.3.0.tgz", + "integrity": "sha512-alGBNw5HZJzTEznXKfypFEkD5aWsspbCcoVDu9j8Mqdi77dgp4BSjhYSg61mQEg9UluIAZxRM5lhGARYbU97DQ==" + }, + "node_modules/fable-compiler": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/fable-compiler/-/fable-compiler-2.13.0.tgz", + "integrity": "sha512-eEd+ue0CWhLpZBXqkIm4uWTGPfX8Q14RkCwSrbO0zPfB9hHW8IylipJ4YVfCZKd27sHDTpGOBwW8JMHqMBrXPQ==", + "peer": true + }, + "node_modules/fable-loader": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/fable-loader/-/fable-loader-2.1.9.tgz", + "integrity": "sha512-ffFfAx4+92yGRjV7iZQOCzqsjQF1he6Lei6hDqfaW1Qjbyx9bhVa8jCX53+I1mhWEw2JWIQpFzwHnYwz2eT4Hw==", + "dependencies": { + "fable-babel-plugins": "^2.3.0" + }, + "peerDependencies": { + "@babel/core": "^7.1.6", + "fable-compiler": "^2.1.0", + "webpack": ">=4.23.0" + } + }, + "node_modules/fable-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fable-utils/-/fable-utils-1.2.0.tgz", + "integrity": "sha512-xne8Cc2QK2BNZ0RElBZaz+j6pSHgi3i+cEhOzweKmTldvZGt5xqW7LvWWty553HknQKNRJBuyDYUKiiL1CTYlw==", + "bin": { + "fable": "fable.js" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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==" + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==" + }, + "node_modules/fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dev": true, + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/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==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/follow-redirects": { + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", + "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, + "node_modules/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==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-monkey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", + "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "dev": true + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dependencies": { + "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" + } + }, + "node_modules/gaze": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", + "dependencies": { + "globule": "^1.0.0" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "peer": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/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==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dependencies": { + "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" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/globby": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/globule": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", + "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", + "dependencies": { + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/globule/node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dependencies": { + "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" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + }, + "node_modules/handle-thing": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", + "dev": true + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "node_modules/hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + }, + "node_modules/home-or-tmp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "dev": true, + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hosted-git-info": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", + "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/hpack.js": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" + } + }, + "node_modules/html-entities": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz", + "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==", + "dev": true + }, + "node_modules/http-deceiver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", + "dev": true + }, + "node_modules/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==", + "dev": true, + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-errors/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "node_modules/http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "dev": true + }, + "node_modules/http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dev": true, + "dependencies": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/http-proxy-middleware": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", + "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", + "dev": true, + "dependencies": { + "@types/http-proxy": "^1.17.5", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/http-proxy-middleware/node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/icss-utils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/internal-ip": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz", + "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==", + "dev": true, + "dependencies": { + "default-gateway": "^6.0.0", + "ipaddr.js": "^1.9.1", + "is-ip": "^3.1.0", + "p-event": "^4.2.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/internal-ip?sponsor=1" + } + }, + "node_modules/internal-ip/node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/interpret": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, + "node_modules/ip": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", + "dev": true + }, + "node_modules/ip-regex": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", + "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ipaddr.js": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", + "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "node_modules/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==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", + "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finite": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/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=", + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-ip": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz", + "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==", + "dev": true, + "dependencies": { + "ip-regex": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/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=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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==", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "node_modules/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, + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "node_modules/jest-worker": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz", + "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "node_modules/jsan": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/jsan/-/jsan-3.1.13.tgz", + "integrity": "sha512-9kGpCsGHifmw6oJet+y8HaCl14y7qgAsxVdV3pCHDySNR3BfDC30zgkssd7x5LRVAT22dnpbe9JdzzmXZnq9/g==", + "dev": true + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "node_modules/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=" + }, + "node_modules/json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "peer": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/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==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/klona": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", + "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + }, + "node_modules/linked-list": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/linked-list/-/linked-list-0.1.0.tgz", + "integrity": "sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78=", + "dev": true + }, + "node_modules/loader-runner": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", + "engines": { + "node": ">=6.11.5" + } + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, + "node_modules/lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, + "node_modules/loglevel": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", + "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/loglevel" + } + }, + "node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/memfs": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz", + "integrity": "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==", + "dev": true, + "dependencies": { + "fs-monkey": "1.0.3" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/meow": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", + "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize": "^1.2.0", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "dev": true, + "dependencies": { + "braces": "^3.0.1", + "picomatch": "^2.2.3" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "dependencies": { + "mime-db": "1.50.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/multicast-dns": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", + "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", + "dev": true, + "dependencies": { + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" + }, + "bin": { + "multicast-dns": "cli.js" + } + }, + "node_modules/multicast-dns-service-types": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", + "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", + "dev": true + }, + "node_modules/nan": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" + }, + "node_modules/nanoid": { + "version": "3.1.29", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz", + "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + }, + "node_modules/node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "dev": true, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/node-gyp": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", + "dependencies": { + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.3", + "nopt": "^5.0.0", + "npmlog": "^4.1.2", + "request": "^2.88.2", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "tar": "^6.0.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">= 10.12.0" + } + }, + "node_modules/node-gyp/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-releases": { + "version": "1.1.77", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", + "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==" + }, + "node_modules/node-sass": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", + "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", + "hasInstallScript": true, + "dependencies": { + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^7.0.3", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "lodash": "^4.17.15", + "meow": "^9.0.0", + "nan": "^2.13.2", + "node-gyp": "^7.1.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "2.2.5", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" + }, + "bin": { + "node-sass": "bin/node-sass" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/node-sass/node_modules/ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-sass/node_modules/chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dependencies": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-sass/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dependencies": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "node_modules/number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dependencies": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", + "dev": true + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.3.0.tgz", + "integrity": "sha512-7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w==", + "dev": true, + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", + "dev": true, + "dependencies": { + "p-timeout": "^3.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-retry": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz", + "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==", + "dev": true, + "dependencies": { + "@types/retry": "^0.12.0", + "retry": "^0.13.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "dev": true, + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" + }, + "node_modules/picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/portfinder": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "dev": true, + "dependencies": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "engines": { + "node": ">= 0.12.0" + } + }, + "node_modules/portfinder/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/postcss": { + "version": "8.3.9", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz", + "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==", + "dev": true, + "dependencies": { + "nanoid": "^3.1.28", + "picocolors": "^0.2.1", + "source-map-js": "^0.6.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/postcss-modules-extract-imports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-local-by-default": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", + "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "dev": true, + "dependencies": { + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-scope": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "dev": true, + "dependencies": { + "icss-utils": "^5.0.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "dev": true + }, + "node_modules/private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "node_modules/protobufjs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "hasInstallScript": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/proxy-addr/node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/querystring": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz", + "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "engines": { + "node": ">=8" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dev": true, + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/react": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-contextmenu": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/react-contextmenu/-/react-contextmenu-2.14.0.tgz", + "integrity": "sha512-ktqMOuad6sCFNJs/ltEwppN8F0YeXmqoZfwycgtZR/MxOXMYx1xgYC44SzWH259HdGyshk1/7sXGuIRwj9hzbw==", + "dependencies": { + "classnames": "^2.2.5", + "object-assign": "^4.1.0" + }, + "peerDependencies": { + "prop-types": "^15.0.0", + "react": "^0.14.0 || ^15.0.0 || ^16.0.1", + "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.1" + } + }, + "node_modules/react-data-grid": { + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-7.0.0-beta.7.tgz", + "integrity": "sha512-RlU8JW3GCnKSNq8sr0f59qTjiSx0ArhWcBv5K5+ksklgJ+gQnFc5oVXOXu1aWgtqhiEzvov6Cn6vEi7Jczdwaw==", + "dependencies": { + "clsx": "^1.1.1" + }, + "peerDependencies": { + "react": "^16.14 || ^17.0", + "react-dom": "^16.14 || ^17.0" + } + }, + "node_modules/react-data-grid-addons": { + "version": "7.0.0-alpha.24", + "resolved": "https://registry.npmjs.org/react-data-grid-addons/-/react-data-grid-addons-7.0.0-alpha.24.tgz", + "integrity": "sha512-j/cZIPFhthJF7BUEYoio+M55pL5zuYWvrMS3kMesxI7Vrabn0Oh1K0pZB4RxTTvEwseiWd2xoZa4E25pZxm3CQ==", + "dependencies": { + "lodash": "^4.17.15", + "prop-types": "^15.7.2", + "react-contextmenu": "^2.13.0", + "react-data-grid": "^7.0.0-alpha.24", + "react-dnd": "^2.6.0", + "react-dnd-html5-backend": "^2.6.0", + "react-select": "^1.3.0", + "reselect": "^4.0.0", + "tslib": "^1.10.0" + }, + "peerDependencies": { + "react": "^16.8", + "react-dom": "^16.8" + } + }, + "node_modules/react-data-grid-addons/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/react-dnd": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.6.0.tgz", + "integrity": "sha1-f6JWds+CfViokSk+PBq1naACVFo=", + "dependencies": { + "disposables": "^1.0.1", + "dnd-core": "^2.6.0", + "hoist-non-react-statics": "^2.1.0", + "invariant": "^2.1.0", + "lodash": "^4.2.0", + "prop-types": "^15.5.10" + }, + "peerDependencies": { + "react": "*" + } + }, + "node_modules/react-dnd-html5-backend": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz", + "integrity": "sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=", + "dependencies": { + "lodash": "^4.2.0" + } + }, + "node_modules/react-dom": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + }, + "peerDependencies": { + "react": "^16.14.0" + } + }, + "node_modules/react-input-autosize": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz", + "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==", + "dependencies": { + "prop-types": "^15.5.8" + }, + "peerDependencies": { + "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0" + } + }, + "node_modules/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==" + }, + "node_modules/react-select": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz", + "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==", + "dependencies": { + "classnames": "^2.2.4", + "prop-types": "^15.5.8", + "react-input-autosize": "^2.1.2" + }, + "peerDependencies": { + "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0", + "react-dom": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0" + } + }, + "node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/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==", + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" + }, + "node_modules/read-pkg/node_modules/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==", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/read-pkg/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/read-pkg/node_modules/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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dependencies": { + "resolve": "^1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/redux": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", + "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", + "dependencies": { + "lodash": "^4.2.1", + "lodash-es": "^4.2.1", + "loose-envify": "^1.1.0", + "symbol-observable": "^1.0.3" + } + }, + "node_modules/regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + }, + "node_modules/regenerate-unicode-properties": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz", + "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==", + "dependencies": { + "regenerate": "^1.4.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + }, + "node_modules/regenerator-transform": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", + "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", + "dependencies": { + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", + "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpu-core": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", + "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", + "dependencies": { + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" + } + }, + "node_modules/regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" + }, + "node_modules/regjsparser": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/remotedev": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/remotedev/-/remotedev-0.2.9.tgz", + "integrity": "sha512-W8dHOv9BcFnetFEd08yNb5O9Hd+zkTFFnf9FRjNCkb4u+JgQ/U152Aw4q83AmY3m34d6KZwhK5ip/Qc331+4vA==", + "dev": true, + "dependencies": { + "jsan": "^3.1.3", + "querystring": "^0.2.0", + "rn-host-detect": "^1.0.1", + "socketcluster-client": "^13.0.0" + } + }, + "node_modules/repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "dependencies": { + "is-finite": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dependencies": { + "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" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "node_modules/reselect": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz", + "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==" + }, + "node_modules/resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dependencies": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/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==", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rn-host-detect": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.2.0.tgz", + "integrity": "sha512-btNg5kzHcjZZ7t7mvvV/4wNJ9e3MPgrWivkRgWURzXL0JJ0pwWlU4zrbmdlz3HHzHOxhBhHB4D+/dbMFfu4/4A==", + "dev": true + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/sass-graph": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "dependencies": { + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" + }, + "bin": { + "sassgraph": "bin/sassgraph" + } + }, + "node_modules/sass-loader": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.1.0.tgz", + "integrity": "sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==", + "dev": true, + "dependencies": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0", + "sass": "^1.3.0", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, + "node_modules/sc-channel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sc-channel/-/sc-channel-1.2.0.tgz", + "integrity": "sha512-M3gdq8PlKg0zWJSisWqAsMmTVxYRTpVRqw4CWAdKBgAfVKumFcTjoCV0hYu7lgUXccCtCD8Wk9VkkE+IXCxmZA==", + "dev": true, + "dependencies": { + "component-emitter": "1.2.1" + } + }, + "node_modules/sc-errors": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sc-errors/-/sc-errors-1.4.1.tgz", + "integrity": "sha512-dBn92iIonpChTxYLgKkIT/PCApvmYT6EPIbRvbQKTgY6tbEbIy8XVUv4pGyKwEK4nCmvX4TKXcN0iXC6tNW6rQ==", + "dev": true + }, + "node_modules/sc-formatter": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/sc-formatter/-/sc-formatter-3.0.2.tgz", + "integrity": "sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A==", + "dev": true + }, + "node_modules/scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, + "node_modules/schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "dependencies": { + "js-base64": "^2.1.8", + "source-map": "^0.4.2" + } + }, + "node_modules/scss-tokenizer/node_modules/source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", + "dev": true + }, + "node_modules/selfsigned": { + "version": "1.10.11", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", + "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", + "dev": true, + "dependencies": { + "node-forge": "^0.10.0" + } + }, + "node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dev": true, + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "dev": true, + "dependencies": { + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-index/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/serve-index/node_modules/http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "dev": true, + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-index/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "node_modules/serve-index/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/serve-index/node_modules/setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dev": true, + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", + "dev": true + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", + "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==" + }, + "node_modules/slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/socketcluster-client": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/socketcluster-client/-/socketcluster-client-13.0.1.tgz", + "integrity": "sha512-hxiE2xz6mgaBlhXbtBa4POgWVEvIcjCoHzf5LTUVhI9IL8V2ltV3Ze8pQsi9egqTjSz4RHPfyrJ7BiETe5Kthw==", + "dev": true, + "dependencies": { + "base-64": "0.1.0", + "clone": "2.1.1", + "component-emitter": "1.2.1", + "linked-list": "0.1.0", + "querystring": "0.2.0", + "sc-channel": "^1.2.0", + "sc-errors": "^1.4.0", + "sc-formatter": "^3.0.1", + "uuid": "3.2.1", + "ws": "5.1.1" + } + }, + "node_modules/socketcluster-client/node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/socketcluster-client/node_modules/uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/sockjs": { + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", + "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", + "dev": true, + "dependencies": { + "faye-websocket": "^0.11.3", + "uuid": "^3.4.0", + "websocket-driver": "^0.7.4" + } + }, + "node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", + "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "dependencies": { + "source-map": "^0.5.6" + } + }, + "node_modules/spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/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==" + }, + "node_modules/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==", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", + "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==" + }, + "node_modules/spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", + "dev": true, + "dependencies": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "dev": true, + "dependencies": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + } + }, + "node_modules/spdy-transport/node_modules/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==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dependencies": { + "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" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/stdout-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "dependencies": { + "readable-stream": "^2.0.1" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/style-loader": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.0.tgz", + "integrity": "sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==", + "dev": true, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/tar/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", + "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "dependencies": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz", + "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==", + "dependencies": { + "jest-worker": "^27.0.6", + "p-limit": "^3.1.0", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1", + "terser": "^5.7.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/terser-webpack-plugin/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/terser-webpack-plugin/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/terser/node_modules/source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/terser/node_modules/source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/terser/node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "dev": true + }, + "node_modules/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=", + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/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==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "dependencies": { + "glob": "^7.1.2" + } + }, + "node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unicode-canonical-property-names-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "dependencies": { + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-value-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", + "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-property-aliases-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", + "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/upgrade": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/upgrade/-/upgrade-1.1.0.tgz", + "integrity": "sha1-SlCHXsXHFdGTeXmfBZCg55aVj2E=" + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "node_modules/url/node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + }, + "node_modules/url/node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" + }, + "node_modules/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==", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/verror/node_modules/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=" + }, + "node_modules/watchpack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", + "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/wbuf": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "dev": true, + "dependencies": { + "minimalistic-assert": "^1.0.0" + } + }, + "node_modules/webpack": { + "version": "5.58.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.58.1.tgz", + "integrity": "sha512-4Z/dmbTU+VmkCb2XNgW7wkE5TfEcSooclprn/UEuVeAkwHhn07OcgUsyaKHGtCY/VobjnsYBlyhKeMLiSoOqPg==", + "dependencies": { + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.4", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.2.0", + "webpack-sources": "^3.2.0" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-cli": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.0.tgz", + "integrity": "sha512-n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw==", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "v8-compile-cache": "^2.2.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "peerDependencies": { + "webpack": "4.x.x || 5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "@webpack-cli/migrate": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/webpack-dev-middleware": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz", + "integrity": "sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ==", + "dev": true, + "dependencies": { + "colorette": "^2.0.10", + "memfs": "^3.2.2", + "mime-types": "^2.1.31", + "range-parser": "^1.2.1", + "schema-utils": "^3.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/webpack-dev-server": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.3.1.tgz", + "integrity": "sha512-qNXQCVYo1kYhH9pgLtm8LRNkXX3XzTfHSj/zqzaqYzGPca+Qjr+81wj1jgPMCHhIhso9WEQ+kX9z23iG9PzQ7w==", + "dev": true, + "dependencies": { + "ansi-html-community": "^0.0.8", + "bonjour": "^3.5.0", + "chokidar": "^3.5.1", + "colorette": "^2.0.10", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "del": "^6.0.0", + "express": "^4.17.1", + "graceful-fs": "^4.2.6", + "html-entities": "^2.3.2", + "http-proxy-middleware": "^2.0.0", + "internal-ip": "^6.2.0", + "ipaddr.js": "^2.0.1", + "open": "^8.0.9", + "p-retry": "^4.5.0", + "portfinder": "^1.0.28", + "schema-utils": "^3.1.0", + "selfsigned": "^1.10.11", + "serve-index": "^1.9.1", + "sockjs": "^0.3.21", + "spdy": "^4.0.2", + "strip-ansi": "^7.0.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^5.2.1", + "ws": "^8.1.0" + }, + "bin": { + "webpack-dev-server": "bin/webpack-dev-server.js" + }, + "engines": { + "node": ">= 12.13.0" + }, + "peerDependencies": { + "webpack": "^4.37.0 || ^5.0.0" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-dev-server/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/webpack-dev-server/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/webpack-merge": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "dependencies": { + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz", + "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" + }, + "node_modules/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==", + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/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=", + "engines": { + "node": ">=4" + } + }, + "node_modules/wrap-ansi/node_modules/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==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/ws": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz", + "integrity": "sha512-bOusvpCb09TOBLbpMKszd45WKC2KPtxiyiHanv+H2DE3Az+1db5a/L7sVJZVDPUC1Br8f0SKRr1KjLpD1U/IAw==", + "dev": true, + "dependencies": { + "async-limiter": "~1.0.0" + } + }, + "node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dependencies": { + "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" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/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=", + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/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==", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs/node_modules/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==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, "dependencies": { + "@babel/code-frame": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", + "requires": { + "@babel/highlight": "^7.14.5" + } + }, + "@babel/compat-data": { + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==" + }, + "@babel/core": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", + "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", + "peer": true, + "requires": { + "@babel/code-frame": "^7.15.8", + "@babel/generator": "^7.15.8", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.8", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.8", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", + "requires": { + "@babel/types": "^7.15.6", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-annotate-as-pure": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz", + "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz", + "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==", + "requires": { + "@babel/helper-explode-assignable-expression": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz", + "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz", + "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.14.5", + "regexpu-core": "^4.7.1" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "regexpu-core": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz", + "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==", + "requires": { + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^9.0.0", + "regjsgen": "^0.5.2", + "regjsparser": "^0.7.0", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.0.0" + } + }, + "regjsgen": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", + "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" + }, + "regjsparser": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz", + "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==", + "requires": { + "jsesc": "~0.5.0" + } + } + } + }, + "@babel/helper-define-polyfill-provider": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", + "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", + "requires": { + "@babel/helper-compilation-targets": "^7.13.0", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/traverse": "^7.13.0", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2", + "semver": "^6.1.2" + } + }, + "@babel/helper-explode-assignable-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz", + "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-function-name": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", + "requires": { + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-module-imports": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", + "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", + "requires": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/helper-validator-identifier": "^7.15.7", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.6" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==" + }, + "@babel/helper-remap-async-to-generator": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz", + "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-wrap-function": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-replace-supers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-simple-access": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz", + "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", + "requires": { + "@babel/types": "^7.15.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==" + }, + "@babel/helper-validator-option": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==" + }, + "@babel/helper-wrap-function": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz", + "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==", + "requires": { + "@babel/helper-function-name": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/helpers": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", + "peer": true, + "requires": { + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/highlight": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==" + }, + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz", + "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4", + "@babel/plugin-proposal-optional-chaining": "^7.14.5" + } + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz", + "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.15.4", + "@babel/plugin-syntax-async-generators": "^7.8.4" + } + }, + "@babel/plugin-proposal-class-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz", + "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==", + "requires": { + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-proposal-class-static-block": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz", + "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==", + "requires": { + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + } + }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz", + "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" + } + }, + "@babel/plugin-proposal-export-namespace-from": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz", + "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + } + }, + "@babel/plugin-proposal-json-strings": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz", + "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + } + }, + "@babel/plugin-proposal-logical-assignment-operators": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz", + "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + } + }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz", + "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + } + }, + "@babel/plugin-proposal-numeric-separator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz", + "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + } + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz", + "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==", + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.15.4" + } + }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz", + "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + } + }, + "@babel/plugin-proposal-optional-chaining": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz", + "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + } + }, + "@babel/plugin-proposal-private-methods": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz", + "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==", + "requires": { + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-proposal-private-property-in-object": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz", + "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz", + "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@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==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", + "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz", + "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==", + "requires": { + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz", + "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz", + "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz", + "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz", + "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz", + "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz", + "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz", + "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-exponentiation-operator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz", + "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==", + "requires": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-for-of": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz", + "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-function-name": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz", + "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==", + "requires": { + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz", + "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz", + "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz", + "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==", + "requires": { + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz", + "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==", + "requires": { + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-simple-access": "^7.15.4", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz", + "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==", + "requires": { + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.9", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-umd": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz", + "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==", + "requires": { + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", + "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz", + "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz", + "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz", + "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz", + "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-regenerator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz", + "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==", + "requires": { + "regenerator-transform": "^0.14.2" + }, + "dependencies": { + "regenerator-transform": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", + "requires": { + "@babel/runtime": "^7.8.4" + } + } + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz", + "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-shorthand-properties": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", + "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz", + "integrity": "sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz", + "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz", + "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz", + "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-unicode-escapes": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz", + "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz", + "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/preset-env": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz", + "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==", + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4", + "@babel/plugin-proposal-async-generator-functions": "^7.15.8", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.15.4", + "@babel/plugin-proposal-dynamic-import": "^7.14.5", + "@babel/plugin-proposal-export-namespace-from": "^7.14.5", + "@babel/plugin-proposal-json-strings": "^7.14.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-numeric-separator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-private-methods": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.15.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-async-to-generator": "^7.14.5", + "@babel/plugin-transform-block-scoped-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.15.3", + "@babel/plugin-transform-classes": "^7.15.4", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.7", + "@babel/plugin-transform-dotall-regex": "^7.14.5", + "@babel/plugin-transform-duplicate-keys": "^7.14.5", + "@babel/plugin-transform-exponentiation-operator": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.15.4", + "@babel/plugin-transform-function-name": "^7.14.5", + "@babel/plugin-transform-literals": "^7.14.5", + "@babel/plugin-transform-member-expression-literals": "^7.14.5", + "@babel/plugin-transform-modules-amd": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.4", + "@babel/plugin-transform-modules-systemjs": "^7.15.4", + "@babel/plugin-transform-modules-umd": "^7.14.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", + "@babel/plugin-transform-new-target": "^7.14.5", + "@babel/plugin-transform-object-super": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.15.4", + "@babel/plugin-transform-property-literals": "^7.14.5", + "@babel/plugin-transform-regenerator": "^7.14.5", + "@babel/plugin-transform-reserved-words": "^7.14.5", + "@babel/plugin-transform-shorthand-properties": "^7.14.5", + "@babel/plugin-transform-spread": "^7.15.8", + "@babel/plugin-transform-sticky-regex": "^7.14.5", + "@babel/plugin-transform-template-literals": "^7.14.5", + "@babel/plugin-transform-typeof-symbol": "^7.14.5", + "@babel/plugin-transform-unicode-escapes": "^7.14.5", + "@babel/plugin-transform-unicode-regex": "^7.14.5", + "@babel/preset-modules": "^0.1.4", + "@babel/types": "^7.15.6", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.5", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "core-js-compat": "^3.16.0", + "semver": "^6.3.0" + } + }, + "@babel/preset-modules": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + } + }, + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + } + } + }, + "@babel/template": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" + } + }, + "@babel/traverse": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.9", + "to-fast-properties": "^2.0.0" + } + }, + "@discoveryjs/json-ext": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", + "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==" + }, + "@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + } + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -29,8 +9411,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" } }, "@protobufjs/float": { @@ -58,232 +9440,347 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, + "@types/eslint": { + "version": "7.28.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.1.tgz", + "integrity": "sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==", + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + }, + "@types/http-proxy": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz", + "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + }, "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + }, + "@types/minimist": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" }, "@types/node": { - "version": "8.10.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.9.tgz", - "integrity": "sha512-GUUTbeDaJSRaoLkqVQ5jwwKbDiLWFX3JrKLvC078q2P51Z9Dcb5F5UdnApSYqdMk4X0VrKod1gzeoX8bGl8DMg==" + "version": "16.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", + "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" + }, + "@types/normalize-package-data": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" + }, + "@types/retry": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz", + "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", + "dev": true + }, + "@webassemblyjs/ast": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "requires": { + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + }, + "@webassemblyjs/helper-api-error": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + }, + "@webassemblyjs/helper-buffer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + }, + "@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "requires": { + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", + "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" + } + }, + "@webassemblyjs/ieee754": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "requires": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "@webassemblyjs/leb128": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "requires": { + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/utf8": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + }, + "@webassemblyjs/wasm-edit": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/helper-wasm-section": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-opt": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "@webassemblyjs/wast-printer": "1.11.1" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@xtuc/long": "4.2.2" + } + }, + "@webpack-cli/configtest": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", + "requires": {} + }, + "@webpack-cli/info": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", + "requires": {} + }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + }, + "@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "accepts": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "2.1.15", - "negotiator": "0.6.1" + "mime-types": "~2.1.24", + "negotiator": "0.6.2" } }, "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", - "dev": true + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==" }, - "acorn-dynamic-import": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", + "acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "requires": {} + }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "acorn": "4.0.13" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", - "dev": true - } + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" } }, "ajv": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz", - "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", - "dev": true, + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - }, - "dependencies": { - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "requires": {} }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", + "ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "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" + } }, "anymatch": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", - "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", - "dev": true, + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "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-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, "array-flatten": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", + "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" - } - }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "1.0.3" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "asap": { "version": "2.0.6", @@ -291,119 +9788,90 @@ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true - }, - "asn1.js": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", - "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=", - "dev": true, + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "bn.js": "4.11.7", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, - "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, - "requires": { - "util": "0.10.3" + "safer-buffer": "~2.1.0" } }, "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "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 + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "4.17.10" - }, - "dependencies": { - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", - "dev": true - } + "lodash": "^4.17.14" } }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, "async-foreach": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "atob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", - "dev": true - }, - "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000704", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==", - "dev": true + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "babel-code-frame": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } } }, "babel-core": { @@ -412,92 +9880,27 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" }, "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -507,16 +9910,16 @@ "ms": "2.0.0" } }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } @@ -527,126 +9930,138 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" }, "dependencies": { - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true } } }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "requires": { + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" + } + }, "babel-helper-call-delegate": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-define-map": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", - "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", + "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "requires": { + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-optimise-call-expression": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", - "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "requires": { + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-replace-supers": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -655,280 +10070,314 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.25.0" - } - }, - "babel-loader": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz", - "integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==", - "dev": true, - "requires": { - "find-cache-dir": "1.0.0", - "loader-utils": "1.1.0", - "mkdirp": "0.5.1" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-messages": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "requires": { + "object.assign": "^4.1.0" + } + }, + "babel-plugin-polyfill-corejs2": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", + "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", + "requires": { + "@babel/compat-data": "^7.13.11", + "@babel/helper-define-polyfill-provider": "^0.2.2", + "semver": "^6.1.1" + } + }, + "babel-plugin-polyfill-corejs3": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz", + "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==", + "requires": { + "@babel/helper-define-polyfill-provider": "^0.2.2", + "core-js-compat": "^3.16.2" + } + }, + "babel-plugin-polyfill-regenerator": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", + "requires": { + "@babel/helper-define-polyfill-provider": "^0.2.2" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=" + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=" + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=" + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "requires": { + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-arrow-functions": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoping": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", - "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", + "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-plugin-transform-es2015-classes": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, "requires": { - "babel-helper-define-map": "6.24.1", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-computed-properties": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-destructuring": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-for-of": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-literals": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-modules-amd": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0" + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz", - "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=", - "dev": true, + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", + "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-types": "6.25.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-umd": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0" + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-object-super": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.26.0" + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-parameters": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-shorthand-properties": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, "requires": { - "babel-helper-regex": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-template-literals": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-unicode-regex": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, "requires": { - "babel-helper-regex": "6.24.1", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-regenerator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz", - "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", + "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "requires": { - "regenerator-transform": "0.9.11" + "regenerator-transform": "^0.10.0" } }, "babel-plugin-transform-runtime": { @@ -937,49 +10386,69 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, - "babel-preset-es2015": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", - "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", - "dev": true, + "babel-preset-env": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", + "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.24.1", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-regenerator": "6.24.1" + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-to-generator": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.23.0", + "babel-plugin-transform-es2015-classes": "^6.23.0", + "babel-plugin-transform-es2015-computed-properties": "^6.22.0", + "babel-plugin-transform-es2015-destructuring": "^6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", + "babel-plugin-transform-es2015-for-of": "^6.23.0", + "babel-plugin-transform-es2015-function-name": "^6.22.0", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.22.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-umd": "^6.23.0", + "babel-plugin-transform-es2015-object-super": "^6.22.0", + "babel-plugin-transform-es2015-parameters": "^6.23.0", + "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", + "babel-plugin-transform-exponentiation-operator": "^6.22.0", + "babel-plugin-transform-regenerator": "^6.22.0", + "browserslist": "^3.2.6", + "invariant": "^2.2.2", + "semver": "^5.3.0" + }, + "dependencies": { + "browserslist": { + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", + "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", + "requires": { + "caniuse-lite": "^1.0.30000844", + "electron-to-chromium": "^1.3.47" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "babel-register": { @@ -988,21 +10457,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.5.7", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.15" - }, - "dependencies": { - "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", - "dev": true - } + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" } }, "babel-runtime": { @@ -1010,147 +10471,90 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.4.1", - "regenerator-runtime": "0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", - "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==" - } + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", - "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "requires": { - "babel-code-frame": "6.22.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "debug": "2.6.8", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + }, + "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" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } }, "babel-types": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", - "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", - "dev": true, + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + }, + "dependencies": { + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" + } } }, "babylon": { - "version": "6.17.4", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", - "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==", - "dev": true + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "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.2" - } - }, - "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.2" - } - }, - "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.2" - } - }, - "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" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base-64": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", - "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs=" - }, - "base64-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", + "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs=", "dev": true }, "batch": { @@ -1160,64 +10564,41 @@ "dev": true }, "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, - "optional": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, - "big.js": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", - "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=", - "dev": true - }, "binary-extensions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz", - "integrity": "sha1-ZlBsFs5vTWkopbPNajPKQelB43s=", - "dev": true - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "bn.js": { - "version": "4.11.7", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", - "integrity": "sha512-LxFiV5mefv0ley0SzqkOPR1bC4EbpPx8LkOz5vMe/Yi15t5hzwgO/G+tc7wOtL4PZTYjwHu8JnEiSLumuSjSfA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", "dev": true, "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", + "bytes": "3.1.0", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", - "iconv-lite": "0.4.19", - "on-finished": "2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "1.6.15" + "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": { "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", "dev": true }, "debug": { @@ -1229,46 +10610,16 @@ "ms": "2.0.0" } }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": "1.5.0" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", "dev": true } } @@ -1279,139 +10630,48 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.1.1", - "multicast-dns-service-types": "1.1.0" - } - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, + "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", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browserify-aes": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", - "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=", - "dev": true, - "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.0", - "inherits": "2.0.3" - } - }, - "browserify-cipher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", - "dev": true, - "requires": { - "browserify-aes": "1.0.6", - "browserify-des": "1.0.0", - "evp_bytestokey": "1.0.0" - } - }, - "browserify-des": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "4.11.7", - "randombytes": "2.0.5" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "4.11.7", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "elliptic": "6.4.0", - "inherits": "2.0.3", - "parse-asn1": "5.1.0" - } - }, - "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", - "dev": true, - "requires": { - "pako": "0.2.9" + "fill-range": "^7.0.1" } }, "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", + "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", "requires": { - "caniuse-db": "1.0.30000704", - "electron-to-chromium": "1.3.16" + "caniuse-lite": "^1.0.30001264", + "electron-to-chromium": "^1.3.857", + "escalade": "^3.1.1", + "node-releases": "^1.1.77", + "picocolors": "^0.2.1" } }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, - "requires": { - "base64-js": "1.2.1", - "ieee754": "1.1.8", - "isarray": "1.0.0" - } + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "buffer-indexof": { "version": "1.1.1", @@ -1419,269 +10679,169 @@ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, "bulma": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.5.3.tgz", - "integrity": "sha1-vpOvtiRhklBcMN8/nBwpqX0xmhM=", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz", + "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==", "dev": true }, "bytes": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz", - "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, - "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, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "requires": { - "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" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - } + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" } }, "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" } }, - "caniuse-api": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000704", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" - } - }, - "caniuse-db": { - "version": "1.0.30000704", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000704.tgz", - "integrity": "sha1-jFqm/tgFjmXHDywfXWP3CIZQcFw=", - "dev": true + "caniuse-lite": { + "version": "1.0.30001265", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", + "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==" }, "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - }, - "dependencies": { - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - } - } + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, + "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": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "1.3.0", - "async-each": "1.0.1", - "fsevents": "1.2.0", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" } }, "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true, - "optional": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.0.1" - } + "chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" }, - "clap": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", - "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=", - "dev": true, - "requires": { - "chalk": "1.1.3" - } + "classnames": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" }, - "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.1", - "static-extend": "0.1.2" - }, - "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.6" - } - } - } + "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 }, "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "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==" + }, + "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=" + }, + "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==", + "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==", + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "clone": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=" - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", "dev": true }, - "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", - "dev": true, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "requires": { - "q": "1.5.0" + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, + "clsx": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", + "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" + }, "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=", - "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": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" - } - }, - "color": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", - "dev": true, - "requires": { - "clone": "1.0.2", - "color-convert": "1.9.0", - "color-string": "0.3.0" - }, - "dependencies": { - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", - "dev": true - } - } + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", - "dev": true, + "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": { "color-name": "1.1.3" } @@ -1689,89 +10849,69 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "color-string": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "colormin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", - "dev": true, - "requires": { - "color": "0.11.4", - "css-color-names": "0.0.4", - "has": "1.0.3" - } - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true + "colorette": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" }, "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "dev": true, + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "component-emitter": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz", - "integrity": "sha1-zNETqGOI0GSC0D3j/H35hSa6jv4=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true }, "compressible": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz", - "integrity": "sha1-/tocf3YXkScyspv4zyYlKiC57s0=", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": "1.27.0" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz", - "integrity": "sha1-AwyfGY8WQ6BX13anOOki2kNzAS0=", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "1.3.3", - "bytes": "2.5.0", - "compressible": "2.0.10", - "debug": "2.6.8", - "on-headers": "1.0.1", - "safe-buffer": "5.1.1", - "vary": "1.1.1" + "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": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "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" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } @@ -1779,41 +10919,27 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "connect-history-api-fallback": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", - "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "0.1.4" - } - }, "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=", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } }, "content-type": { "version": "1.0.4", @@ -1821,10 +10947,18 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "dev": true }, + "convert-source-map": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "requires": { + "safe-buffer": "~5.1.1" + } + }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", "dev": true }, "cookie-signature": { @@ -1833,371 +10967,169 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "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-js": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=" + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, - "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=", - "dev": true - }, - "create-ecdh": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", - "dev": true, + "core-js-compat": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz", + "integrity": "sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==", "requires": { - "bn.js": "4.11.7", - "elliptic": "6.4.0" - } - }, - "create-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "sha.js": "2.4.8" - } - }, - "create-hmac": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "safe-buffer": "5.0.1", - "sha.js": "2.4.8" - } - }, - "create-react-class": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz", - "integrity": "sha1-q0SEl8JlZuHilBPogyB9V8/nvtQ=", - "requires": { - "fbjs": "0.8.12", - "loose-envify": "1.3.1", - "object-assign": "4.1.1" - } - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "which": "1.2.14" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "crypto-browserify": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", - "dev": true, - "requires": { - "browserify-cipher": "1.0.0", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.0", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "diffie-hellman": "5.0.2", - "inherits": "2.0.3", - "pbkdf2": "3.0.12", - "public-encrypt": "4.0.0", - "randombytes": "2.0.5" - } - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-loader": { - "version": "0.28.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", - "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==", - "dev": true, - "requires": { - "babel-code-frame": "6.22.0", - "css-selector-tokenizer": "0.7.0", - "cssnano": "3.10.0", - "icss-utils": "2.1.0", - "loader-utils": "1.1.0", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.17", - "postcss-modules-extract-imports": "1.1.0", - "postcss-modules-local-by-default": "1.2.0", - "postcss-modules-scope": "1.1.0", - "postcss-modules-values": "1.3.0", - "postcss-value-parser": "3.3.0", - "source-list-map": "2.0.0" + "browserslist": "^4.17.3", + "semver": "7.0.0" }, "dependencies": { - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" } } }, - "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "css-loader": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.4.0.tgz", + "integrity": "sha512-Dlt6qfsxI/w1vU0r8qDd4BtMPxWqJeY5qQU7SmmZfvbpe6Xl18McO4GhyaMLns24Y2VNPiZwJPQ8JSbg4qvQLw==", "dev": true, "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.1", - "regexpu-core": "1.0.0" + "icss-utils": "^5.1.0", + "postcss": "^8.2.15", + "postcss-modules-extract-imports": "^3.0.0", + "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-scope": "^3.0.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.1.0", + "semver": "^7.3.5" }, "dependencies": { - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, "requires": { - "regenerate": "1.3.2", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "lru-cache": "^6.0.0" } } } }, "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, - "cssnano": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", - "dev": true, - "requires": { - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.3", - "object-assign": "4.1.1", - "postcss": "5.2.17", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.2", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "postcss-unique-selectors": "2.0.2", - "postcss-value-parser": "3.3.0", - "postcss-zindex": "2.2.0" - } - }, - "csso": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", - "dev": true, - "requires": { - "clap": "1.2.0", - "source-map": "0.5.6" - } - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.24" - } - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } + "assert-plus": "^1.0.0" } }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "dev": true, + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, - "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 - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, + "decamelize-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", + "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.12" - } - }, - "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": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" }, "dependencies": { - "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.2" - } - }, - "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.2" - } - }, - "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" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" } } }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", - "dev": true - }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "p-map": "1.1.1", - "pify": "3.0.0", - "rimraf": "2.6.1" + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, + "default-gateway": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", + "dev": true, + "requires": { + "execa": "^5.0.0" + } + }, + "define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "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==", + "requires": { + "object-keys": "^1.0.12" + } + }, + "del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "dev": true, + "requires": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" }, "dependencies": { - "pify": { + "slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true } } @@ -2205,31 +11137,19 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "depd": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -2242,24 +11162,38 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, - "diffie-hellman": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "bn.js": "4.11.7", - "miller-rabin": "4.0.0", - "randombytes": "2.0.5" + "path-type": "^4.0.0" + } + }, + "disposables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.2.tgz", + "integrity": "sha1-NsamdEdfVaLWkTVnpgFETkh7S24=" + }, + "dnd-core": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.6.0.tgz", + "integrity": "sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=", + "requires": { + "asap": "^2.0.6", + "invariant": "^2.0.0", + "lodash": "^4.2.0", + "redux": "^3.7.1" } }, "dns-equal": { @@ -2269,13 +11203,13 @@ "dev": true }, "dns-packet": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz", - "integrity": "sha1-I2nUUDivBF84mOb6VoYq7T9AKWw=", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", + "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.0.1" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -2284,23 +11218,16 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, - "domain-browser": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", - "dev": true - }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, - "optional": true, + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -2310,31 +11237,14 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.16", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz", - "integrity": "sha1-0OAmc1dUdwkBrjAaIWZMukXZL30=", - "dev": true + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==" }, - "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "dev": true, - "requires": { - "bn.js": "4.11.7", - "brorand": "1.1.0", - "hash.js": "1.1.3", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "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==" }, "encodeurl": { "version": "1.0.2", @@ -2342,145 +11252,42 @@ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "requires": { - "iconv-lite": "0.4.18" - } - }, "enhanced-resolve": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", - "dev": true, + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "object-assign": "4.1.1", - "tapable": "0.2.7" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, - "errno": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", - "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", - "dev": true, - "requires": { - "prr": "0.0.0" - } + "env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" + }, + "envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==" }, "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, + "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" + "is-arrayish": "^0.2.1" } }, - "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.3", - "is-regex": "1.0.4" - }, - "dependencies": { - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - } - } + "es-module-lexer": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" - } - }, - "es5-ext": { - "version": "0.10.24", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz", - "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=", - "dev": true, - "requires": { - "es6-iterator": "2.0.1", - "es6-symbol": "3.1.1" - } - }, - "es6-iterator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24", - "es6-symbol": "3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24", - "es6-iterator": "2.0.1", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24", - "es6-iterator": "2.0.1", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-symbol": { + "escalade": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24", - "es6-iterator": "2.0.1", - "es6-symbol": "3.1.1" - } + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -2491,47 +11298,41 @@ "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=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, + "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==", "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, "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, + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "requires": { - "estraverse": "4.2.0" + "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==" + } } }, "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etag": { "version": "1.8.1", @@ -2539,140 +11340,71 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.24" - } - }, "eventemitter3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "dev": true, - "requires": { - "original": "1.0.0" - } - }, - "evp_bytestokey": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", - "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=", - "dev": true, - "requires": { - "create-hash": "1.1.3" - } + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.2.14" - } - } - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" } }, "express": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.7", "array-flatten": "1.1.1", - "body-parser": "1.18.2", - "content-disposition": "0.5.2", - "content-type": "1.0.4", - "cookie": "0.3.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.1", + "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.2", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.3", - "qs": "6.5.1", - "range-parser": "1.2.0", - "safe-buffer": "5.1.1", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "1.4.0", - "type-is": "1.6.16", + "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" + "vary": "~1.1.2" }, "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "dev": true, - "requires": { - "mime-types": "2.1.18", - "negotiator": "0.6.1" - } - }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -2688,223 +11420,122 @@ "ms": "2.0.0" } }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", - "dev": true - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "dev": true, - "requires": { - "mime-db": "1.33.0" - } - }, - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true - }, - "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.18" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", "dev": true } } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "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" - } - } - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fable-babel-plugins": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/fable-babel-plugins/-/fable-babel-plugins-2.3.0.tgz", + "integrity": "sha512-alGBNw5HZJzTEznXKfypFEkD5aWsspbCcoVDu9j8Mqdi77dgp4BSjhYSg61mQEg9UluIAZxRM5lhGARYbU97DQ==" + }, + "fable-compiler": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/fable-compiler/-/fable-compiler-2.13.0.tgz", + "integrity": "sha512-eEd+ue0CWhLpZBXqkIm4uWTGPfX8Q14RkCwSrbO0zPfB9hHW8IylipJ4YVfCZKd27sHDTpGOBwW8JMHqMBrXPQ==", + "peer": true }, "fable-loader": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/fable-loader/-/fable-loader-1.1.6.tgz", - "integrity": "sha512-eKddJyVzBX5Tdq1fNcoYgAZ4PsaqaE6gd2KiL86a9fKN9qErqa/uZGhFuu6ndAP3F+x0IeObZlHGnn/wazb/mw==", - "dev": true, + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/fable-loader/-/fable-loader-2.1.9.tgz", + "integrity": "sha512-ffFfAx4+92yGRjV7iZQOCzqsjQF1he6Lei6hDqfaW1Qjbyx9bhVa8jCX53+I1mhWEw2JWIQpFzwHnYwz2eT4Hw==", "requires": { - "fable-utils": "1.0.6" + "fable-babel-plugins": "^2.3.0" } }, "fable-utils": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/fable-utils/-/fable-utils-1.0.6.tgz", - "integrity": "sha512-skdihfsIWgzHWemceRyKOWd3D16YTLWHDjAaQ1lxjc28K30QJOpPCctLsLc6/HcAEvMwyjlq3z6r+wrMw0s2tw==", - "dev": true + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fable-utils/-/fable-utils-1.2.0.tgz", + "integrity": "sha512-xne8Cc2QK2BNZ0RElBZaz+j6pSHgi3i+cEhOzweKmTldvZGt5xqW7LvWWty553HknQKNRJBuyDYUKiiL1CTYlw==" }, "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + } }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "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==" }, - "fastparse": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", - "dev": true + "fastest-levenshtein": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==" + }, + "fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } }, "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, - "fbjs": { - "version": "0.8.12", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz", - "integrity": "sha1-ELXZL3bUVXX9Y6IX1OoCvqL47QQ=", - "requires": { - "core-js": "1.2.7", - "isomorphic-fetch": "2.2.1", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "promise": "7.3.1", - "setimmediate": "1.0.5", - "ua-parser-js": "0.7.14" - }, - "dependencies": { - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" - } - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - }, - "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" - } - } + "to-regex-range": "^5.0.1" } }, "finalhandler": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.4.0", - "unpipe": "1.0.0" + "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": { @@ -2916,99 +11547,50 @@ "ms": "2.0.0" } }, - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", - "dev": true - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.0.0", - "pkg-dir": "2.0.0" - } - }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "requires": { - "locate-path": "2.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", - "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 - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "follow-redirects": { + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", + "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==", "dev": true }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.15" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true }, - "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", @@ -3016,1154 +11598,251 @@ "dev": true }, "fs-minipass": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "dev": true, - "optional": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "requires": { - "minipass": "2.2.4" + "minipass": "^3.0.0" } }, + "fs-monkey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", + "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "dev": true + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.0.tgz", - "integrity": "sha512-ROrBIbmw4ulxmQTwYAAGyN/0xgIOAFd6gX/K3F1aGLP/K5KxkubrlGISMV5EEWEB7qtiEdE0HpaqvMMHR+Ib6w==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.9.1" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", - "bundled": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "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" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz", - "integrity": "sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=", - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.2", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.0", - "rc": "1.2.1", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "4.4.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - } - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true - }, - "qs": { - "version": "6.4.0", - "bundled": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "~0.4.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, - "yallist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true, - "optional": true - } - } + "optional": true }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "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" } }, "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", - "dev": true, + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "requires": { - "globule": "1.2.0" + "globule": "^1.0.0" } }, - "generate-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", - "dev": true - }, - "generate-object-property": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", - "dev": true, - "requires": { - "is-property": "1.0.2" - } + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "peer": true }, "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" }, "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "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.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { - "assert-plus": "1.0.0" + "is-glob": "^4.0.1" + } + }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, + "globby": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" }, "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true } } }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", - "dev": true, + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", + "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" + }, + "dependencies": { + "glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "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" + } + } } }, "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" }, "handle-thing": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", "dev": true }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "requires": { - "chalk": "1.1.3", - "commander": "2.15.1", - "is-my-json-valid": "2.17.2", - "pinkie-promise": "2.0.1" + "ajv": "^6.12.3", + "har-schema": "^2.0.0" } }, + "hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { - "function-bind": "1.1.1" - }, - "dependencies": { - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - } + "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.1.1" + "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.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + }, + "has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.2" + } }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "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.1" - } - }, - "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-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.2.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" - } - } - } - }, - "hash-base": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "1.1.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" }, "home-or-tmp": { "version": "2.0.0", @@ -4171,15 +11850,17 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", + "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", + "requires": { + "lru-cache": "^6.0.0" + } }, "hpack.js": { "version": "2.1.6", @@ -4187,22 +11868,16 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.3", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "wbuf": "1.7.2" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", - "dev": true - }, "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz", + "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==", "dev": true }, "http-deceiver": { @@ -4212,883 +11887,521 @@ "dev": true }, "http-errors": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", - "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "1.1.0", + "depd": "~1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.3.1" + "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=", + "dev": true + } } }, "http-parser-js": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz", - "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", "dev": true }, "http-proxy": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", - "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "1.2.0", - "requires-port": "1.0.0" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-middleware": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", - "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", + "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", "dev": true, "requires": { - "http-proxy": "1.16.2", - "is-glob": "3.1.0", - "lodash": "4.17.4", - "micromatch": "2.3.11" + "@types/http-proxy": "^1.17.5", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" }, "dependencies": { - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } } } }, "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, - "https-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", - "dev": true + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" }, "iconv-lite": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", - "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } }, "icss-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", "dev": true, - "requires": { - "postcss": "6.0.8" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "postcss": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", - "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", - "dev": true, - "requires": { - "chalk": "2.0.1", - "source-map": "0.5.6", - "supports-color": "4.2.1" - } - }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } - } + "requires": {} }, - "ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, - "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "dev": true, - "optional": true, + "import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", "requires": { - "minimatch": "^3.0.4" + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" } }, - "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true - }, "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "internal-ip": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz", + "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==", "dev": true, "requires": { - "meow": "3.7.0" + "default-gateway": "^6.0.0", + "ipaddr.js": "^1.9.1", + "is-ip": "^3.1.0", + "p-event": "^4.2.0" + }, + "dependencies": { + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true + } } }, "interpret": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==" }, "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", - "dev": true, + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.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=", "dev": true }, + "ip-regex": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", + "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true + }, "ipaddr.js": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", - "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", + "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", "dev": true }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, - "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=", + "is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "dev": true, "requires": { - "kind-of": "3.2.2" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "1.9.0" + "binary-extensions": "^2.0.0" } }, - "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, + "is-core-module": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", + "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", - "dev": true - }, - "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.2.2" + "has": "^1.0.3" } }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.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 - } + "has-tostringtag": "^1.0.0" } }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true }, "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true }, "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=", - "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^2.1.1" } }, - "is-my-ip-valid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", - "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", - "dev": true - }, - "is-my-json-valid": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", - "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", + "is-ip": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz", + "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==", "dev": true, "requires": { - "generate-function": "2.0.0", - "generate-object-property": "1.2.0", - "is-my-ip-valid": "1.0.0", - "jsonpointer": "4.0.1", - "xtend": "4.0.1" + "ip-regex": "^4.0.0" } }, "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-path-in-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", - "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", - "dev": true, - "requires": { - "is-path-inside": "1.0.0" - } + "is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true }, "is-path-inside": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", - "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", - "dev": true, - "requires": { - "path-is-inside": "1.0.2" - } + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "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 + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" }, "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" + "isobject": "^3.0.1" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-property": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true - }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { - "has": "1.0.3" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-svg": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", - "dev": true, - "requires": { - "html-comment-regex": "1.1.1" - } - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "is-typedarray": { "version": "1.0.0", "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-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 + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "requires": { + "is-docker": "^2.0.0" + } }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "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 + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "1.7.1", - "whatwg-fetch": "2.0.3" - } + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "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 + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "js-base64": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", - "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "js-yaml": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", - "dev": true, + "jest-worker": { + "version": "27.2.5", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz", + "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==", "requires": { - "argparse": "1.0.9", - "esprima": "2.7.3" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.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==" + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "requires": { + "has-flag": "^4.0.0" + } + } } }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, "jsan": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/jsan/-/jsan-3.1.9.tgz", - "integrity": "sha1-JwVnbBBY8KfZrCZq0Daldpz6fJY=" + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/jsan/-/jsan-3.1.13.tgz", + "integrity": "sha512-9kGpCsGHifmw6oJet+y8HaCl14y7qgAsxVdV3pCHDySNR3BfDC30zgkssd7x5LRVAT22dnpbe9JdzzmXZnq9/g==", + "dev": true }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, - "json-loader": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", - "dev": true + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "requires": { - "jsonify": "0.0.0" - } + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "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 - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, - "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "peer": true, + "requires": { + "minimist": "^1.2.5" + } }, "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": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, - "killable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz", - "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", - "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" - } + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, - "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" - } + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", + "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==", + "dev": true + }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "linked-list": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/linked-list/-/linked-list-0.1.0.tgz", - "integrity": "sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78=" - }, - "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.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "integrity": "sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78=", "dev": true }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1" - } + "loader-runner": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^4.1.0" } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "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.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, "loglevel": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", - "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", - "dev": true + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", + "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==" }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { - "js-tokens": "3.0.2" - } - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "dev": true, + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "yallist": "^4.0.0" } }, - "macaddress": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", - "dev": true - }, - "make-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", - "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "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-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "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.1" - } - }, - "math-expression-evaluator": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", - "dev": true + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" }, "media-typer": { "version": "0.3.0", @@ -5096,49 +12409,32 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "memfs": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz", + "integrity": "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==", "dev": true, "requires": { - "mimic-fn": "1.1.0" - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "0.1.4", - "readable-stream": "2.3.3" + "fs-monkey": "1.0.3" } }, "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", + "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize": "^1.2.0", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" } }, "merge-descriptors": { @@ -5147,6 +12443,17 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -5154,180 +12461,112 @@ "dev": true }, "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.3" + "braces": "^3.0.1", + "picomatch": "^2.2.3" } }, - "miller-rabin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", - "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=", - "dev": true, - "requires": { - "bn.js": "4.11.7", - "brorand": "1.1.0" - } - }, - "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, + "mime-db": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==" + }, "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", - "dev": true, + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", "requires": { - "mime-db": "1.27.0" + "mime-db": "1.50.0" } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==" }, "minimalistic-assert": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=", - "dev": true - }, - "minimalistic-crypto-utils": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "dev": true }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "requires": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + } }, "minipass": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", - "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "dev": true, + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "yallist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true - } + "yallist": "^4.0.0" } }, "minizlib": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", - "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", - "dev": true, - "optional": true, + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "requires": { - "minipass": "2.2.4" - } - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "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" - } - } - } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } + "minipass": "^3.0.0", + "yallist": "^4.0.0" } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz", - "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", + "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "1.1.1", - "thunky": "0.1.0" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -5337,365 +12576,210 @@ "dev": true }, "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" + }, + "nanoid": { + "version": "3.1.29", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz", + "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==", "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.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "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 - }, - "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 - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "needle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz", - "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==", - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "iconv-lite": "0.4.18", - "sax": "1.2.4" - } - }, "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", "dev": true }, "neo-async": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", - "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==", - "dev": true - }, - "node-fetch": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", - "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==", - "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" - } + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node-forge": { - "version": "0.6.33", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", - "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", - "dev": true, + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.79.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.2.14" + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.3", + "nopt": "^5.0.0", + "npmlog": "^4.1.2", + "request": "^2.88.2", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "tar": "^6.0.2", + "which": "^2.0.2" }, "dependencies": { "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } } } }, - "node-libs-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.1.4", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.11.1", - "domain-browser": "1.1.7", - "events": "1.1.1", - "https-browserify": "0.0.1", - "os-browserify": "0.2.1", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.3", - "stream-browserify": "2.0.1", - "stream-http": "2.7.2", - "string_decoder": "0.10.31", - "timers-browserify": "2.0.2", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", - "vm-browserify": "0.0.4" - }, - "dependencies": { - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } + "node-releases": { + "version": "1.1.77", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", + "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==" }, "node-sass": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", - "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", - "dev": true, + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", + "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.10.0", - "node-gyp": "3.6.2", - "npmlog": "4.1.2", - "request": "2.79.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^7.0.3", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "lodash": "^4.17.15", + "meow": "^9.0.0", + "nan": "^2.13.2", + "node-gyp": "^7.1.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "2.2.5", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } } }, "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "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.2" - } - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" - } - }, - "npm-bundled": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, "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, + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "requires": { - "path-key": "2.0.1" + "path-key": "^3.0.0" } }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "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=", + "object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" - }, - "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.6" - } - } + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", - "dev": true + "version": "1.1.1", + "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, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "requires": { - "isobject": "3.0.1" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - } - } - }, - "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" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" } }, "obuf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz", - "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", "dev": true }, "on-finished": { @@ -5708,85 +12792,57 @@ } }, "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, - "opn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", - "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", - "dev": true, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "requires": { - "is-wsl": "1.1.0" + "mimic-fn": "^2.1.0" } }, - "original": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", - "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", + "open": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.3.0.tgz", + "integrity": "sha512-7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w==", "dev": true, "requires": { - "url-parse": "1.0.5" - }, - "dependencies": { - "url-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", - "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", - "dev": true, - "requires": { - "querystringify": "0.0.4", - "requires-port": "1.0.0" - } - } + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" } }, - "os-browserify": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", - "dev": true - }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, - "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", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "p-timeout": "^3.1.0" } }, "p-finally": { @@ -5796,113 +12852,90 @@ "dev": true }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "requires": { - "p-limit": "1.1.0" + "p-limit": "^2.2.0" } }, "p-map": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz", - "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=", - "dev": true - }, - "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", - "dev": true - }, - "parse-asn1": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "asn1.js": "4.9.1", - "browserify-aes": "1.0.6", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.0", - "pbkdf2": "3.0.12" + "aggregate-error": "^3.0.0" } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "p-retry": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz", + "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "@types/retry": "^0.12.0", + "retry": "^0.13.1" } }, + "p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "dev": true, + "requires": { + "p-finally": "^1.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "requires": { - "error-ex": "1.3.1" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" } }, "parseurl": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, "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 + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-to-regexp": { "version": "0.1.7", @@ -5911,1184 +12944,582 @@ "dev": true }, "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.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true }, - "pbkdf2": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", - "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=", - "dev": true, - "requires": { - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "ripemd160": "2.0.1", - "safe-buffer": "5.0.1", - "sha.js": "2.4.8" - } + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "pify": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" + }, + "picomatch": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "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.4" - } - }, "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "requires": { - "find-up": "2.1.0" + "find-up": "^4.0.0" } }, "portfinder": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { - "async": "1.5.2", - "debug": "2.6.8", - "mkdirp": "0.5.1" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - } - } - }, - "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 - }, - "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.1.9", - "source-map": "0.5.6", - "supports-color": "3.2.3" - }, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { - "has-flag": "1.0.0" + "ms": "^2.1.1" } } } }, - "postcss-calc": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", + "postcss": { + "version": "8.3.9", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz", + "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==", "dev": true, "requires": { - "postcss": "5.2.17", - "postcss-message-helpers": "2.0.0", - "reduce-css-calc": "1.3.0" - } - }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", - "dev": true, - "requires": { - "colormin": "1.1.2", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-discard-comments": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-discard-empty": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-discard-unused": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "uniqs": "2.0.0" - } - }, - "postcss-filter-plugins": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "uniqid": "4.1.1" - } - }, - "postcss-merge-idents": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-merge-rules": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-api": "1.6.1", - "postcss": "5.2.17", - "postcss-selector-parser": "2.2.3", - "vendors": "1.0.1" - } - }, - "postcss-message-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-minify-params": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0", - "uniqs": "2.0.0" - } - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.3", - "postcss": "5.2.17", - "postcss-selector-parser": "2.2.3" + "nanoid": "^3.1.28", + "picocolors": "^0.2.1", + "source-map-js": "^0.6.2" } }, "postcss-modules-extract-imports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", - "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", "dev": true, - "requires": { - "postcss": "6.0.8" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "postcss": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", - "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", - "dev": true, - "requires": { - "chalk": "2.0.1", - "source-map": "0.5.6", - "supports-color": "4.2.1" - } - }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } - } + "requires": {} }, "postcss-modules-local-by-default": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", + "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "dev": true, "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.8" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "postcss": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", - "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", - "dev": true, - "requires": { - "chalk": "2.0.1", - "source-map": "0.5.6", - "supports-color": "4.2.1" - } - }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" } }, "postcss-modules-scope": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.8" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "postcss": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", - "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", - "dev": true, - "requires": { - "chalk": "2.0.1", - "source-map": "0.5.6", - "supports-color": "4.2.1" - } - }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } + "postcss-selector-parser": "^6.0.4" } }, "postcss-modules-values": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "dev": true, "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "6.0.8" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "postcss": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", - "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", - "dev": true, - "requires": { - "chalk": "2.0.1", - "source-map": "0.5.6", - "supports-color": "4.2.1" - } - }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-normalize-url": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", - "dev": true, - "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "1.9.1", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-ordered-values": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0" + "icss-utils": "^5.0.0" } }, "postcss-selector-parser": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", "dev": true, "requires": { - "flatten": "1.0.2", - "indexes-of": "1.0.1", - "uniq": "1.0.1" - } - }, - "postcss-svgo": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", - "dev": true, - "requires": { - "is-svg": "2.1.0", - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0", - "svgo": "0.7.2" - } - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.17", - "uniqs": "2.0.0" + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" } }, "postcss-value-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", - "dev": true - }, - "postcss-zindex": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.17", - "uniqs": "2.0.0" - } - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "private": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", - "dev": true - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "requires": { - "asap": "2.0.6" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "prop-types": { - "version": "15.5.10", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz", - "integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=", + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", "requires": { - "fbjs": "0.8.12", - "loose-envify": "1.3.1" + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" } }, "protobufjs": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", - "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/base64": "1.1.2", - "@protobufjs/codegen": "2.0.4", - "@protobufjs/eventemitter": "1.1.0", - "@protobufjs/fetch": "1.1.0", - "@protobufjs/float": "1.0.2", - "@protobufjs/inquire": "1.1.0", - "@protobufjs/path": "1.1.2", - "@protobufjs/pool": "1.1.0", - "@protobufjs/utf8": "1.1.0", - "@types/long": "3.0.32", - "@types/node": "8.10.9", - "long": "4.0.0" + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" } }, "proxy-addr": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", - "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.6.0" - } - }, - "prr": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", - "dev": true, - "requires": { - "bn.js": "4.11.7", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "parse-asn1": "5.1.0", - "randombytes": "2.0.5" - } - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", - "dev": true - }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" - } - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "querystringify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", - "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" }, "dependencies": { - "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.2.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" - } - } - } - }, - "randombytes": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true } } }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "querystring": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz", + "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==", + "dev": true + }, + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, + "quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==" + }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "requires": { + "safe-buffer": "^5.1.0" + } + }, "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true }, "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", "dev": true, "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, "dependencies": { "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.3.1" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", "dev": true } } }, "react": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz", - "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", "requires": { - "create-react-class": "15.6.0", - "fbjs": "0.8.12", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.5.10" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" + } + }, + "react-contextmenu": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/react-contextmenu/-/react-contextmenu-2.14.0.tgz", + "integrity": "sha512-ktqMOuad6sCFNJs/ltEwppN8F0YeXmqoZfwycgtZR/MxOXMYx1xgYC44SzWH259HdGyshk1/7sXGuIRwj9hzbw==", + "requires": { + "classnames": "^2.2.5", + "object-assign": "^4.1.0" } }, "react-data-grid": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-4.0.8.tgz", - "integrity": "sha512-APlFLSG6UKRHXE162yH+Rnn3J+i+rX2n7WCHKbQrYgzW57v9i+72gGrE22iLC2h/kPsGs40JcZmW3OOkRqkPxA==" + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-7.0.0-beta.7.tgz", + "integrity": "sha512-RlU8JW3GCnKSNq8sr0f59qTjiSx0ArhWcBv5K5+ksklgJ+gQnFc5oVXOXu1aWgtqhiEzvov6Cn6vEi7Jczdwaw==", + "requires": { + "clsx": "^1.1.1" + } }, "react-data-grid-addons": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/react-data-grid-addons/-/react-data-grid-addons-4.0.8.tgz", - "integrity": "sha512-wpAj3PgqEAMn42dTIshoHaPhg9MpqqTGTQLnNOqPJxCnnjPJGpGcCrwDJNlhXzJoG9yrwx5YckVd7yYKHkCzQA==", + "version": "7.0.0-alpha.24", + "resolved": "https://registry.npmjs.org/react-data-grid-addons/-/react-data-grid-addons-7.0.0-alpha.24.tgz", + "integrity": "sha512-j/cZIPFhthJF7BUEYoio+M55pL5zuYWvrMS3kMesxI7Vrabn0Oh1K0pZB4RxTTvEwseiWd2xoZa4E25pZxm3CQ==", "requires": { - "react-data-grid": "4.0.8" + "lodash": "^4.17.15", + "prop-types": "^15.7.2", + "react-contextmenu": "^2.13.0", + "react-data-grid": "^7.0.0-alpha.24", + "react-dnd": "^2.6.0", + "react-dnd-html5-backend": "^2.6.0", + "react-select": "^1.3.0", + "reselect": "^4.0.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "react-dnd": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.6.0.tgz", + "integrity": "sha1-f6JWds+CfViokSk+PBq1naACVFo=", + "requires": { + "disposables": "^1.0.1", + "dnd-core": "^2.6.0", + "hoist-non-react-statics": "^2.1.0", + "invariant": "^2.1.0", + "lodash": "^4.2.0", + "prop-types": "^15.5.10" + } + }, + "react-dnd-html5-backend": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz", + "integrity": "sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=", + "requires": { + "lodash": "^4.2.0" } }, "react-dom": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz", - "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", + "peer": true, "requires": { - "fbjs": "0.8.12", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.5.10" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + } + }, + "react-input-autosize": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz", + "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==", + "requires": { + "prop-types": "^15.5.8" + } + }, + "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==" + }, + "react-select": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz", + "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==", + "requires": { + "classnames": "^2.2.4", + "prop-types": "^15.5.8", + "react-input-autosize": "^2.1.2" } }, "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, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" + }, + "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==", + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "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==" + } } }, "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, + "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==", "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" }, "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.1.0", - "pinkie-promise": "2.0.1" - } - }, - "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.1" - } + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" } } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - } + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.3", - "set-immediate-shim": "1.0.1" + "picomatch": "^2.2.1" + } + }, + "rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "requires": { + "resolve": "^1.9.0" } }, "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" } }, - "reduce-css-calc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", - "dev": true, + "redux": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", + "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", "requires": { - "balanced-match": "0.4.2", - "math-expression-evaluator": "1.2.17", - "reduce-function-call": "1.0.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "reduce-function-call": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", - "dev": true, - "requires": { - "balanced-match": "0.4.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } + "lodash": "^4.2.1", + "lodash-es": "^4.2.1", + "loose-envify": "^1.1.0", + "symbol-observable": "^1.0.3" } }, "regenerate": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + }, + "regenerate-unicode-properties": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz", + "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==", + "requires": { + "regenerate": "^1.4.2" + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regenerator-transform": { - "version": "0.9.11", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz", - "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", - "dev": true, + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", + "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.25.0", - "private": "0.1.7" + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" } }, - "regex-cache": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "regexp.prototype.flags": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", + "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3", - "is-primitive": "2.0.0" - } - }, - "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" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, "regexpu-core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, "requires": { - "regenerate": "1.3.2", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" }, "regjsparser": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } }, "remotedev": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/remotedev/-/remotedev-0.2.7.tgz", - "integrity": "sha1-he83C1LrVyG9PoadaB3HAn1SfuM=", + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/remotedev/-/remotedev-0.2.9.tgz", + "integrity": "sha512-W8dHOv9BcFnetFEd08yNb5O9Hd+zkTFFnf9FRjNCkb4u+JgQ/U152Aw4q83AmY3m34d6KZwhK5ip/Qc331+4vA==", + "dev": true, "requires": { - "jsan": "3.1.9", - "querystring": "0.2.0", - "rn-host-detect": "1.1.3", - "socketcluster-client": "5.5.2" + "jsan": "^3.1.3", + "querystring": "^0.2.0", + "rn-host-detect": "^1.0.1", + "socketcluster-client": "^13.0.0" } }, - "remove-trailing-separator": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "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=", - "dev": true - }, "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.7.0", - "caseless": "0.11.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "qs": "6.3.2", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.4.3", - "uuid": "3.2.1" + "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" } }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "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 + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "requires-port": { "version": "1.0.0", @@ -7096,222 +13527,155 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, + "reselect": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz", + "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==" + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "requires": { - "resolve-from": "3.0.0" + "is-core-module": "^2.2.0", + "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==", + "requires": { + "resolve-from": "^5.0.0" } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true }, - "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 - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "requires": { - "align-text": "0.1.4" - } - }, "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "requires": { - "glob": "7.1.2" - } - }, - "ripemd160": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", - "dev": true, - "requires": { - "hash-base": "2.0.2", - "inherits": "2.0.3" + "glob": "^7.1.3" } }, "rn-host-detect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.1.3.tgz", - "integrity": "sha1-JC124vpIXEjXUUFuZbfM5ZaWnpE=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.2.0.tgz", + "integrity": "sha512-btNg5kzHcjZZ7t7mvvV/4wNJ9e3MPgrWivkRgWURzXL0JJ0pwWlU4zrbmdlz3HHzHOxhBhHB4D+/dbMFfu4/4A==", + "dev": true }, - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "requires": { - "ret": "0.1.15" + "queue-microtask": "^1.2.2" } }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" } }, "sass-loader": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz", - "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.1.0.tgz", + "integrity": "sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==", "dev": true, "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "neo-async": "2.5.1", - "pify": "3.0.0" - }, - "dependencies": { - "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "dev": true, - "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "1.0.0" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", - "dev": true, - "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" - }, - "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 - } - } - } + "klona": "^2.0.4", + "neo-async": "^2.6.2" } }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, "sc-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/sc-channel/-/sc-channel-1.0.6.tgz", - "integrity": "sha1-s4vUepk+eCkPvFNGeGf2sqCghjk=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sc-channel/-/sc-channel-1.2.0.tgz", + "integrity": "sha512-M3gdq8PlKg0zWJSisWqAsMmTVxYRTpVRqw4CWAdKBgAfVKumFcTjoCV0hYu7lgUXccCtCD8Wk9VkkE+IXCxmZA==", + "dev": true, "requires": { - "sc-emitter": "1.1.0" - } - }, - "sc-emitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/sc-emitter/-/sc-emitter-1.1.0.tgz", - "integrity": "sha1-7xGdQiL0xk+Ie0hpZO8REWzdDnU=", - "requires": { - "component-emitter": "1.2.0" + "component-emitter": "1.2.1" } }, "sc-errors": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sc-errors/-/sc-errors-1.3.2.tgz", - "integrity": "sha1-OwC4UtLwgalRlqV/VBU5xhqvO0E=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sc-errors/-/sc-errors-1.4.1.tgz", + "integrity": "sha512-dBn92iIonpChTxYLgKkIT/PCApvmYT6EPIbRvbQKTgY6tbEbIy8XVUv4pGyKwEK4nCmvX4TKXcN0iXC6tNW6rQ==", + "dev": true }, "sc-formatter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/sc-formatter/-/sc-formatter-3.0.0.tgz", - "integrity": "sha1-yRsf5WwmCr1aai5q+YxyS8eZijg=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/sc-formatter/-/sc-formatter-3.0.2.tgz", + "integrity": "sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A==", + "dev": true + }, + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "peer": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } }, "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "requires": { - "ajv": "5.2.2" - }, - "dependencies": { - "ajv": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", - "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", - "dev": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "json-schema-traverse": "0.3.1", - "json-stable-stringify": "1.0.1" - } - } + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, "requires": { - "js-base64": "2.1.9", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -7323,39 +13687,86 @@ "dev": true }, "selfsigned": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.9.1.tgz", - "integrity": "sha1-zdpEktcNSGVw+HxlVGAjVY4d+lo=", + "version": "1.10.11", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", + "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", "dev": true, "requires": { - "node-forge": "0.6.33" + "node-forge": "^0.10.0" } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.6.3", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.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" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } + } + }, + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "requires": { + "randombytes": "^2.1.0" + } + }, + "serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "dev": true, + "requires": { + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { "debug": { @@ -7367,28 +13778,28 @@ "ms": "2.0.0" } }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.4.0" + "statuses": ">= 1.4.0 < 2" } }, - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "setprototypeof": { @@ -7396,125 +13807,57 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "dev": true - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true } } }, - "serve-index": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz", - "integrity": "sha1-0rKA/FYNYW7oG0i/D6gqvtJIXOc=", - "dev": true, - "requires": { - "accepts": "1.3.3", - "batch": "0.6.1", - "debug": "2.6.8", - "escape-html": "1.0.3", - "http-errors": "1.6.1", - "mime-types": "2.1.15", - "parseurl": "1.3.1" - } - }, "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.16.2" - }, - "dependencies": { - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", - "dev": true - } + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" } }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.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.1" - } - } - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", "dev": true }, - "sha.js": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", - "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", - "dev": true, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "requires": { - "inherits": "2.0.3" + "kind-of": "^6.0.2" } }, "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, + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^3.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 + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", + "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==" }, "slash": { "version": "1.0.0", @@ -7522,565 +13865,351 @@ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, - "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.2", - "debug": "2.6.8", - "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.2", - "use": "3.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.6" - } - }, - "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.1" - } - } - } - }, - "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.1", - "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.2" - } - }, - "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.2" - } - }, - "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.2" - } - }, - "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" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "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.2" - } - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, "socketcluster-client": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/socketcluster-client/-/socketcluster-client-5.5.2.tgz", - "integrity": "sha1-nUNp4Oci/35V5UIsLUT1r+Gv8Sg=", + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/socketcluster-client/-/socketcluster-client-13.0.1.tgz", + "integrity": "sha512-hxiE2xz6mgaBlhXbtBa4POgWVEvIcjCoHzf5LTUVhI9IL8V2ltV3Ze8pQsi9egqTjSz4RHPfyrJ7BiETe5Kthw==", + "dev": true, "requires": { "base-64": "0.1.0", "clone": "2.1.1", + "component-emitter": "1.2.1", "linked-list": "0.1.0", "querystring": "0.2.0", - "sc-channel": "1.0.6", - "sc-emitter": "1.1.0", - "sc-errors": "1.3.2", - "sc-formatter": "3.0.0", - "ws": "3.0.0" - } - }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", - "dev": true, - "requires": { - "debug": "2.6.8", - "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.1.9" + "sc-channel": "^1.2.0", + "sc-errors": "^1.4.0", + "sc-formatter": "^3.0.1", + "uuid": "3.2.1", + "ws": "5.1.1" }, "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - } - } - }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "1.1.0" - } - }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", - "dev": true - }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, - "requires": { - "atob": "2.1.1", - "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.4.15", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", - "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", - "dev": true, - "requires": { - "source-map": "0.5.6" - } - }, - "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 - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, - "requires": { - "debug": "2.6.8", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.0.1", - "select-hose": "2.0.0", - "spdy-transport": "2.0.20" - } - }, - "spdy-transport": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz", - "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=", - "dev": true, - "requires": { - "debug": "2.6.8", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "safe-buffer": "5.0.1", - "wbuf": "1.7.2" - } - }, - "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.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", - "dev": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", "dev": true } } }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "sockjs": { + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", + "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "faye-websocket": "^0.11.3", + "uuid": "^3.4.0", + "websocket-driver": "^0.7.4" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", + "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", + "dev": true + }, + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "^0.5.6" + } + }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "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==" + }, + "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==", + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", + "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==" + }, + "spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", + "dev": true, + "requires": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + } + }, + "spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "dev": true, + "requires": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.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=", + "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==", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "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" + } + }, "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, "stdout-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", - "dev": true, + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "requires": { - "readable-stream": "2.3.3" + "readable-stream": "^2.0.1" } }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "safe-buffer": "~5.1.0" } }, - "stream-http": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", - "dev": true, - "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" - } - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - } - } - }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, - "strip-bom": { + "strip-final-newline": { "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.1" - } - }, - "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 + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" }, "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "requires": { - "get-stdin": "4.0.1" + "min-indent": "^1.0.0" } }, "style-loader": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz", - "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.0.tgz", + "integrity": "sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==", "dev": true, - "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.3.0" - } + "requires": {} }, "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "svgo": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", - "dev": true, + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" + "has-flag": "^3.0.0" } }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + }, "tapable": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz", - "integrity": "sha1-5GwNqsuyuKmLmwzqD0BSEFgX7Vw=", - "dev": true + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "thunky": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=", - "dev": true - }, - "time-stamp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz", - "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=", - "dev": true - }, - "timers-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", - "integrity": "sha1-q0iDz1l9zVCvIRNJoA+8pWrIa4Y=", - "dev": true, - "requires": { - "setimmediate": "1.0.5" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "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.2.2" - } - }, - "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": "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" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + } + } + }, + "terser": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", + "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "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==" + }, + "source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "requires": { - "kind-of": "3.2.2" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } } } } }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "terser-webpack-plugin": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz", + "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==", + "requires": { + "jest-worker": "^27.0.6", + "p-limit": "^3.1.0", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1", + "terser": "^5.7.2" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "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-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "punycode": "1.4.1" + "is-number": "^7.0.0" + } + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "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==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==" }, "trim-right": { "version": "1.0.1", @@ -8089,188 +14218,70 @@ "dev": true }, "true-case-path": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", - "dev": true, + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "requires": { - "glob": "6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } + "glob": "^7.1.2" } }, "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true }, "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "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, - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==" }, "type-is": { - "version": "1.6.15", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.15" + "mime-types": "~2.1.24" } }, - "ua-parser-js": { - "version": "0.7.14", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz", - "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o=" - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", - "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", - "dev": true, - "requires": { - "source-map": "0.5.6", - "uglify-js": "2.8.29", - "webpack-sources": "1.1.0" - } - }, - "ultron": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", - "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=" - }, - "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", - "dev": true, - "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" - }, - "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.1" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" - } - } - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqid": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", - "dev": true, - "requires": { - "macaddress": "0.2.8" - } - }, - "uniqs": { + "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" + }, + "unicode-match-property-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "requires": { + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", + "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" + }, + "unicode-property-aliases-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", + "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==" }, "unpipe": { "version": "1.0.0", @@ -8278,75 +14289,19 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, - "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.1" - }, - "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.6", - "has-values": "0.1.4", - "isobject": "2.1.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 - } - } - }, - "upath": { + "upgrade": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", - "dev": true + "resolved": "https://registry.npmjs.org/upgrade/-/upgrade-1.1.0.tgz", + "integrity": "sha1-SlCHXsXHFdGTeXmfBZCg55aVj2E=" }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "requires": { - "punycode": "2.1.1" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - } + "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": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", @@ -8362,57 +14317,11 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true - } - } - }, - "url-parse": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz", - "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=", - "dev": true, - "requires": { - "querystringify": "1.0.0", - "requires-port": "1.0.0" - }, - "dependencies": { - "querystringify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", - "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", - "dev": true - } - } - }, - "use": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "dev": true } } @@ -8420,8 +14329,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", @@ -8430,1438 +14338,409 @@ "dev": true }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", - "dev": true + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, + "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==", "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "vary": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz", - "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=", - "dev": true - }, - "vendors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "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", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" }, "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "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=" } } }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } - }, "watchpack": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", - "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", - "dev": true, + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", + "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==", "requires": { - "async": "2.6.1", - "chokidar": "1.7.0", - "graceful-fs": "4.1.11" + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" } }, "wbuf": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz", - "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "1.0.0" + "minimalistic-assert": "^1.0.0" } }, "webpack": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz", - "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==", + "version": "5.58.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.58.1.tgz", + "integrity": "sha512-4Z/dmbTU+VmkCb2XNgW7wkE5TfEcSooclprn/UEuVeAkwHhn07OcgUsyaKHGtCY/VobjnsYBlyhKeMLiSoOqPg==", + "requires": { + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.4", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.2.0", + "webpack-sources": "^3.2.0" + } + }, + "webpack-cli": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.0.tgz", + "integrity": "sha512-n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw==", + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "v8-compile-cache": "^2.2.0", + "webpack-merge": "^5.7.3" + }, + "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + } + } + }, + "webpack-dev-middleware": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz", + "integrity": "sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ==", "dev": true, "requires": { - "acorn": "5.7.1", - "acorn-dynamic-import": "2.0.2", - "ajv": "6.5.1", - "ajv-keywords": "3.2.0", - "async": "2.6.1", - "enhanced-resolve": "3.4.1", - "escope": "3.6.0", - "interpret": "1.0.3", - "json-loader": "0.5.7", - "json5": "0.5.1", - "loader-runner": "2.3.0", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "mkdirp": "0.5.1", - "node-libs-browser": "2.0.0", - "source-map": "0.5.6", - "supports-color": "4.5.0", - "tapable": "0.2.7", - "uglifyjs-webpack-plugin": "0.4.6", - "watchpack": "1.4.0", - "webpack-sources": "1.1.0", - "yargs": "8.0.2" + "colorette": "^2.0.10", + "memfs": "^3.2.2", + "mime-types": "^2.1.31", + "range-parser": "^1.2.1", + "schema-utils": "^3.1.0" + } + }, + "webpack-dev-server": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.3.1.tgz", + "integrity": "sha512-qNXQCVYo1kYhH9pgLtm8LRNkXX3XzTfHSj/zqzaqYzGPca+Qjr+81wj1jgPMCHhIhso9WEQ+kX9z23iG9PzQ7w==", + "dev": true, + "requires": { + "ansi-html-community": "^0.0.8", + "bonjour": "^3.5.0", + "chokidar": "^3.5.1", + "colorette": "^2.0.10", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "del": "^6.0.0", + "express": "^4.17.1", + "graceful-fs": "^4.2.6", + "html-entities": "^2.3.2", + "http-proxy-middleware": "^2.0.0", + "internal-ip": "^6.2.0", + "ipaddr.js": "^2.0.1", + "open": "^8.0.9", + "p-retry": "^4.5.0", + "portfinder": "^1.0.28", + "schema-utils": "^3.1.0", + "selfsigned": "^1.10.11", + "serve-index": "^1.9.1", + "sockjs": "^0.3.21", + "spdy": "^4.0.2", + "strip-ansi": "^7.0.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^5.2.1", + "ws": "^8.1.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, - "camelcase": { + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "dev": true, + "requires": {} + } + } + }, + "webpack-merge": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "requires": { + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" + } + }, + "webpack-sources": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz", + "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==" + }, + "websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, + "requires": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + } + }, + "websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" + }, + "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==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "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 - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { - "ansi-regex": "3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "dev": true, - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "dev": true, - "requires": { - "camelcase": "4.1.0" + "ansi-regex": "^4.1.0" } } } }, - "webpack-dev-server": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz", - "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.0", - "connect-history-api-fallback": "1.5.0", - "debug": "3.1.0", - "del": "3.0.0", - "express": "4.16.3", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.17.4", - "import-local": "1.0.0", - "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.0", - "loglevel": "1.6.1", - "opn": "5.3.0", - "portfinder": "1.0.13", - "selfsigned": "1.9.1", - "serve-index": "1.9.0", - "sockjs": "0.3.19", - "sockjs-client": "1.1.4", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "5.4.0", - "webpack-dev-middleware": "1.12.2", - "yargs": "6.6.0" - }, - "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.10", - "normalize-path": "2.1.1" - } - }, - "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 - }, - "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 - }, - "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.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "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.1" - } - } - } - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", - "dev": true, - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.4", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.1.0" - } - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "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": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "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.6" - } - }, - "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.1" - } - }, - "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.2.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-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.2.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-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.1.0" - } - }, - "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 - } - } - }, - "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.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "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.2" - } - }, - "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.1" - } - } - } - }, - "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.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.1" - } - } - } - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", - "dev": true, - "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.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.2" - } - }, - "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.2" - } - }, - "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" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "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.2.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": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "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.2", - "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.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true, - "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.2.1" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - }, - "webpack-dev-middleware": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz", - "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==", - "dev": true, - "requires": { - "memory-fs": "0.4.1", - "mime": "1.6.0", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "time-stamp": "2.0.0" - } - }, - "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "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.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - } - }, - "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - } - } - } - }, - "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", - "dev": true, - "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "websocket-driver": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", - "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", - "dev": true, - "requires": { - "http-parser-js": "0.4.13", - "websocket-extensions": "0.1.3" - } - }, - "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", - "dev": true - }, - "whatwg-fetch": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", - "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" - }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", - "dev": true - }, - "which": { - "version": "1.2.14", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", - "dev": true, - "requires": { - "isexe": "2.0.0" - } - }, - "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 - }, - "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "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.2", - "strip-ansi": "3.0.1" - } - }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz", - "integrity": "sha1-mN2wAFbIOQy3Ued4h4hJf5kQO2w=", - "requires": { - "safe-buffer": "5.0.1", - "ultron": "1.1.0" - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz", + "integrity": "sha512-bOusvpCb09TOBLbpMKszd45WKC2KPtxiyiHanv+H2DE3Az+1db5a/L7sVJZVDPUC1Br8f0SKRr1KjLpD1U/IAw==", "dev": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "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.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "async-limiter": "~1.0.0" + } + }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "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": { - "camelcase": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "find-up": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "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=" + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "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==", + "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=" + }, + "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==", + "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==", + "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==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - } - } + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" } } } diff --git a/src/web/ui/package.json b/src/web/ui/package.json index 9386360bb..c9c6492ee 100644 --- a/src/web/ui/package.json +++ b/src/web/ui/package.json @@ -1,40 +1,28 @@ { - "name": "ui", - "version": "1.0.0", - "description": "Simple Fable App", - "repository": {}, - "scripts": { - "build": "webpack -p", - "start": "webpack-dev-server", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "keywords": [], - "author": "", - "license": "ISC", "dependencies": { + "@babel/preset-env": "^7.15.8", + "babel-preset-env": "^1.7.0", "babel-runtime": "^6.26.0", - "protobufjs": "^6.8.6", - "react": "^15.6.2", - "react-data-grid": "^4.0.8", - "react-data-grid-addons": "^4.0.8", - "react-dom": "^15.6.2", - "remotedev": "^0.2.7", - "tslib": "~1.9.0" + "fable-loader": "^2.1.9", + "fable-utils": "^1.2.0", + "loglevel": "^1.7.1", + "node-sass": "^6.0.1", + "protobufjs": "^6.11.2", + "react": "^16.14.0", + "react-data-grid-addons": "^7.0.0-alpha.24", + "upgrade": "^1.1.0", + "webpack": "^5.58.1", + "webpack-cli": "^4.9.0" }, "devDependencies": { "babel-core": "^6.26.3", - "babel-loader": "^7.1.4", "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-es2015": "^6.24.1", - "bulma": "^0.5.3", - "css-loader": "^0.28.7", - "fable-loader": "^1.1.6", - "fable-utils": "^1.0.6", - "loglevel": "^1.6.1", - "node-sass": "^4.9.0", - "sass-loader": "^6.0.7", - "style-loader": "^0.18.2", - "webpack": "^3.12.0", - "webpack-dev-server": "^2.11.2" + "bulma": "^0.9.3", + "css-loader": "^6.4.0", + "remotedev": "^0.2.9", + "sass-loader": "^12.1.0", + "style-loader": "^3.3.0", + "tslib": "^2.3.1", + "webpack-dev-server": "^4.3.1" } } diff --git a/src/web/ui/src/State.fs b/src/web/ui/src/State.fs index b08778c92..dadda49cc 100644 --- a/src/web/ui/src/State.fs +++ b/src/web/ui/src/State.fs @@ -8,8 +8,8 @@ open Global open Types let init () = - let model,cmd = Login.init() - PreLogin model, Cmd.map LoginMsg cmd + let model,cmd = Login.init() + PreLogin model, Cmd.map LoginMsg cmd let updateLoggedIn msg model = match msg, model.page with diff --git a/src/web/ui/webpack.config.js b/src/web/ui/webpack.config.js index 4324f7004..3ab11177c 100644 --- a/src/web/ui/webpack.config.js +++ b/src/web/ui/webpack.config.js @@ -1,24 +1,34 @@ var path = require("path"); var webpack = require("webpack"); var fableUtils = require("fable-utils"); -var UglifyJsPlugin = require("uglifyjs-webpack-plugin") +var mod = require("@babel/preset-env") +// var UglifyJsPlugin = require("uglifyjs-webpack-plugin") function resolve(filePath) { return path.join(__dirname, filePath) } -var babelOptions = fableUtils.resolveBabelOptions({ - presets: [["es2015", { "modules": false }]], - plugins: [["transform-runtime", { - "helpers": true, +var babelOptions = { + presets: ["@babel/preset-env"], + // "presets": [ + // "@babel/preset-env", "@babel/preset-react" + // ], + plugins: [ + [ + "@babel/plugin-transform-runtime", + { + helpers: true, // We don't need the polyfills as we're already calling // cdn.polyfill.io/v2/polyfill.js in index.html - "polyfill": false, - "regenerator": false - }]] -}); + polyfill: false, + regenerator: false, + }, + ], + ], +}; var isProduction = process.argv.indexOf("-p") >= 0; +process.env.NODE_ENV = isProduction ? 'production' : 'development' console.log("Bundling for " + (isProduction ? "production" : "development") + "..."); module.exports = env => { @@ -73,8 +83,11 @@ module.exports = env => { } ] }, - plugins: isProduction ? [new UglifyJsPlugin()] : [ - new webpack.HotModuleReplacementPlugin(), - new webpack.NamedModulesPlugin() + // plugins: isProduction ? [new UglifyJsPlugin()] : [ + // new webpack.HotModuleReplacementPlugin(), + // new webpack.NamedModulesPlugin() + // ] + plugins: [ + new webpack.HotModuleReplacementPlugin() ] }}; From 09a5343daaea79c153a4393e3c6258b6d2385811 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Oct 2021 21:30:35 -0400 Subject: [PATCH 077/100] Fix fsharp indentation error in gen'd code --- src/lib/api/service_compiler/templates/fs/fable.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/api/service_compiler/templates/fs/fable.fs b/src/lib/api/service_compiler/templates/fs/fable.fs index 92f5b37e6..3d69b2794 100644 --- a/src/lib/api/service_compiler/templates/fs/fable.fs +++ b/src/lib/api/service_compiler/templates/fs/fable.fs @@ -26,7 +26,7 @@ type {{name}} = unit {{else}} [] type {{name}} = - { + { {{#each field}} {{#if type.isdict}} {{fsescape nAme}} : JSMap<{{type.fstype}}> @@ -99,4 +99,4 @@ module {{name}} = ) |> unbox -{{/each}} \ No newline at end of file +{{/each}} From 0c3b3e9aa62c4673c2972e5272d1e72b20efa5a1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 12:27:11 -0400 Subject: [PATCH 078/100] fix build: Comment out unused refs in websocketclient --- src/lib/io/websocket/IWebsocketListener.h | 1 + src/lib/io/websocket/WebsocketClient.cpp | 6 +++--- src/lib/io/websocket/WebsocketClient.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/io/websocket/IWebsocketListener.h b/src/lib/io/websocket/IWebsocketListener.h index d71d805fc..e1e9db31a 100644 --- a/src/lib/io/websocket/IWebsocketListener.h +++ b/src/lib/io/websocket/IWebsocketListener.h @@ -9,6 +9,7 @@ class WebsocketMessage; // Interface on which to receive data, status and timer events class IWebsocketListener { public: + virtual ~IWebsocketListener() {} // this is called after successful address resolution, connection and // handshake virtual void on_connection_established() = 0; diff --git a/src/lib/io/websocket/WebsocketClient.cpp b/src/lib/io/websocket/WebsocketClient.cpp index b8186d12a..8cb3f8388 100644 --- a/src/lib/io/websocket/WebsocketClient.cpp +++ b/src/lib/io/websocket/WebsocketClient.cpp @@ -47,7 +47,7 @@ namespace beast = boost::beast; // from namespace http_core = beast::http; // from namespace websocket_core = beast::websocket; // from namespace net = boost::asio; // from -namespace ssl = boost::asio::ssl; // from +namespace ssl = boost::asio::ssl; // from using tcp = boost::asio::ip::tcp; // from namespace bts::io::websocket { @@ -474,8 +474,8 @@ class WebsocketSSLClientInternal beast::get_lowest_layer(_ws).expires_never(); // Set suggested timeout settings for the websocket - _ws.set_option( - websocket_core::stream_base::timeout::suggested(beast::role_type::client)); + _ws.set_option(websocket_core::stream_base::timeout::suggested( + beast::role_type::client)); // Set a decorator to change the User-Agent of the handshake _ws.set_option(websocket_core::stream_base::decorator( diff --git a/src/lib/io/websocket/WebsocketClient.h b/src/lib/io/websocket/WebsocketClient.h index 1185d4718..d43734a5c 100644 --- a/src/lib/io/websocket/WebsocketClient.h +++ b/src/lib/io/websocket/WebsocketClient.h @@ -33,7 +33,7 @@ class WebsocketClient : public IWebsocketListener, void on_data(WebsocketMessage &msg) override; void on_timer() override; void on_connection_closed(bool gracefully) override; - virtual ~WebsocketClient(); + ~WebsocketClient() override; }; } // namespace bts::io::websocket From 5a71cb4ac63d0bd587a861741769c8909b010acc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 13:46:40 -0400 Subject: [PATCH 079/100] Add john's vscode files --- dev/john/vscode/c_cpp_properties.json | 137 +++++++ dev/john/vscode/launch.json | 513 ++++++++++++++++++++++++++ dev/john/vscode/settings.json | 49 +++ dev/john/vscode/tasks.json | 41 ++ 4 files changed, 740 insertions(+) create mode 100644 dev/john/vscode/c_cpp_properties.json create mode 100644 dev/john/vscode/launch.json create mode 100644 dev/john/vscode/settings.json create mode 100644 dev/john/vscode/tasks.json diff --git a/dev/john/vscode/c_cpp_properties.json b/dev/john/vscode/c_cpp_properties.json new file mode 100644 index 000000000..58191fe38 --- /dev/null +++ b/dev/john/vscode/c_cpp_properties.json @@ -0,0 +1,137 @@ +{ + "configurations": [ + { + "name": "Linux (clang)", + "includePath": [ + "/usr/include", + "/usr/local/include", + "${workspaceRoot}/src", + "${workspaceRoot}/src/server/sparkd/cmds/spartan", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/build/clang/debug/src" + ], + "defines": [], + "intelliSenseMode": "clang-x64", + "browse": { + "path": [ + "/usr/include", + "/usr/local/include", + "${workspaceRoot}/src", + "${workspaceRoot}/src/server/sparkd/cmds/spartan", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/build/clang/debug/src" + ], + "limitSymbolsToIncludedHeaders": true, + "databaseFilename": "" + }, + "cStandard": "c11", + "cppStandard": "c++17", + "compileCommands": "${workspaceFolder}/build/clang/debug/compile_commands.json" + }, + { + "name": "Linux (gcc)", + "includePath": [ + "/usr/include", + "/usr/local/include", + "${workspaceRoot}/src", + "${workspaceRoot}/src/server/sparkd/cmds/spartan", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/build/gcc/debug/src" + ], + "defines": [], + "intelliSenseMode": "clang-x64", + "browse": { + "path": [ + "/usr/include", + "/usr/local/include", + "${workspaceRoot}/src", + "${workspaceRoot}/src/server/sparkd/cmds/spartan", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/build/gcc/debug/src" + ], + "limitSymbolsToIncludedHeaders": true, + "databaseFilename": "" + }, + "cStandard": "c11", + "cppStandard": "c++17", + "compileCommands": "${workspaceFolder}/build/gcc/debug/compile_commands.json" + }, + { + "name": "Windows", + "intelliSenseMode": "clang-x64", + "includePath": [ + "${workspaceRoot}/src", + "${workspaceRoot}/build/src", + "${workspaceRoot}/build/ninja_debug/src", + "${workspaceRoot}/externals/windows/include", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", + "${workspaceRoot}/externals/windows/vscode/usr/local/include", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", + "${workspaceRoot}/externals/windows/vscode/usr/include" + ], + "defines": [ + "__linux__", + "__x86_64__" + ], + "browse": { + "path": [ + "${workspaceRoot}/src", + "${workspaceRoot}/build/src", + "${workspaceRoot}/build/ninja_debug/src", + "${workspaceRoot}/externals/windows/include", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", + "${workspaceRoot}/externals/windows/vscode/usr/local/include", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", + "${workspaceRoot}/externals/windows/vscode/usr/include/*" + ], + "limitSymbolsToIncludedHeaders": true, + "databaseFilename": "" + }, + "cStandard": "c11", + "cppStandard": "c++17" + }, + { + "name": "WindowsQuick", + "intelliSenseMode": "clang-x64", + "includePath": [ + "${workspaceRoot}/src", + "${workspaceRoot}/build/src", + "${workspaceRoot}/build/gcc/debug/src", + "${workspaceRoot}/externals/windows/include", + "${workspaceRoot}/externals/linux/include", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6", + "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include", + "${workspaceRoot}/externals/windows/vscode/usr/local/include", + "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", + "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu", + "${workspaceRoot}/externals/windows/vscode/usr/include" + ], + "defines": [ + "__linux__", + "__x86_64__" + ], + "browse": { + "path": [ + "${workspaceRoot}/src" + ], + "limitSymbolsToIncludedHeaders": true, + "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db" + }, + "cStandard": "c11", + "cppStandard": "c++17" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/dev/john/vscode/launch.json b/dev/john/vscode/launch.json new file mode 100644 index 000000000..c61bb1e8a --- /dev/null +++ b/dev/john/vscode/launch.json @@ -0,0 +1,513 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Spark Local", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceRoot}/build/gcc/debug/server/sparkd", + "args": [ + "run", + "test", + "-a", + "OutrightVanillaOrder" + ], + "stopAtEntry": false, + "cwd": "${workspaceRoot}/build/gcc/debug/server/", + "environment": [ + { + "name": "TZ", + "value": "America/Chicago" + } + ], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, + { + "name": "SparkVM Launch", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "-a", + "[ilink3]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + }, + { + "description": "Skip STL", + "text": "skip -gfi /usr/include/c++/7/bits/*.h", + "ignoreFailures": true + }, + { + "description": "LD LIBRARY", + "text": "set env LD_LIBRARY_PATH=.", + "ignoreFailures": false + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceRoot}/build/gcc/debug/server/sparkd/sparkd", + "args": [ + "run" + ], + "stopAtEntry": false, + "cwd": "${workspaceRoot}/build/gcc/debug/src/server/sparkd", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, + { + "name": "Client Launch", + "type": "clr", + "request": "launch", + "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe", + "args": [], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true, + "requireExactSource": false + }, + { + "name": "SDK Launch", + "type": "clr", + "request": "launch", + "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe", + "args": [ + "md", + "GLBX", + "Future", + "CL", + "CLZ9", + "--user=bts", + "--pass=" + ], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true, + "requireExactSource": false + }, + { + "name": "Excel Launch", + "type": "clr", + "request": "launch", + "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE", + "args": [ + "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll" + ], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true, + "requireExactSource": false + }, + { + "name": "Client Tests", + "type": "clr", + "request": "launch", + "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe", + "args": [ + "test", + "ApiUpdateTests" + ], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true, + "requireExactSource": false + }, + { + "name": "Client Attach", + "type": "clr", + "request": "attach", + "processId": "${command:pickProcess}" + }, + { + "name": "Spreader Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "[spreader]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "MD Synthetic Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "[md][synthetic]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Spartan Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "[spartan_md]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Matcher Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "[matcher]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Admin Service Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", + "args": [ + "test", + "[admin_service]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Limiter Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", + "args": [ + "test", + "[limiter]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "MD Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/gcc/debug/server/sparkd", + "args": [ + "test", + "[algo]" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Skip STL", + "text": "skip -gfi /usr/include/c++/7/bits/*.h", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "SparkVM attach", + "type": "cppdbg", + "request": "attach", + "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd", + "processId": "${command:pickRemoteProcess}", + "MIMode": "gdb", + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Python", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "python": "${command:python.interpreterPath}", + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ + "DEBUG" + ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": ".NET Core Remote Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickRemoteProcess}", + "pipeTransport": { + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/home/bts/vsdbg/vsdbg", + "pipeCwd": "${workspaceRoot}", + "quoteArgs": true + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + }, + "justMyCode": true + }, + { + "name": ".NET Core Remote Launch", + "type": "coreclr", + "request": "launch", + "program": "/usr/bin/dotnet", + "args": [ + "sparkcmd.dll", + "test", + "test_join_create_and_takeout_market" + ], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/gcc/debug/server", + "pipeTransport": { + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": [ + "bts@sparkvm" + ], + "debuggerPath": "/home/bts/vsdbg/vsdbg", + "pipeCwd": "${workspaceRoot}", + "quoteArgs": true + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + }, + "justMyCode": false + }, + ] +} diff --git a/dev/john/vscode/settings.json b/dev/john/vscode/settings.json new file mode 100644 index 000000000..b01e5f526 --- /dev/null +++ b/dev/john/vscode/settings.json @@ -0,0 +1,49 @@ +{ + "files.associations": { + "utility": "cpp", + "initializer_list": "cpp", + "list": "cpp", + "type_traits": "cpp", + "vector": "cpp", + "xhash": "cpp", + "xstring": "cpp", + "system_error": "cpp", + "array": "cpp", + "string_view": "cpp", + "xutility": "cpp", + "*.ipp": "cpp", + "tuple": "cpp" + }, + "cmake.configureOnOpen": false, + "cmake.cmakePath": "/usr/bin/cmake", + "cmake.defaultVariants": { + "buildType": { + "default": "debug", + "description": "The build type.", + "choices": { + "debug": { + "short": "Debug", + "long": "Disable optimizations - include debug information.", + "buildType": "debug" + }, + "release": { + "short": "Release", + "long": "Optimize for speed - exclude debug information.", + "buildType": "release" + }, + "minsize": { + "short": "MinSizeRel", + "long": "Optimize for smallest binary size - exclude debug information.", + "buildType": "min_size_rel" + }, + "reldeb": { + "short": "RelWithDebInfo", + "long": "Optimize for speed - include debug information.", + "buildType": "rel_with_deb_info" + } + } + } + }, + "cmake.buildDirectory": "${workspaceFolder}/build/${buildKit}/${buildType}", + "C_Cpp.intelliSenseEngine": "Disabled" +} diff --git a/dev/john/vscode/tasks.json b/dev/john/vscode/tasks.json new file mode 100644 index 000000000..9269ed04d --- /dev/null +++ b/dev/john/vscode/tasks.json @@ -0,0 +1,41 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Touch CMakeLists.txt", + "type": "process", + "promptOnClose": false, + "isBackground": true, + "command": "touch", + "args": ["${workspaceRoot}/CMakeLists.txt"], + "problemMatcher": [], + "presentation": { + "echo": false, + "revealProblems": "onProblem", + "reveal": "silent", + "focus": false, + "panel": "shared", + "showReuseMessage": false, + "clear": true + } + } + ], + "inputs": [ + { + "id": "build_configuration", + "type": "pickString", + "default": "debug", + "description": "Configuration:", + "options": ["debug", "release"] + }, + { + "id": "compiler", + "type": "pickString", + "default": "gcc", + "description": "Compiler", + "options": ["clang", "gcc"] + } + ] +} From 47cef95b119239383881d5df8c021428cac3ec17 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 13:48:10 -0400 Subject: [PATCH 080/100] build (web): Upgrade node packages --- src/web/ui/package-lock.json | 287 ++++++++++++++++++++++++++++++++--- src/web/ui/package.json | 5 +- src/web/ui/webpack.config.js | 1 - 3 files changed, 272 insertions(+), 21 deletions(-) diff --git a/src/web/ui/package-lock.json b/src/web/ui/package-lock.json index 76e2f0616..c571efc1e 100644 --- a/src/web/ui/package-lock.json +++ b/src/web/ui/package-lock.json @@ -5,9 +5,12 @@ "packages": { "": { "dependencies": { + "@babel/plugin-transform-runtime": "^7.15.8", "@babel/preset-env": "^7.15.8", + "babel-loader": "^8.2.2", "babel-preset-env": "^1.7.0", "babel-runtime": "^6.26.0", + "fable-core": "^0.7.30", "fable-loader": "^2.1.9", "fable-utils": "^1.2.0", "loglevel": "^1.7.1", @@ -15,13 +18,13 @@ "protobufjs": "^6.11.2", "react": "^16.14.0", "react-data-grid-addons": "^7.0.0-alpha.24", + "ts2fable": "^0.7.1", "upgrade": "^1.1.0", "webpack": "^5.58.1", "webpack-cli": "^4.9.0" }, "devDependencies": { "babel-core": "^6.26.3", - "babel-plugin-transform-runtime": "^6.23.0", "bulma": "^0.9.3", "css-loader": "^6.4.0", "remotedev": "^0.2.9", @@ -1250,6 +1253,25 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-runtime": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz", + "integrity": "sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==", + "dependencies": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.5", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-transform-shorthand-properties": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", @@ -2317,6 +2339,41 @@ "babel-template": "^6.24.1" } }, + "node_modules/babel-loader": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", + "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==", + "dependencies": { + "find-cache-dir": "^3.3.1", + "loader-utils": "^1.4.0", + "make-dir": "^3.1.0", + "schema-utils": "^2.6.5" + }, + "engines": { + "node": ">= 8.9" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "webpack": ">=2" + } + }, + "node_modules/babel-loader/node_modules/schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dependencies": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 8.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/babel-messages": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", @@ -2632,15 +2689,6 @@ "regenerator-transform": "^0.10.0" } }, - "node_modules/babel-plugin-transform-runtime": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", - "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", - "dev": true, - "dependencies": { - "babel-runtime": "^6.22.0" - } - }, "node_modules/babel-plugin-transform-strict-mode": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", @@ -2832,6 +2880,14 @@ "tweetnacl": "^0.14.3" } }, + "node_modules/big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "engines": { + "node": "*" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -3214,6 +3270,11 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + }, "node_modules/component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -3686,6 +3747,14 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "engines": { + "node": ">= 4" + } + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -3948,6 +4017,11 @@ "integrity": "sha512-eEd+ue0CWhLpZBXqkIm4uWTGPfX8Q14RkCwSrbO0zPfB9hHW8IylipJ4YVfCZKd27sHDTpGOBwW8JMHqMBrXPQ==", "peer": true }, + "node_modules/fable-core": { + "version": "0.7.30", + "resolved": "https://registry.npmjs.org/fable-core/-/fable-core-0.7.30.tgz", + "integrity": "sha1-8F4nsmrcHyxtt+b+NG8KDptLe2g=" + }, "node_modules/fable-loader": { "version": "2.1.9", "resolved": "https://registry.npmjs.org/fable-loader/-/fable-loader-2.1.9.tgz", @@ -4066,6 +4140,22 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -5149,6 +5239,30 @@ "node": ">=6.11.5" } }, + "node_modules/loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/loader-utils/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -5214,6 +5328,20 @@ "node": ">=10" } }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/map-obj": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", @@ -7633,6 +7761,17 @@ "glob": "^7.1.2" } }, + "node_modules/ts2fable": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ts2fable/-/ts2fable-0.7.1.tgz", + "integrity": "sha512-4CiCzuWF9ueSLlr+OozcwaehhCno1frnPZbHM7Jd4EfKzSlHk3hyjrhFKttnXQ2Sx0tGe8C4xwjDhnZaOSqFkw==", + "dependencies": { + "typescript": "3.7.4" + }, + "bin": { + "ts2fable": "dist/ts2fable.js" + } + }, "node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -7679,6 +7818,18 @@ "node": ">= 0.6" } }, + "node_modules/typescript": { + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -9155,6 +9306,19 @@ "@babel/helper-plugin-utils": "^7.14.5" } }, + "@babel/plugin-transform-runtime": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz", + "integrity": "sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==", + "requires": { + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.5", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "semver": "^6.3.0" + } + }, "@babel/plugin-transform-shorthand-properties": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", @@ -10074,6 +10238,29 @@ "babel-template": "^6.24.1" } }, + "babel-loader": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", + "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==", + "requires": { + "find-cache-dir": "^3.3.1", + "loader-utils": "^1.4.0", + "make-dir": "^3.1.0", + "schema-utils": "^2.6.5" + }, + "dependencies": { + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "babel-messages": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", @@ -10380,15 +10567,6 @@ "regenerator-transform": "^0.10.0" } }, - "babel-plugin-transform-runtime": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", - "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", @@ -10571,6 +10749,11 @@ "tweetnacl": "^0.14.3" } }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -10869,6 +11052,11 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + }, "component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -11246,6 +11434,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -11455,6 +11648,11 @@ "integrity": "sha512-eEd+ue0CWhLpZBXqkIm4uWTGPfX8Q14RkCwSrbO0zPfB9hHW8IylipJ4YVfCZKd27sHDTpGOBwW8JMHqMBrXPQ==", "peer": true }, + "fable-core": { + "version": "0.7.30", + "resolved": "https://registry.npmjs.org/fable-core/-/fable-core-0.7.30.tgz", + "integrity": "sha1-8F4nsmrcHyxtt+b+NG8KDptLe2g=" + }, "fable-loader": { "version": "2.1.9", "resolved": "https://registry.npmjs.org/fable-loader/-/fable-loader-2.1.9.tgz", @@ -11555,6 +11753,16 @@ } } }, + "find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "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", @@ -12349,6 +12557,26 @@ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } + } + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -12398,6 +12626,14 @@ "yallist": "^4.0.0" } }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + } + }, "map-obj": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", @@ -14225,6 +14461,14 @@ "glob": "^7.1.2" } }, + "ts2fable": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ts2fable/-/ts2fable-0.7.1.tgz", + "integrity": "sha512-4CiCzuWF9ueSLlr+OozcwaehhCno1frnPZbHM7Jd4EfKzSlHk3hyjrhFKttnXQ2Sx0tGe8C4xwjDhnZaOSqFkw==", + "requires": { + "typescript": "3.7.4" + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -14259,6 +14503,11 @@ "mime-types": "~2.1.24" } }, + "typescript": { + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==" + }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", diff --git a/src/web/ui/package.json b/src/web/ui/package.json index c9c6492ee..79322966b 100644 --- a/src/web/ui/package.json +++ b/src/web/ui/package.json @@ -1,8 +1,11 @@ { "dependencies": { + "@babel/plugin-transform-runtime": "^7.15.8", "@babel/preset-env": "^7.15.8", + "babel-loader": "^8.2.2", "babel-preset-env": "^1.7.0", "babel-runtime": "^6.26.0", + "fable-core": "^0.7.30", "fable-loader": "^2.1.9", "fable-utils": "^1.2.0", "loglevel": "^1.7.1", @@ -10,13 +13,13 @@ "protobufjs": "^6.11.2", "react": "^16.14.0", "react-data-grid-addons": "^7.0.0-alpha.24", + "ts2fable": "^0.7.1", "upgrade": "^1.1.0", "webpack": "^5.58.1", "webpack-cli": "^4.9.0" }, "devDependencies": { "babel-core": "^6.26.3", - "babel-plugin-transform-runtime": "^6.23.0", "bulma": "^0.9.3", "css-loader": "^6.4.0", "remotedev": "^0.2.9", diff --git a/src/web/ui/webpack.config.js b/src/web/ui/webpack.config.js index 3ab11177c..3ebbc0a38 100644 --- a/src/web/ui/webpack.config.js +++ b/src/web/ui/webpack.config.js @@ -20,7 +20,6 @@ var babelOptions = { helpers: true, // We don't need the polyfills as we're already calling // cdn.polyfill.io/v2/polyfill.js in index.html - polyfill: false, regenerator: false, }, ], From 263c0503dc000d0c6a7133e7a7b6d94dd621c8c8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 14:16:31 -0400 Subject: [PATCH 081/100] Don't link libiml (it's an artifact from spartan) --- src/lib/CMakeLists.txt | 1 - src/server/sparkd/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a5e83db48..47117d545 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -138,7 +138,6 @@ else () Common++ ssh2 -lrt - -liml -ldl -lpcap -static-libgcc diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 5eefd5573..ca20207d2 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -39,7 +39,6 @@ target_link_libraries( sparkd Pcap++ lttng-ust -lpcap - -liml -static-libgcc -static-libstdc++ -pthread) From eb86db3ef677d41ecb8e678f70771ad3cd175072 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 15:22:47 -0400 Subject: [PATCH 082/100] build (web): Symlink new node_module dirs in setup_builds --- tools/setup_builds.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/setup_builds.sh b/tools/setup_builds.sh index 5113a8592..2de373650 100755 --- a/tools/setup_builds.sh +++ b/tools/setup_builds.sh @@ -46,13 +46,12 @@ function ensure_externals_linked() { if [[ -z "$externals_linked" ]]; then assert_dir $repot_root assert_dir $externals_root - ext_node_modules=$externals_root/npm/node_modules echo "Initialize sym links to dirs in externals" set -x rm -f $repot_root/src/web/ui/node_modules rm -f $repot_root/src/web/api/node_modules - ln -s $ext_node_modules $repot_root/src/web/ui/node_modules - ln -s $ext_node_modules $repot_root/src/web/api/node_modules + ln -s $externals_root/npm/web/ui/node_modules $repot_root/src/web/ui/node_modules + ln -s $externals_root/npm/web/api/node_modules $repot_root/src/web/api/node_modules set +x externals_linked=1 fi From 0f43de79e1f1fcb84edda3b5e740caa49f6057ab Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 15:27:02 -0400 Subject: [PATCH 083/100] Update externals to use new json.hpp and node_modules --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 6b71f4149..5d2136fae 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 6b71f4149cd4f28632d7f9e80a4926a5698b10e4 +Subproject commit 5d2136faeeb098516471fcfcc16e6924efc1a88f From 23d645473cd1cea96f30a13ce4978fc2c5bc161a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Oct 2021 15:28:23 -0400 Subject: [PATCH 084/100] Update docker/linux to upgraded_18.04 branch --- docker/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux b/docker/linux index 78ed1605a..f1d398ba8 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit 78ed1605aae419887ef5516facfb1a6c92391433 +Subproject commit f1d398ba8182f78c4caf21e9fc47e11d3cb5a0f6 From c2a783ce9691b75e6a3ecb03e2d8fd423c3cf484 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 13 Oct 2021 09:32:18 -0400 Subject: [PATCH 085/100] refactor: Use protos in new Security class --- src/lib/domain/Security.h | 20 ++++++++++++++------ src/lib/domain/SecurityCommon.h | 11 ++++++----- src/lib/domain/SecurityID.h | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/lib/domain/Security.h b/src/lib/domain/Security.h index 7557ca5c9..faf09f871 100644 --- a/src/lib/domain/Security.h +++ b/src/lib/domain/Security.h @@ -15,19 +15,27 @@ class Security { std::variant security; - SecurityType security_type() const; + api::domain::SecurityType security_type() const; }; ////////////////////////////////////////////////// // Definition ////////////////////////////////////////////////// -inline SecurityType Security::security_type() const { +inline api::domain::SecurityType Security::security_type() const { return std::visit( - overloaded{[](const IndexSecurity &) { return SecurityType::INDEX; }, - [](const FutureSecurity &) { return SecurityType::FUTURE; }, - [](const SpreadSecurity &) { return SecurityType::SPREAD; }, - [](const OptionSecurity &) { return SecurityType::OPTION; }}, + overloaded{[](const IndexSecurity &) { + return api::domain::SecurityType::INDEX; + }, + [](const FutureSecurity &) { + return api::domain::SecurityType::FUTURE; + }, + [](const SpreadSecurity &) { + return api::domain::SecurityType::SPREAD; + }, + [](const OptionSecurity &) { + return api::domain::SecurityType::OPTION; + }}, security); } diff --git a/src/lib/domain/SecurityCommon.h b/src/lib/domain/SecurityCommon.h index f1501ddc1..6d133d752 100644 --- a/src/lib/domain/SecurityCommon.h +++ b/src/lib/domain/SecurityCommon.h @@ -2,8 +2,9 @@ #include "Currency.h" #include "Price.h" #include "SecurityID.h" -#include "SecurityType.h" -#include "Venue.h" +#include "lib/api/domain/Currency.pb.h" +#include "lib/api/domain/SecurityType.pb.h" +#include "lib/api/domain/Venue.pb.h" #include namespace bts::domain { @@ -11,10 +12,10 @@ namespace bts::domain { // All the security common params, ie regardless of Future, Spot, Spread etc class SecurityCommon { public: - Venue venue; + api::domain::Venue venue; SecurityID security_id{}; - SecurityType security_type; - Currency currency; + api::domain::SecurityType security_type; + api::domain::Currency currency; double display_factor{}; double cash_per_point{}; std::string symbol; diff --git a/src/lib/domain/SecurityID.h b/src/lib/domain/SecurityID.h index cae1f47ea..da6ceaf9e 100644 --- a/src/lib/domain/SecurityID.h +++ b/src/lib/domain/SecurityID.h @@ -4,6 +4,6 @@ namespace bts::domain { -using SecurityID = utils::ValueWrapper; +using SecurityID = utils::ValueWrapper; } // namespace bts::domain From 644613749d9f84a375d764fff43d4e4e2c597cbc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 6 Nov 2021 10:59:04 -0500 Subject: [PATCH 086/100] style (dev/john): Clean up Dockerfile * Indent command chains --- dev/john/Dockerfile | 97 +++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 614b91d6c..14313c8da 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -1,14 +1,14 @@ -FROM spark-crypto +FROM spark-crypto_18.04 # RUN echo "BT5u53r" | sudo -S apt-get install -y \ RUN apt-get install -y \ -htop \ -locales \ -source-highlight \ -powerline \ -powerline-gitstatus \ -fonts-powerline \ -fish + htop \ + locales \ + source-highlight \ + powerline \ + powerline-gitstatus \ + fonts-powerline \ + fish # Hide these in the .docker directory to avoid conflicts with existing repos on @@ -18,75 +18,86 @@ ARG repo_root="/home/john/Documents/repos/.docker" # Create dirs for public/private repos USER john -RUN mkdir -p $repo_root/public && \ -mkdir -p $repo_root/private +RUN \ + mkdir -p $repo_root/public \ + && mkdir -p $repo_root/private ## Get latest fish (build from source) # 1) get build deps USER root RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common -RUN apt-add-repository ppa:fish-shell/release-3 && \ -sed -i "s/^# deb/deb/g" /etc/apt/sources.list +RUN \ + apt-add-repository ppa:fish-shell/release-3 \ + && sed -i "s/^# deb/deb/g" /etc/apt/sources.list RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get build-dep -y fish # 2) Clone repo USER john -RUN cd $repo_root/public && \ -git clone https://github.com/fish-shell/fish-shell.git +RUN \ + cd $repo_root/public \ + && git clone https://github.com/fish-shell/fish-shell.git -RUN cd $repo_root/public/fish-shell && \ -mkdir build && \ -cd build && \ -cmake -DCMAKE_BUILD_TYPE=Release .. && \ -cmake --build . +RUN \ + cd $repo_root/public/fish-shell \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release .. \ + && cmake --build . # Switch to root, rather than running inline w/ sudo cmd, to avoid having to # enter a password USER root -RUN cd $repo_root/public/fish-shell/build && make install +RUN \ + cd $repo_root/public/fish-shell/build \ + && make install USER john ## Get oh-my-fish -RUN cd $repo_root/public && \ -git clone https://github.com/oh-my-fish/oh-my-fish.git +RUN \ + cd $repo_root/public \ + && git clone https://github.com/oh-my-fish/oh-my-fish.git -RUN cd $repo_root/public/oh-my-fish && \ -./bin/install --noninteractive --yes +RUN \ + cd $repo_root/public/oh-my-fish \ + && ./bin/install --noninteractive --yes ## Get my fish config -RUN cd $repo_root/private && \ -git clone https://github.com/johncolvin-og/myfishconfig +RUN \ + cd $repo_root/private \ + && git clone https://github.com/johncolvin-og/myfishconfig -RUN cd $repo_root/private/myfishconfig && \ -cp src/config.fish /home/john/.config/fish/ && \ -cp src/aliases.fish /home/john/.config/fish/ && \ -cp -r src/functions /home/john/.config/fish/ && \ -cp -r src/themes/johncolvin /home/john/.local/share/omf/themes/ && \ -fish --command "omf theme johncolvin" +RUN \ + cd $repo_root/private/myfishconfig \ + && cp src/config.fish /home/john/.config/fish/ \ + && cp src/aliases.fish /home/john/.config/fish/ \ + && cp -r src/functions /home/john/.config/fish/ \ + && cp -r src/themes/johncolvin /home/john/.local/share/omf/themes/ \ + && fish --command "omf theme johncolvin" ## Get my bash config (back up existing) -RUN -mkdir -p /home/john/.docker_orig_rc && \ -cp /home/john/*.rc /home/john/.docker_orig_rc/ && \ -cp /home/john/.profile /home/john/.docker_orig_rc/ && \ -cd $repo_root/private && \ -git clone https://github.com/johncolvin-og/mybashconfig && \ -cd mybashconfig && \ -cp src/* /home/john/ +RUN \ + mkdir -p /home/john/.docker_orig_rc \ + && cp /home/john/*.rc /home/john/.docker_orig_rc/ \ + && cp /home/john/.profile /home/john/.docker_orig_rc/ \ + && cd $repo_root/private \ + && git clone https://github.com/johncolvin-og/mybashconfig \ + && cd mybashconfig \ + && cp src/* /home/john/ # Get vim files/tools USER root -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ -apt-get install -y curl +RUN \ + DEBIAN_FRONTEND=noninteractive apt-get update \ + && apt-get install -y curl USER john -curl -fLo home/john/.vim/autoload/plug.vim --create-dirs \ +RUN curl -fLo home/john/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim From 84221fe0d856fed2cb547fe3d9b35c2167e18983 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:53 -0500 Subject: [PATCH 087/100] cli: Add emumba deribit demo subcommand --- .gitmodules | 3 + src/server/sparkd/CMakeLists.txt | 14 + .../cmake_modules/rapidjsonConfig.cmake | 14 + src/server/sparkd/cmds/crypto/CryptoCmd.cpp | 2 + src/server/sparkd/cmds/crypto/DeribitDemo.cpp | 67 ++ src/server/sparkd/cmds/crypto/DeribitDemo.h | 17 + .../sparkd/cmds/crypto/DeribitDemoCmd.cpp | 26 + .../sparkd/cmds/crypto/DeribitDemoCmd.h | 17 + .../cmds/crypto/DeribitDemoConfiguration.cpp | 118 +++ .../cmds/crypto/DeribitDemoConfiguration.h | 21 + .../cmds/crypto/DeribitDemoListener.cpp | 904 ++++++++++++++++++ .../sparkd/cmds/crypto/DeribitDemoListener.h | 180 ++++ .../sparkd/cmds/crypto/RapidJsonReader.h | 109 +++ .../sparkd/cmds/crypto/UserInstrumentData.cpp | 8 + .../sparkd/cmds/crypto/UserInstrumentData.h | 19 + .../cmds/crypto/deribit_demo_config.json | 42 + 16 files changed, 1561 insertions(+) create mode 100644 src/server/sparkd/cmake_modules/rapidjsonConfig.cmake create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemo.cpp create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemo.h create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoCmd.h create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp create mode 100644 src/server/sparkd/cmds/crypto/DeribitDemoListener.h create mode 100644 src/server/sparkd/cmds/crypto/RapidJsonReader.h create mode 100644 src/server/sparkd/cmds/crypto/UserInstrumentData.cpp create mode 100644 src/server/sparkd/cmds/crypto/UserInstrumentData.h create mode 100644 src/server/sparkd/cmds/crypto/deribit_demo_config.json diff --git a/.gitmodules b/.gitmodules index e1458df02..b7c529c7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "docker/windows"] path = docker/windows url = git@bitbucket.org:bluetradesys/windows_docker.git +[submodule "src/deribit-crypto-connector-demo-application"] + path = src/deribit-crypto-connector-demo-application + url = git@gitlab.com:cryptoexchanges1/deribit-crypto-connector-demo-application.git diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index ca20207d2..6d21d7c04 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -18,14 +18,25 @@ target_include_directories( sparkd PUBLIC ${CMAKE_SOURCE_DIR}/src/server/sparkd/cmds/spartan ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/src/server/sparkd/cmds/spartan + ${emumba-deribit-connector-library_INCLUDE_DIRS} ) set_source_files_properties(exchange_sim/ExchangeSim.cpp PROPERTIES COMPILE_FLAGS --std=c++14) set_source_files_properties(exchange_sim/ExchangeSimApplication.cpp PROPERTIES COMPILE_FLAGS --std=c++14) +find_package(PkgConfig REQUIRED) +pkg_check_modules(emumba-deribit-connector-library REQUIRED emumba-deribit-connector) + +# This dir contains rapidjsonConfig.cmake +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) +find_package(rapidjson REQUIRED) +target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${rapidjson_INCLUDE_DIR}) +add_dependencies(${PROJECT_NAME} rapidjson_project) + # linking target_link_libraries( sparkd libspark + ${emumba-deribit-connector-library_LIBRARIES} ssl cryptopp tbb @@ -39,6 +50,9 @@ target_link_libraries( sparkd Pcap++ lttng-ust -lpcap + -lemumba-deribit-connector + -lemumba-websocket-library + -lspdlog -static-libgcc -static-libstdc++ -pthread) diff --git a/src/server/sparkd/cmake_modules/rapidjsonConfig.cmake b/src/server/sparkd/cmake_modules/rapidjsonConfig.cmake new file mode 100644 index 000000000..507393b46 --- /dev/null +++ b/src/server/sparkd/cmake_modules/rapidjsonConfig.cmake @@ -0,0 +1,14 @@ +include(ExternalProject) + +if(NOT TARGET rapidjson_project) +ExternalProject_Add(rapidjson_project + URL https://github.com/Tencent/rapidjson/archive/v1.1.0.zip + PREFIX ${CMAKE_CURRENT_BINARY_DIR}/rapidjson + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" +) +endif() + +ExternalProject_Get_Property(rapidjson_project SOURCE_DIR) +set(rapidjson_INCLUDE_DIR ${SOURCE_DIR}/include) \ No newline at end of file diff --git a/src/server/sparkd/cmds/crypto/CryptoCmd.cpp b/src/server/sparkd/cmds/crypto/CryptoCmd.cpp index cf0594e12..6827374b2 100644 --- a/src/server/sparkd/cmds/crypto/CryptoCmd.cpp +++ b/src/server/sparkd/cmds/crypto/CryptoCmd.cpp @@ -1,5 +1,6 @@ #include "CryptoCmd.h" #include "BinanceDemoCmd.h" +#include "DeribitDemoCmd.h" #include namespace bts::cmds { @@ -12,6 +13,7 @@ CryptoCmd::CryptoCmd() : CLI::App("Execute commands for the new crypto system", "crypto"), args_(std::make_unique()) { add_subcommand(std::make_shared()); + add_subcommand(std::make_shared()); } CryptoCmd::~CryptoCmd() = default; diff --git a/src/server/sparkd/cmds/crypto/DeribitDemo.cpp b/src/server/sparkd/cmds/crypto/DeribitDemo.cpp new file mode 100644 index 000000000..e91211a43 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemo.cpp @@ -0,0 +1,67 @@ +#include "DeribitDemo.h" +#include "DeribitDemoConfiguration.h" +#include "server/sparkd/cmds/crypto/DeribitDemoListener.h" +#include "server/sparkd/cmds/spartan/utils/FileUtils.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace bts::cmds { + +static void signal_handler(int signal_number) { + switch (signal_number) { + case SIGUSR1: { + std::cout << "SIGUSR1 Received\n"; + emumba::deribit_connector::dump_books(); + } break; + } +} + +struct DeribitDemo::PImpl { + std::optional conf; + std::shared_ptr logger; + std::optional listener; + std::shared_ptr + deribit_conn; // Shared pointer of deribit connector. This pointer can + // be used to configure/run the connector. + std::shared_ptr + trading_session_interface; // Shared pointer of trading session + // interface. This pointer can be use to send + // order entry messages. +}; + +DeribitDemo::DeribitDemo(const std::string &config_path) + : me_(std::make_unique()) { + // setup spdlog + me_->logger = spdlog::stdout_color_mt("demo_logger"); + spdlog::set_default_logger(me_->logger); + spdlog::set_level(spdlog::level::trace); + + // parse config + me_->conf = DeribitDemoConfiguration::read_file(config_path); + if (!me_->conf.has_value()) { + return; + } + auto &conf = *me_->conf; + + // connect to deribit + std::signal(SIGUSR1, signal_handler); + me_->deribit_conn = + std::make_shared( + conf.symbol_config_list, conf.trading_config, + conf.logging_configuration, conf.deribit_url, + &me_->listener.emplace()); + me_->trading_session_interface = + std::make_shared( + me_->deribit_conn->create_new_trading_session()); +} + +DeribitDemo::~DeribitDemo() = default; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemo.h b/src/server/sparkd/cmds/crypto/DeribitDemo.h new file mode 100644 index 000000000..7588d520c --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemo.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::cmds { + +class DeribitDemo { + public: + DeribitDemo(const std::string &config_path); + ~DeribitDemo(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp b/src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp new file mode 100644 index 000000000..b60145d29 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp @@ -0,0 +1,26 @@ +#include "DeribitDemoCmd.h" +#include "DeribitDemo.h" +#include "lib/config/config.h" +#include "lib/os/os.h" +#include +#include +#include + +namespace bts::cmds { + +struct DeribitDemoCmd::PImpl { + std::string config_path; + std::optional demo; +}; + +DeribitDemoCmd::DeribitDemoCmd() + : CLI::App("Display deribit live depth", "deribit-demo"), + me_(std::make_unique()) { + add_option("--config", me_->config_path, "Config path") + ->default_val(os::sparkdata_path("conf") + "deribit_demo_config.json"); + callback([this]() { me_->demo.emplace(me_->config_path); }); +} + +DeribitDemoCmd::~DeribitDemoCmd() = default; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoCmd.h b/src/server/sparkd/cmds/crypto/DeribitDemoCmd.h new file mode 100644 index 000000000..30006345b --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoCmd.h @@ -0,0 +1,17 @@ +#pragma once +#include +#include + +namespace bts::cmds { + +class DeribitDemoCmd : public CLI::App { + public: + DeribitDemoCmd(); + ~DeribitDemoCmd(); + + private: + struct PImpl; + std::unique_ptr me_; +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp new file mode 100644 index 000000000..5bcfeff64 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp @@ -0,0 +1,118 @@ +#include "DeribitDemoConfiguration.h" +#include "RapidJsonReader.h" +#include "lib/logging/logging.h" +#include "rapidjson/istreamwrapper.h" +#include +#include +#include +#include + +namespace bts::cmds { + +static constexpr const char *test_site() { + return "wss://test.deribit.com/ws/api/v2"; +} + +static emumba::deribit_connector::configuration::logging_config +read_app_logging(rapidjson::Document &doc) { + emumba::deribit_connector::configuration::logging_config lc; + if (!doc.HasMember("app_logging")) { + return lc; + } + auto &logging_in = doc["app_logging"]; + lc.severity = logging_in["severity"].GetString(); + lc.is_console_enabled = logging_in["console"].GetBool(); + lc.is_file_enabled = logging_in["file"].GetBool(); + if (logging_in.HasMember("queuesize")) { + lc.queue_size = logging_in["queuesize"].GetInt(); + } + return lc; +} + +static std::string read_url(rapidjson::Document &doc) { + if (!doc.HasMember("uri")) { + return test_site(); + } + std::string deribit_url = doc["uri"].GetString(); + if (deribit_url == "") { + return test_site(); + } + return deribit_url; +} + +static emumba::deribit_connector::configuration::trading_session_config +read_trading_session_config(typename rapidjson::Document &doc) { + emumba::deribit_connector::configuration::trading_session_config tsc; + auto &creds = doc["credentials"]; + tsc.client_name = creds["client_name"].GetString(); + tsc.client_id = creds["id"].GetString(); + tsc.secret_key = creds["secret_key"].GetString(); + tsc.heartbeat_interval = + doc["session"].GetObject()["heartbeat_interval"].GetInt(); + tsc.core = doc["core"].GetInt(); + return tsc; +} + +template +static void read_instruments( + Obj &obj, std::unordered_set &instruments) { + const char *instruments_field = "instruments"; + bts_assert(obj.HasMember(instruments_field)); + for (auto &instrument : obj[instruments_field].GetArray()) { + instruments.insert(instrument.GetString()); + } +} + +static std::list +read_symbol_config(rapidjson::Document &doc) { + using RJR = RapidJsonReader; + + std::list syms_out; + for (auto &sym_in : doc["symbol"].GetArray()) { + auto &sym = syms_out.emplace_back(); + sym.symbol_name = RJR::get_string(sym_in, "id"); + sym.interested_in_future = RJR::get_bool(sym_in, "interested_in_future"); + sym.interested_in_option = RJR::get_bool(sym_in, "interested_in_option"); + sym.currency_type = RJR::get_string(sym_in, "currency_type", "usd"); + + read_instruments(sym_in, sym.interested_instruments); + auto chan_in = sym_in["channel"].GetObject(); + + auto &subs = sym.interested_subscriptions; + subs.requests_limit = RJR::get_uint(sym_in, "requests_limit", 20u); + subs.book_depth = RJR::get_uint(sym_in, "book_depth", 5u); + subs.public_book = RJR::get_bool(chan_in, "PUBLIC_BOOK"); + subs.public_quote = RJR::get_bool(chan_in, "PUBLIC_QUOTE"); + subs.public_trade = RJR::get_bool(chan_in, "PUBLIC_TRADE"); + subs.public_ticker = RJR::get_bool(chan_in, "PUBLIC_TICKER"); + subs.public_markprice = RJR::get_bool(chan_in, "PUBLIC_MARKPRICE"); + subs.public_index = RJR::get_bool(chan_in, "PUBLIC_INDEX"); + subs.private_orders = RJR::get_bool(chan_in, "PRIVATE_ORDERS"); + subs.private_trades = RJR::get_bool(chan_in, "PRIVATE_TRADES"); + subs.private_portfolio = RJR::get_bool(chan_in, "PRIVATE_PORTFOLIO"); + subs.use_raw_interval = RJR::get_bool(sym_in, "raw_enable", true); + } + return syms_out; +} + +std::optional DeribitDemoConfiguration::read_file( + const std::string &config_path) { + + std::ifstream configFile(config_path); + rapidjson::IStreamWrapper isw{configFile}; + + rapidjson::Document doc{}; + if (doc.ParseStream(isw).HasParseError()) { + LOG(md, Error, "Error in parsing config"); + return std::nullopt; + } + + DeribitDemoConfiguration conf; + conf.logging_configuration = read_app_logging(doc); + conf.deribit_url = read_url(doc); + conf.trading_config = read_trading_session_config(doc); + conf.symbol_config_list = read_symbol_config(doc); + return conf; +} + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h new file mode 100644 index 000000000..a22210f2c --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h @@ -0,0 +1,21 @@ +#pragma once +#include +#include +#include + +namespace bts::cmds { + +struct DeribitDemoConfiguration { + std::string deribit_url; + std::list + symbol_config_list; + emumba::deribit_connector::configuration::logging_config + logging_configuration; + emumba::deribit_connector::configuration::trading_session_config + trading_config; + + static std::optional read_file( + const std::string &path); +}; + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp b/src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp new file mode 100644 index 000000000..03ebe3656 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp @@ -0,0 +1,904 @@ +#include "DeribitDemoListener.h" +#include "rapidjson/istreamwrapper.h" +#include "rapidjson/ostreamwrapper.h" +#include "rapidjson/stringbuffer.h" +#include "rapidjson/writer.h" +#include "server/sparkd/cmds/spartan/utils/FileUtils.h" +#include +#include +#include +#include +#include +#include +#include //support for async logging +#include +#include + +bool DeribitDemoListener::configure(const std::string &config_path) { + using namespace rapidjson; + + auto _main_logger = + spdlog::stdout_color_mt("demo_logger"); + spdlog::set_default_logger(_main_logger); + spdlog::set_level(spdlog::level::trace); + + std::string deribit_url; + + // Deribit Connector Configuration Structures + std::list + symbol_config_list; + emumba::deribit_connector::configuration::logging_config + logging_configuration; + emumba::deribit_connector::configuration::trading_session_config + trading_config; + + std::ifstream configFile(config_path); + IStreamWrapper isw{configFile}; + + // std::string config_contents((std::istreambuf_iterator(configFile)), + // std::istreambuf_iterator()); std::cout << "config.json is:\n\n" << + // config_contents << "\n***************************\n" << std::endl; + Document config{}; + if (config.ParseStream(isw).HasParseError()) { + SPDLOG_ERROR("Error in parsing config.json"); + return false; + } + + if (config.HasMember("app_logging") == 1) { + logging_configuration.severity = + config["app_logging"]["severity"].GetString(); + logging_configuration.is_console_enabled = + config["app_logging"]["console"].GetBool(); + logging_configuration.is_file_enabled = + config["app_logging"]["file"].GetBool(); + if (config["app_logging"].HasMember("queuesize")) { + logging_configuration.queue_size = + config["app_logging"]["queuesize"].GetInt(); + } + } else { + SPDLOG_INFO("No logging information: Switching to default"); + } + + if (config.HasMember("uri") == 1) { + + deribit_url = config["uri"].GetString(); + if (deribit_url == "") { + deribit_url = "wss://test.deribit.com/ws/api/v2"; + } + } else { + deribit_url = "wss://test.deribit.com/ws/api/v2"; + } + + auto _credentials = config["credentials"].GetObject(); + + trading_config.client_name = _credentials["client_name"].GetString(); + trading_config.client_id = _credentials["id"].GetString(); + trading_config.secret_key = _credentials["secret_key"].GetString(); + trading_config.heartbeat_interval = + config["session"].GetObject()["heartbeat_interval"].GetInt(); + trading_config.core = config["core"].GetInt(); + + auto symbol_config = config["symbol"].GetArray(); + + for (rapidjson::Value::ConstValueIterator _symbol_itr = + symbol_config.Begin(); + _symbol_itr != symbol_config.End(); ++_symbol_itr) { + emumba::deribit_connector::configuration::symbol_config symbol; + emumba::deribit_connector::configuration::subscription_config subs; + auto _symbol = _symbol_itr->GetObject(); + symbol.symbol_name = _symbol["id"].GetString(); + symbol.interested_in_future = _symbol["interested_in_future"].GetBool(); + symbol.interested_in_option = _symbol["interested_in_option"].GetBool(); + symbol.currency_type = _symbol["currency_type"].GetString(); + + for (rapidjson::Value::ConstValueIterator _instrument_itr = + _symbol["instruments"].GetArray().Begin(); + _instrument_itr != _symbol["instruments"].GetArray().End(); + ++_instrument_itr) { + symbol.interested_instruments.insert(_instrument_itr->GetString()); + } + auto channel = _symbol["channel"].GetObject(); + + if (_symbol.HasMember("requests_limit")) { + subs.requests_limit = _symbol["requests_limit"].GetUint(); + } + + subs.book_depth = _symbol["book_depth"].GetInt(); + subs.use_raw_interval = _symbol["raw_enable"].GetBool(); + subs.public_book = channel["PUBLIC_BOOK"].GetBool(); + subs.public_quote = channel["PUBLIC_QUOTE"].GetBool(); + subs.public_trade = channel["PUBLIC_TRADE"].GetBool(); + subs.public_ticker = channel["PUBLIC_TICKER"].GetBool(); + subs.public_markprice = channel["PUBLIC_MARKPRICE"].GetBool(); + subs.public_index = channel["PUBLIC_INDEX"].GetBool(); + subs.private_orders = channel["PRIVATE_ORDERS"].GetBool(); + subs.private_trades = channel["PRIVATE_TRADES"].GetBool(); + subs.private_portfolio = channel["PRIVATE_PORTFOLIO"].GetBool(); + + symbol.interested_subscriptions = subs; + symbol_config_list.push_back(symbol); + } + + // Creating a deribit_handler object using the above configuration structures + _deribit_conn = std::make_shared( + symbol_config_list, trading_config, logging_configuration, deribit_url, + this); + // Creating a trading session interface to send order entry messages + _trading_session_interface = + std::make_shared( + _deribit_conn->create_new_trading_session()); + return true; +} + +void DeribitDemoListener::run() { + try { + _deribit_conn->run(); + } catch (emumba::deribit_connector::deribit_exception &e) { + e.print(); + } +} + +// Order Entry Callbacks +void DeribitDemoListener::on_account_summary( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG("On_account_summary message body: {}", msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_buy_order_market( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + // Following example code is left in order to give a basic idea about the + // JSON parsing using RapidJson Library + _message.Parse( + msg_result.c_str()); + + auto order = _message["order"].GetObject(); + + bool mmp_cancelled = false; + bool web = false; + std::string advanced = ""; + bool triggered = false; + bool block_trade = false; + std::string original_order_type = ""; + bool auto_replaced = false; + int filled_amount = 0; + double average_price = 0.0; + float commission = 0.0; + std::string app_name = ""; + std::string trigger_order_id = ""; + double trigger_price = 0.0; + double usd = 0.0; + double implv = 0.0; + std::string trigger = ""; + if (order.HasMember("mmp_cancelled") == true) { + mmp_cancelled = order["mmp_cancelled"].GetBool(); + } + if (order.HasMember("web") == true) { + web = order["web"].GetBool(); + } + if (order.HasMember("advanced") == true) { + advanced = order["advanced"].GetString(); + } + if (order.HasMember("triggered") == true) { + triggered = order["triggered"].GetBool(); + } + if (order.HasMember("block_trade") == true) { + block_trade = order["block_trade"].GetBool(); + } + if (order.HasMember("original_order_type") == true) { + original_order_type = order["original_order_type"].GetString(); + } + if (order.HasMember("auto_replaced") == true) { + auto_replaced = order["auto_replaced"].GetBool(); + } + if (order.HasMember("filled_amount") == true) { + filled_amount = order["filled_amount"].GetInt(); + } + if (order.HasMember("average_price") == true) { + average_price = order["average_price"].GetDouble(); + } + if (order.HasMember("commission") == true) { + commission = order["commission"].GetFloat(); + } + if (order.HasMember("app_name") == true) { + app_name = order["app_name"].GetString(); + } + if (order.HasMember("trigger_order_id") == true) { + trigger_order_id = order["trigger_order_id"].GetString(); + } + if (order.HasMember("trigger_price") == true) { + trigger_price = order["trigger_price"].GetDouble(); + } + if (order.HasMember("usd") == true) { + usd = order["usd"].GetDouble(); + } + if (order.HasMember("implv") == true) { + implv = order["implv"].GetDouble(); + } + if (order.HasMember("trigger") == true) { + trigger = order["trigger"].GetString(); + } + + SPDLOG_TRACE( + "Order Entry Data API callback | on_buy_order_market | order | " + "mmp_cancelled:{},order_state:{},max_show:{}," + "api:{},amount:{},web:{},instrument_name:{},advanced:{},triggered:{}," + "block_trade:{}," + "original_order_type:{},price:{},time_in_force:{},auto_replaced:{}," + "last_update_timestamp:{},post_only" + ":{},replaced:{},filled_amount:{},average_price:{},order_id:{}," + "reduce_only:{},commission:{}," + "app_name:{},label:{},trigger_order_id:{},trigger_price:{},creation_" + "timestamp:{},direction:{}," + "is_liquidation:{},order_type:{},usd:{},profit_loss:{},implv:{}," + "trigger:{}", + mmp_cancelled, order["order_state"].GetString(), + order["max_show"].GetInt(), order["api"].GetBool(), + order["amount"].GetDouble(), web, + order["instrument_name"].GetString(), advanced, triggered, + block_trade, original_order_type, order["price"].GetDouble(), + order["time_in_force"].GetString(), auto_replaced, + order["last_update_timestamp"].GetUint64(), + order["post_only"].GetBool(), order["replaced"].GetBool(), + filled_amount, average_price, order["order_id"].GetString(), + order["reduce_only"].GetBool(), commission, app_name, + order["label"].GetString(), trigger_order_id, trigger_price, + order["creation_timestamp"].GetUint64(), + order["direction"].GetString(), order["is_liquidation"].GetBool(), + order["order_type"].GetString(), usd, + order["profit_loss"].GetDouble(), implv, trigger); + UNUSED(mmp_cancelled); + UNUSED(web); + UNUSED(triggered); + UNUSED(block_trade); + UNUSED(auto_replaced); + UNUSED(filled_amount); + UNUSED(average_price); + UNUSED(commission); + UNUSED(trigger_price); + UNUSED(usd); + UNUSED(implv); + for (rapidjson::Value::ConstValueIterator msg_itr = + _message["trades"].Begin(); + msg_itr != _message["trades"].End(); ++msg_itr) { + auto each_trade = msg_itr->GetObject(); + + std::string block_trade_id = ""; + double iv = 0.0; + std::string label = ""; + std::string liquidation = ""; + std::string matching_id = "null"; + double underlying_price = 0.0; + + if (each_trade.HasMember("block_trade_id") == true) { + block_trade_id = each_trade["block_trade_id"].GetString(); + } + if (each_trade.HasMember("iv") == true) { + iv = each_trade["iv"].GetDouble(); + } + if (each_trade.HasMember("label") == true) { + label = each_trade["label"].GetString(); + } + if (each_trade.HasMember("liquidation") == true) { + liquidation = each_trade["liquidation"].GetString(); + } + if (each_trade["matching_id"].IsNull() == false) { + matching_id = each_trade["matching_id"].GetString(); + } + if (each_trade.HasMember("underlying_price") == true) { + underlying_price = each_trade["underlying_price"].GetDouble(); + } + + SPDLOG_TRACE( + "Order Entry Data API callback | on_buy_order_market | trades | " + "amount:{},block_trade_id:{},direction:{}," + "fee:{},fee_currency:{},index_price:{},instrument_name:{},iv:{}," + "label:{},liquidation:{},liquidity" + ":{},mark_price:{},matching_id:{},order_id:{},order_type:{},post_" + "only:{},price:{},profit_loss:{}," + "reduce_only:{},self_trade:{},state:{},tick_direction:{}," + "timestamp:{},trade_id:{},trade_seq:{}," + "underlying_price:{}", + each_trade["amount"].GetDouble(), block_trade_id, + each_trade["direction"].GetString(), each_trade["fee"].GetFloat(), + each_trade["fee_currency"].GetString(), + each_trade["index_price"].GetDouble(), + each_trade["instrument_name"].GetString(), iv, label, liquidation, + each_trade["liquidity"].GetString(), + each_trade["mark_price"].GetDouble(), matching_id, + each_trade["order_id"].GetString(), + each_trade["order_type"].GetString(), + each_trade["post_only"].GetBool(), each_trade["price"].GetDouble(), + each_trade["profit_loss"].GetDouble(), + each_trade["reduce_only"].GetBool(), + each_trade["self_trade"].GetBool(), + each_trade["state"].GetString(), + each_trade["tick_direction"].GetInt(), + each_trade["timestamp"].GetUint64(), + each_trade["trade_id"].GetString(), + each_trade["trade_seq"].GetInt64(), underlying_price); + UNUSED(iv); + UNUSED(underlying_price); + } + SPDLOG_DEBUG( + "Order Entry Data API callback | on_buy_order_market | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_sell_order_market( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_sell_order_market | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_buy_order_limit( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_buy_order_limit | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_sell_order_limit( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_sell_order_limit | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_edit_buy_order( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_edit_buy_order | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_edit_sell_order( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_edit_sell_order | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_buy_order_stop( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_buy_order_stop | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_sell_order_stop( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_sell_order_stop | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_edit_buy_stop( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_edit_buy_stop | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_edit_sell_stop( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_edit_sell_stop | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_cancel_order( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_cancel_order | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_cancel_all_orders( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_cancel_all_orders | Message:{}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_cancel_all_positions( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_cancel_all_positions | Message: " + "{}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_get_position( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_get_position | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} +void DeribitDemoListener::on_get_open_orders( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &msg_result) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Order Entry Data API callback | on_get_open_orders | Message: {}", + msg_result); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +// Market Data Callbacks +void *DeribitDemoListener::on_instrument_definition( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) + emumba::deribit_connector::instrument_data_interface *interface) { + SPDLOG_DEBUG( + "Market Data API callback | Instrument Definition | Instrument Name: {}", + instrument_name); + _instrument_data_interface_list[instrument_name] = interface; + + _instruments.emplace_back(instrument_name); + return &_instruments + .back(); // Returning a handle to the connector. The connector + // will provide this handle on each callback +} + +void DeribitDemoListener::on_book_state_change( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) const data_types::book_status &status_of_book, + const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + SPDLOG_DEBUG( + "Market Data API callback | Book State Change | Instrument Name: {}", + instrument_data->get_instrument_name()); +} + +void DeribitDemoListener::on_subscription_public_trades( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) const std::string &trades_message, + __attribute__((unused)) const void *ptr) { + // Following example code is left in order to give a basic idea about the + // JSON parsing using RapidJson Library + _message.Parse( + trades_message.c_str()); + + std::string block_trade_id = ""; + double iv = 0.0; + std::string liquidation = ""; + if (_message.HasMember("block_trade_id") == true) { + block_trade_id = _message["block_trade_id"].GetString(); + } + if (_message.HasMember("iv") == true) { + iv = _message["iv"].GetDouble(); + } + if (_message.HasMember("liquidation") == true) { + liquidation = _message["liquidation"].GetString(); + } + + SPDLOG_TRACE( + "Market Data API callback | Subscription | Public Trades | " + "amount:{},block_trade_id:{},direction:{},index_price:{},instrument_" + "name:{},iv:{},liquidation:{},mark_price:{},price:{" + "},tick_direction:{},timestamp:{},trade_id:{},trade_seq:{}", + _message["amount"].GetDouble(), block_trade_id, + _message["direction"].GetString(), _message["index_price"].GetDouble(), + _message["instrument_name"].GetString(), iv, liquidation, + _message["mark_price"].GetDouble(), _message["price"].GetDouble(), + _message["tick_direction"].GetInt(), _message["timestamp"].GetUint64(), + _message["trade_id"].GetString(), _message["trade_seq"].GetUint64()); + UNUSED(iv); + + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Public Trades | Instrument " + "Name: {}", + instrument_data->get_instrument_name()); +} + +void DeribitDemoListener::on_subscription_public_markprice( + __attribute__((unused)) const std::string &symbol_name, + __attribute__((unused)) const std::string &markprice_message) { + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Public Markprice | Message: " + "{}", + markprice_message); +} +void DeribitDemoListener::on_subscription_public_index( + __attribute__((unused)) const std::string &symbol_name, + __attribute__((unused)) const std::string &index_message) { + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Public Index | Message: {}", + index_message); +} + +void DeribitDemoListener::on_subscription_private_user_orders_raw( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) const std::string &user_orders_message, + __attribute__((unused)) const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Private User Orders Raw | " + "Instrument Name: {}", + instrument_data->get_instrument_name()); +} + +void DeribitDemoListener::on_subscription_private_user_orders_interval( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) const std::string &user_orders_message, + __attribute__((unused)) const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Private User Orders Interval " + "| Instrument Name: {}", + instrument_data->get_instrument_name()); +} + +void DeribitDemoListener::on_subscription_private_user_trades( + __attribute__((unused)) const std::string &instrument_name, + __attribute__((unused)) const std::string &user_trades_message, + __attribute__((unused)) const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Private User Trades | " + "Instrument Name: {}", + instrument_data->get_instrument_name()); +} + +void DeribitDemoListener::on_subscription_private_user_portfolio( + __attribute__((unused)) const std::string &symbol_name, + __attribute__((unused)) const std::string &user_portfolio_message) { + SPDLOG_DEBUG( + "Market Data API callback | Subscription | Private User Portfolio | " + "Symbol Name: {}", + symbol_name); +} + +void DeribitDemoListener::on_response_get_instruments( + __attribute__((unused)) + const emumba::deribit_connector::data_types::error &ec, + __attribute__((unused)) const std::string &symbol_name, + __attribute__((unused)) const std::string &get_instruments_message) { + if (!ec.value()) { + SPDLOG_DEBUG( + "Market Data API callback | Response | Get Instruments | Symbol " + "Name: {}", + symbol_name); + } else { + SPDLOG_ERROR( + "Error in response ec.value: {}, ec.message: {}", ec.value(), + ec.message()); + } +} + +void DeribitDemoListener::on_securities( + __attribute__((unused)) + const std::vector + &complete_security_list) { + SPDLOG_DEBUG( + "On securities callback | total securities: {}", + complete_security_list.size()); + for (int i = 0; i < (int)complete_security_list.size(); i++) { + + if (complete_security_list[i]->sec_common.sec_type == + emumba::market_data::security_type::Future) { + auto sec_ = std::get<0>(complete_security_list[i]->sec); + UNUSED(sec_); + + SPDLOG_DEBUG( + "On futures securities callback- New Security | security_id: {}, " + "venue: {}, security_type: {}, expiration " + "timestamp: " + "{}, creation_timestamp: {}, leverage: {} , display_factor: {}, " + "cash_per_point: {}, symbol: {}, security_group: " + "{}, implied_matching: {}, contract_size: {}, is_active: {}, " + "min_trade_amount: {}, settlement_period: {}, " + "block_trade_commission: {}, maker_commission: {}, " + "taker_commission: {}, min_price_increment: {}", + std::get( + complete_security_list[i]->sec_common.sec_id.value()), + (int)complete_security_list[i]->sec_common.exchange, + complete_security_list[i]->sec_common.sec_type, + sec_.expiration_ts.get_timestamp(), + sec_.creation_ts.get_timestamp(), sec_.leverage, + complete_security_list[i]->sec_common.sec_cme.display_factor, + complete_security_list[i]->sec_common.sec_cme.cash_per_point, + complete_security_list[i]->sec_common.symbol, + complete_security_list[i]->sec_common.security_group, + complete_security_list[i]->sec_common.sec_cme.implied_matching, + complete_security_list[i]->sec_common.sec_deribit.contract_size, + complete_security_list[i]->sec_common.sec_deribit.is_active, + complete_security_list[i]->sec_common.sec_deribit.min_trade_amount, + complete_security_list[i] + ->sec_common.sec_deribit.settlement_period, + complete_security_list[i] + ->sec_common.sec_deribit.block_trade_commission, + complete_security_list[i]->sec_common.sec_deribit.maker_commission, + complete_security_list[i]->sec_common.sec_deribit.taker_commission, + complete_security_list[i] + ->sec_common.min_price_increment.to_double()); + } else if ( + complete_security_list[i]->sec_common.sec_type == + emumba::market_data::security_type::Option) { + auto sec_ = std::get<1>(complete_security_list[i]->sec); + UNUSED(sec_); + + SPDLOG_DEBUG( + "On options securities callback- New Security | security_id: {}, " + "venue: {}, security_type: {}, expiration " + "timestamp: " + "{}, creation_timestamp: {}, option_type: {} , strike: {}, " + "display_factor: {}, cash_per_point: {}, symbol: {}, " + "security_group: " + "{}, implied_matching: {}, contract_size: {}, is_active: {}, " + "min_trade_amount: {}, settlement_period: {}, " + "block_trade_commission: {}, maker_commission: {}, " + "taker_commission: {}, min_price_increment: {}", + std::get( + complete_security_list[i]->sec_common.sec_id.value()), + (int)complete_security_list[i]->sec_common.exchange, + complete_security_list[i]->sec_common.sec_type, + sec_.expiration_ts.get_timestamp(), + sec_.creation_ts.get_timestamp(), sec_.op_type, + sec_.strike.to_double(), + complete_security_list[i]->sec_common.sec_cme.display_factor, + complete_security_list[i]->sec_common.sec_cme.cash_per_point, + complete_security_list[i]->sec_common.symbol, + complete_security_list[i]->sec_common.security_group, + complete_security_list[i]->sec_common.sec_cme.implied_matching, + complete_security_list[i]->sec_common.sec_deribit.contract_size, + complete_security_list[i]->sec_common.sec_deribit.is_active, + complete_security_list[i]->sec_common.sec_deribit.min_trade_amount, + complete_security_list[i] + ->sec_common.sec_deribit.settlement_period, + complete_security_list[i] + ->sec_common.sec_deribit.block_trade_commission, + complete_security_list[i]->sec_common.sec_deribit.maker_commission, + complete_security_list[i]->sec_common.sec_deribit.taker_commission, + complete_security_list[i] + ->sec_common.min_price_increment.to_double()); + } + } +} + +void DeribitDemoListener::on_security_state( + __attribute__((unused)) + const emumba::market_data::security_state &sec_state, + __attribute__((unused)) const void *ptr) { + SPDLOG_DEBUG( + "On security state callback | state: {}, security_id {}", + (int)sec_state.state_, std::get(sec_state.sec_id.value())); +} + +void DeribitDemoListener::on_security_statistics( + __attribute__((unused)) + const emumba::market_data::market_data_statistics &market_data_stats, + __attribute__((unused)) const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + SPDLOG_DEBUG( + "Market Data API callback | Security Statistics | SecurityID(using " + "ptr): {}, SecurityID: {}, Low: {}, High: {}, Open: " + "{}, Settle: {}, Volume: {}", + instrument_data->get_instrument_name(), + std::get(market_data_stats.sec_id.value()), + market_data_stats.low.to_double(), market_data_stats.high.to_double(), + market_data_stats.open.to_double(), market_data_stats.settle.to_double(), + market_data_stats.volume); +} + +void DeribitDemoListener::on_book( + __attribute__((unused)) const emumba::market_data::order_book &book, + __attribute__((unused)) const void *ptr) { + SPDLOG_DEBUG( + "Market Data API callback | Book Update | SecurityID: {}", + std::get(book.sec_id.value())); + + for (int i = 0; i < (int)book.asks.level.size(); i++) { + SPDLOG_TRACE( + "Index [{}]: Bid : quantity {}, price {}, Ask : quantity {}, price " + "{}", + i, book.bids.level[i].direct_qty, book.bids.level[i].px.to_double(), + book.asks.level[i].direct_qty, book.asks.level[i].px.to_double()); + } + + /* + // Following are the examples of using trading session interface to place + different orders: + _trading_session_interface->send_buy_order_market(std::get(book.sec_id.value()), + 1, false, ""); + _trading_session_interface->send_sell_order_market(std::get(book.sec_id.value()), + 1, false, ""); + _trading_session_interface->send_buy_order_limit(std::get(book.sec_id.value()), + 1, 1); + _trading_session_interface->send_sell_order_limit(std::get(book.sec_id.value()), + 1, 1); _trading_session_interface->send_edit_buy_order("1", 1, 1, false); + _trading_session_interface->send_edit_sell_order("1", 1, 1, false); + _trading_session_interface->send_buy_order_stop(std::get(book.sec_id.value()), + 1, 1); + _trading_session_interface->send_sell_order_stop(std::get(book.sec_id.value()), + 1, 1); _trading_session_interface->send_edit_buy_stop("1", 1, 1); + _trading_session_interface->send_edit_sell_stop("1", 1, 1); + _trading_session_interface->send_cancel_order("1"); + _trading_session_interface->send_cancel_all_orders(std::get(book.sec_id.value())); + _trading_session_interface->send_cancel_all_positions(std::get(book.sec_id.value())); + _trading_session_interface->send_get_position(std::get(book.sec_id.value())); + _trading_session_interface->send_get_open_orders(std::get(book.sec_id.value())); + */ +} + +void DeribitDemoListener::on_trades( + __attribute__((unused)) + const std::vector &trades, + __attribute__((unused)) const void *ptr) { + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + SPDLOG_DEBUG("On trades callback | total trade records: {}", trades.size()); + for (int i = 0; i < (int)trades.size(); i++) { + auto trade_ts = trades[i]->timestamp; + UNUSED(trade_ts); + SPDLOG_DEBUG( + "New trade record | SecurityID(using ptr): {}, SecurityID: {}, " + "Timestamp: {}, Side: {}, Trade Quantity {}, Trade " + "Price {}", + instrument_data->get_instrument_name(), + std::get(trades[i]->sec_id.value()), + trade_ts.get_timestamp(), (int)trades[i]->agg_side, + trades[i]->trade_quantity, trades[i]->trade_price.to_double()); + } +} + +void DeribitDemoListener::on_quote( + __attribute__((unused)) const emumba::market_data::quote "e, + __attribute__((unused)) const void *ptr) + +{ + UserInstrumentData *instrument_data = (UserInstrumentData *)ptr; + UNUSED(instrument_data); + SPDLOG_DEBUG( + "Market Data API callback | Quote Update | SecurityID(using ptr): {}, " + "SecurityID: {}, Best Bid Price: " + "{}, Best Bid Amount: {}, Best Ask Price: {}, Best Ask Amount: {}, " + "Timestamp: {}", + instrument_data->get_instrument_name(), + std::get(quote.sec_id.value()), + quote.best_bid_price.to_double(), quote.best_bid_amount, + quote.best_ask_price.to_double(), quote.best_ask_amount, + quote.timestamp.get_timestamp()); +} + +void DeribitDemoListener::on_error(__attribute__(( + unused)) const emumba::market_data::market_data_error &error) { + SPDLOG_WARN("On error callback | error: {}", error.err_type); +} diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoListener.h b/src/server/sparkd/cmds/crypto/DeribitDemoListener.h new file mode 100644 index 000000000..1a3354c87 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/DeribitDemoListener.h @@ -0,0 +1,180 @@ +#pragma once +#include "UserInstrumentData.h" +#include "rapidjson/document.h" +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace emumba::deribit_connector; + +class DeribitDemoListener : public emumba::deribit_connector::deribit_listener { + public: + // Read configuration of connector from config.json file. It is not necessary + // to fill configuration structures from a JSON file. The user can fill the + // configuration structures in any way he/she pleases. + bool configure(const std::string &config_path); + // Run the connector + void run(); + + // Order Entry Callbacks + void on_account_summary( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_buy_order_market( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_sell_order_market( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_buy_order_limit( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_sell_order_limit( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_edit_buy_order( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_edit_sell_order( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_buy_order_stop( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_sell_order_stop( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_edit_buy_stop( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_edit_sell_stop( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_cancel_order( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_cancel_all_orders( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_cancel_all_positions( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_get_position( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + void on_get_open_orders( + const emumba::deribit_connector::data_types::error &ec, + const std::string &msg_result) override; + + // Market Data Callbacks + void *on_instrument_definition( + const std::string &instrument_name, + emumba::deribit_connector::instrument_data_interface *interface) + override; + + void on_subscription_public_trades( + const std::string &instrument_name, + const std::string &trades_message, + const void *ptr = nullptr) override; + + void on_subscription_public_markprice( + const std::string &symbol_name, + const std::string &markprice_message) override; + + void on_subscription_public_index( + const std::string &symbol_name, + const std::string &index_message) override; + + void on_subscription_private_user_orders_raw( + const std::string &instrument_name, + const std::string &user_orders_message, + const void *ptr = nullptr) override; + + void on_subscription_private_user_orders_interval( + const std::string &instrument_name, + const std::string &user_orders_message, + const void *ptr = nullptr) override; + + void on_subscription_private_user_trades( + const std::string &instrument_name, + const std::string &user_trades_message, + const void *ptr = nullptr) override; + + void on_subscription_private_user_portfolio( + const std::string &symbol_name, + const std::string &user_portfolio_message) override; + + void on_response_get_instruments( + const emumba::deribit_connector::data_types::error &ec, + const std::string &symbol_name, + const std::string &get_instruments_message) override; + + void on_securities(const std::vector + &complete_security_list) override; + + void on_book_state_change( + const std::string &instrument_name, + const data_types::book_status &status_of_book, + const void *ptr = nullptr) override; + + void on_security_statistics( + const emumba::market_data::market_data_statistics &market_data_stats, + const void *ptr = nullptr) override; + + void on_quote( + const emumba::market_data::quote "e, + const void *ptr = nullptr) override; + + void on_book( + const emumba::market_data::order_book &book, + const void *ptr = nullptr) override; + + void on_security_state( + const emumba::market_data::security_state &sec_state, + __attribute__((unused)) const void *ptr = nullptr) override; + + void on_trades( + const std::vector &trades, + __attribute__((unused)) const void *ptr = nullptr) override; + + void on_error(const emumba::market_data::market_data_error &error) override; + + private: + std::list + _instruments; // List of user defined class objects + std::map + _instrument_data_interface_list; // List used to store + // instrument_data_interface pointer. + // This pointer can be used to get + // useful information about the + // instrument. + std::shared_ptr + _deribit_conn; // Shared pointer of deribit connector. This pointer can + // be used to configure/run the connector. + std::shared_ptr + _trading_session_interface; // Shared pointer of trading session + // interface. This pointer can be use to send + // order entry messages. + rapidjson::Document _message; // RapidJson Object used to parse the JSON + // messages received in some of the callbacks. +}; diff --git a/src/server/sparkd/cmds/crypto/RapidJsonReader.h b/src/server/sparkd/cmds/crypto/RapidJsonReader.h new file mode 100644 index 000000000..6853a7c58 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/RapidJsonReader.h @@ -0,0 +1,109 @@ +#pragma once +#include "lib/utils/bts_assert.h" +#include +#include + +namespace bts::cmds { + +class RapidJsonReader { + public: + template + static std::string get_string( + T &obj, const char *field, std::string default_val = ""); + + template + static std::string get_string( + T &obj, const char *field, bool required, std::string default_val = ""); + + template + static bool get_bool(T &obj, const char *field, bool default_val = false); + + template + static bool get_bool( + T &obj, const char *field, bool required, bool default_val); + + template + static std::uint32_t get_uint( + T &obj, const char *field, std::uint32_t default_val = 0u); + + template + static std::uint32_t get_uint( + T &obj, + const char *field, + bool required, + std::uint32_t default_val = 0u); + + // template + // static RapidJsonReaderWrapper wrap(T *) + private: + template + static Val get_( + Obj &obj, + const char *field, + Get get = {}, + bool required = false, + Val default_val = {}); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +std::string RapidJsonReader::get_string( + T &obj, const char *field, std::string default_val) { + return get_( + obj, field, [](auto &res) { return res.GetString(); }, false, + default_val); +} + +template +std::string RapidJsonReader::get_string( + T &obj, const char *field, bool required, std::string default_val) { + return get_( + obj, field, [](auto &res) { return res.GetString(); }, required, + default_val); +} + +template +bool RapidJsonReader::get_bool(T &obj, const char *field, bool default_val) { + return get_( + obj, field, [](auto &res) { return res.GetBool(); }, false, default_val); +} + +template +bool RapidJsonReader::get_bool( + T &obj, const char *field, bool required, bool default_val) { + return get_( + obj, field, [](auto &res) { return res.GetBool(); }, required, + default_val); +} + +template +std::uint32_t RapidJsonReader::get_uint( + T &obj, const char *field, std::uint32_t default_val) { + return get_( + obj, field, [](auto &res) { return res.GetUint(); }, false, default_val); +} + +template +std::uint32_t RapidJsonReader::get_uint( + T &obj, const char *field, bool required, std::uint32_t default_val) { + return get_( + obj, field, [](auto &res) { return res.GetUint(); }, required, + default_val); +} + +template +Val RapidJsonReader::get_( + Obj &obj, const char *field, Get get, bool required, Val default_val) { + if (obj.HasMember(field)) { + return get(obj[field]); + } + bts_assert_msgf( + !required, "json object does not have required field '{}'", + std::string(field)); + return default_val; +} + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/crypto/UserInstrumentData.cpp b/src/server/sparkd/cmds/crypto/UserInstrumentData.cpp new file mode 100644 index 000000000..c954f12df --- /dev/null +++ b/src/server/sparkd/cmds/crypto/UserInstrumentData.cpp @@ -0,0 +1,8 @@ +#include "UserInstrumentData.h" + +UserInstrumentData::UserInstrumentData(const std::string &instrument_name) + : _instrument_name(instrument_name) {} + +std::string &UserInstrumentData::get_instrument_name() { + return _instrument_name; +} diff --git a/src/server/sparkd/cmds/crypto/UserInstrumentData.h b/src/server/sparkd/cmds/crypto/UserInstrumentData.h new file mode 100644 index 000000000..09bd6ded4 --- /dev/null +++ b/src/server/sparkd/cmds/crypto/UserInstrumentData.h @@ -0,0 +1,19 @@ +#pragma once +#include + +/** + * This can be a user defined class which stores information related to + * an instrument/security. The user returns a pointer to an object of this class + * in the callback "on_instrument_definition". This pointer is stored by the + * connector and passed to user in the api callbacks of the specific + * instrument/security. In this example class only the instrument/security name + * is being stored. + */ +class UserInstrumentData { + public: + UserInstrumentData(const std::string &instrument_names); + std::string &get_instrument_name(); + + private: + std::string _instrument_name = ""; +}; diff --git a/src/server/sparkd/cmds/crypto/deribit_demo_config.json b/src/server/sparkd/cmds/crypto/deribit_demo_config.json new file mode 100644 index 000000000..705a020bd --- /dev/null +++ b/src/server/sparkd/cmds/crypto/deribit_demo_config.json @@ -0,0 +1,42 @@ +{ + "app_logging": { + "severity": "debug", + "file": true, + "console": true + }, + "symbol": [ + { + "id": "BTC", + "instruments": [ + "BTC-PERPETUAL" + ], + "interested_in_future": false, + "interested_in_option": false, + "currency_type": "usd", + "raw_enable": true, + "book_depth": 10, + "requests_limit": 20, + "channel": { + "PUBLIC_BOOK": true, + "PUBLIC_QUOTE": true, + "PUBLIC_TRADE": true, + "PUBLIC_TICKER": true, + "PUBLIC_MARKPRICE": false, + "PUBLIC_INDEX": false, + "PRIVATE_ORDERS": false, + "PRIVATE_TRADES": false, + "PRIVATE_PORTFOLIO": false + } + } + ], + "uri": "wss://test.deribit.com/ws/api/v2", + "core": 0, + "credentials": { + "client_name": "", + "id": "", + "secret_key": "" + }, + "session": { + "heartbeat_interval": 10 + } +} From 8d5cae835f7999850e71001fc399608dcb3087b7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 088/100] docker (dev/john): Update apt before installing fish dep --- dev/john/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 14313c8da..16de225d2 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -26,7 +26,9 @@ RUN \ ## Get latest fish (build from source) # 1) get build deps USER root -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common +RUN \ + DEBIAN_FRONTEND=noninteractive apt-get update \ + && apt-get install -y software-properties-common RUN \ apt-add-repository ppa:fish-shell/release-3 \ && sed -i "s/^# deb/deb/g" /etc/apt/sources.list From 2c21d4ddaded2a5df344a49e804b5caf97903cd9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 089/100] docker (dev/john): Run apt w/ noninteractive frontend --- dev/john/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 16de225d2..8283cd273 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -1,7 +1,8 @@ FROM spark-crypto_18.04 -# RUN echo "BT5u53r" | sudo -S apt-get install -y \ -RUN apt-get install -y \ +RUN \ + DEBIAN_FRONTEND=noninteractive apt-get update \ + && apt-get install -y \ htop \ locales \ source-highlight \ From c5ca47396b055e4e627ae7b9f166b64ec479733b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 090/100] docker (dev/john): Don't install apt fish or git-powerline --- dev/john/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 8283cd273..d5b66348e 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -7,9 +7,7 @@ RUN \ locales \ source-highlight \ powerline \ - powerline-gitstatus \ - fonts-powerline \ - fish + fonts-powerline # Hide these in the .docker directory to avoid conflicts with existing repos on From 5e3530faef9965bf8e9b9623b71bdf326f74174d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 091/100] docker (dev/john): Don't build fish docs This breaks the build for some reason (don't care enough to investigate) --- dev/john/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index d5b66348e..61f82b9f7 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -45,7 +45,7 @@ RUN \ cd $repo_root/public/fish-shell \ && mkdir build \ && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release .. \ + && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 .. \ && cmake --build . # Switch to root, rather than running inline w/ sudo cmd, to avoid having to From d9ff44cc9376ccf760da16ad72f704b287236cda Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 092/100] docker (dev/john): Don't backup default .bashrc and .profile --- dev/john/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev/john/Dockerfile b/dev/john/Dockerfile index 61f82b9f7..0056ec0a3 100644 --- a/dev/john/Dockerfile +++ b/dev/john/Dockerfile @@ -83,9 +83,6 @@ RUN \ ## Get my bash config (back up existing) RUN \ - mkdir -p /home/john/.docker_orig_rc \ - && cp /home/john/*.rc /home/john/.docker_orig_rc/ \ - && cp /home/john/.profile /home/john/.docker_orig_rc/ \ && cd $repo_root/private \ && git clone https://github.com/johncolvin-og/mybashconfig \ && cd mybashconfig \ From 493262c99a9cfda8a71e698845ab3a0a7f4b0cd4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 093/100] Update docker/linux --- docker/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux b/docker/linux index f1d398ba8..54c0c16d3 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit f1d398ba8182f78c4caf21e9fc47e11d3cb5a0f6 +Subproject commit 54c0c16d3b465a18d08018cf5122494a38b083df From 9b7ac8d6ebe2a9c317eb835ae67d29f79b278b6c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 094/100] refactor: Shorten field names in SecurityCommon * security_id -> id * security_group -> group * security_desc -> desc --- src/lib/domain/SecurityCommon.h | 8 ++++---- .../sparkd/md/platforms/emumba/EmumbaMDListener.cpp | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/domain/SecurityCommon.h b/src/lib/domain/SecurityCommon.h index 6d133d752..1d22219f6 100644 --- a/src/lib/domain/SecurityCommon.h +++ b/src/lib/domain/SecurityCommon.h @@ -13,15 +13,15 @@ namespace bts::domain { class SecurityCommon { public: api::domain::Venue venue; - SecurityID security_id{}; - api::domain::SecurityType security_type; + SecurityID id{}; + api::domain::SecurityType type; api::domain::Currency currency; double display_factor{}; double cash_per_point{}; std::string symbol; - std::string security_group; + std::string group; std::string asset; - std::string security_desc; + std::string desc; Price min_price_increment{}; double min_price_increment_ammount = 0; bool implied_matching = false; diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp index 78c6bcfbb..59dbd0352 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMDListener.cpp @@ -62,6 +62,11 @@ inline api::Venue convert_venue(domain::Venue /*unused*/) { return api::Venue::VENUE_BTS; } +inline api::Venue convert_venue(api::domain::Venue /*unused*/) { + // TODO + return api::Venue::VENUE_BTS; +} + inline co2::TradingStatus convert_status(domain::SecurityState::State state) { switch (state) { case domain::SecurityState::State::OPEN: @@ -215,9 +220,9 @@ void EmumbaMDListener::_add_future(const domain::Security &sec) { void EmumbaMDListener::_copy_security_common( const domain::Security &from, FixedSecurity &to) const { - to.numeric_id = from.security_common.security_id.value(); + to.numeric_id = from.security_common.id.value(); to.symbol(from.security_common.symbol); - to.security_desc(from.security_common.security_desc); + to.security_desc(from.security_common.desc); to.exchange = convert_venue(from.security_common.venue); // these are not filled in // TODO From 68848a74a4228ec16d582b127fdc2e9daa488536 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 095/100] fix build: Correct typo in include path in spreader_tests --- .../orderman/orders/spreader_orders/tests/spreader_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 813271757..762afa1de 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,5 +1,5 @@ #include "lib/md/IMarketDataListener.h" -#include "lib/communincation/websockets/WebsocketClient.h" +#include "lib/io/websocket/WebsocketClient.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include #include From b1d3acb9f73c4dbdfc1fb04157df045a8e650d93 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 096/100] fix typo: Change < to <= in WebsocketClient::start --- src/lib/io/websocket/WebsocketClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/io/websocket/WebsocketClient.cpp b/src/lib/io/websocket/WebsocketClient.cpp index 8cb3f8388..4270376f6 100644 --- a/src/lib/io/websocket/WebsocketClient.cpp +++ b/src/lib/io/websocket/WebsocketClient.cpp @@ -640,7 +640,7 @@ WebsocketClient::WebsocketClient( } void WebsocketClient::start() { - for (size_t i = 0; i < me->conf.n_reconnection_attempts; i++) { + for (size_t i = 0; i <= me->conf.n_reconnection_attempts; i++) { net::io_context ioc; // The SSL context is required, and holds certificates ssl::context ctx{ssl::context::tlsv12_client}; From f880399c4cc9b8c12593df2c01ec900eab764f8b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Nov 2021 16:08:54 -0500 Subject: [PATCH 097/100] Add unsubscribe fn to MarketDataGateway Seems like this was accidentally omitted --- src/lib/md/MarketDataGateway.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/md/MarketDataGateway.h b/src/lib/md/MarketDataGateway.h index 954590535..481837a43 100644 --- a/src/lib/md/MarketDataGateway.h +++ b/src/lib/md/MarketDataGateway.h @@ -36,6 +36,10 @@ class MarketDataGateway { MarketDataListenerID id, const std::vector &securities); + void unsubscribe( + MarketDataListenerID id, + const std::vector &securities); + void unregister_listener(MarketDataListenerID id); private: From fd271b992a41d46a98857ced9f36afc66b4e7362 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 18 Nov 2021 17:20:09 -0500 Subject: [PATCH 098/100] Remove ICE symbols from default conf --- src/lib/config/defaults/Symbols.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 9f4d0f77a..a00ff93e1 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -70,16 +70,6 @@ SymbolLists list { key: "ICE" - symbol: "BRN" - symbol: "WBS" - symbol: "OJ" - symbol: "G" - symbol: "KC" - symbol: "UHO" - symbol: "UHU" - symbol: "DX" - - symbol: "*" } list { From d4c867a835657f7f089c94bec311818a5b5105c6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 19 Nov 2021 13:59:32 -0500 Subject: [PATCH 099/100] Resurrect webserver The webserver code was commented out when boost was upgraded, as the former dependend on websocketpp, which, at that time, depended on the previous version of boost. Websocketpp has since been updated, so that the dependency conflict no longer exists --- src/server/sparkd/cmds/Run.cpp | 2 +- src/server/sparkd/cmds/Web.cpp | 128 ++--- src/server/sparkd/http/WebServer.cpp | 772 ++++++++++++++------------- 3 files changed, 452 insertions(+), 450 deletions(-) diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 7baf243df..8d49e87fe 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -59,7 +59,7 @@ static void execute() { trace::PerfLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - // http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::AuthServiceServer login_server(sc); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 9003c715c..8deb5b400 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -1,74 +1,74 @@ -// #include "Web.h" -// #include "lib/api/public/ServiceContext.h" -// #include "lib/api/services/MarketDataService.pb.h" -// #include "lib/api/services/SyntheticSecurityService.pb.h" -// #include "lib/config/config.h" -// #include "lib/config/protos/MarketData.pb.h" -// #include "lib/config/protos/Ports.pb.h" -// #include "lib/config/protos/quickbus_cfg.pb.h" -// #include "lib/md/MBOProcessor.h" -// #include "lib/md/MDClient.h" -// #include "lib/md/SyntheticSecurityService.h" -// #include "lib/md/relay/QueryServer.h" -// #include "lib/metrics/metrics.h" -// #include "lib/metrics/system_metrics.h" -// #include "lib/quickbus/quickbus.h" -// #include "lib/tracing/PerfLog.h" -// #include "lib/utils/Dispatcher.h" -// #include "lib/utils/thread_manager.h" -// #include "md/cmds/Cleanup.h" -// #include "md/cmds/Run.h" -// #include "server/sparkd/exchange_sim/ExchangeSim.h" -// #include "server/sparkd/http/WebServer.h" -// #include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" -// #include "server/sparkd/user/AdminServiceServer.h" -// #include "server/sparkd/user/AuthServiceServer.h" -// #include -// #include -// #include +#include "Web.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/MarketDataService.pb.h" +#include "lib/api/services/SyntheticSecurityService.pb.h" +#include "lib/config/config.h" +#include "lib/config/protos/MarketData.pb.h" +#include "lib/config/protos/Ports.pb.h" +#include "lib/config/protos/quickbus_cfg.pb.h" +#include "lib/md/MBOProcessor.h" +#include "lib/md/MDClient.h" +#include "lib/md/SyntheticSecurityService.h" +#include "lib/md/relay/QueryServer.h" +#include "lib/metrics/metrics.h" +#include "lib/metrics/system_metrics.h" +#include "lib/quickbus/quickbus.h" +#include "lib/tracing/PerfLog.h" +#include "lib/utils/Dispatcher.h" +#include "lib/utils/thread_manager.h" +#include "md/cmds/Cleanup.h" +#include "md/cmds/Run.h" +#include "server/sparkd/exchange_sim/ExchangeSim.h" +#include "server/sparkd/http/WebServer.h" +#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" +#include "server/sparkd/user/AdminServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" +#include +#include +#include -// namespace bts::cmds { +namespace bts::cmds { -// struct Web::Args { -// bool md; -// }; +struct Web::Args { + bool md; +}; -// Web::Web() -// : CLI::App( -// "Run only the services required for the web admin. This cannot be " -// "run concurrently with 'sparkd run.'", -// "web"), -// _args(new Web::Args()) { -// add_flag("--md", _args->md, "Start market data"); -// callback([&] { -// config::QuickbusNodeCfg qb_cfg; -// auto &ports = config::get(); -// qb_cfg.set_my_port(ports.qbus_port()); -// qbus::Quickbus quickbus(qb_cfg); -// bts::api::ServiceContext sc(&quickbus); +Web::Web() + : CLI::App( + "Run only the services required for the web admin. This cannot be " + "run concurrently with 'sparkd run.'", + "web"), + _args(new Web::Args()) { + add_flag("--md", _args->md, "Start market data"); + callback([&] { + config::QuickbusNodeCfg qb_cfg; + auto &ports = config::get(); + qb_cfg.set_my_port(ports.qbus_port()); + qbus::Quickbus quickbus(qb_cfg); + bts::api::ServiceContext sc(&quickbus); -// bts::metrics::MetricsContainer stats; -// metrics::publish_system_metrics(stats); -// trace::PerfLog perf_log; -// http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + bts::metrics::MetricsContainer stats; + metrics::publish_system_metrics(stats); + trace::PerfLog perf_log; + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); -// user::AuthServiceServer login_server(sc); -// if (_args->md) -// md::cmds::Run::run( -// nullptr, nullptr, md::cmds::Run::MDType::Configured, true, true); + user::AuthServiceServer login_server(sc); + if (_args->md) + md::cmds::Run::run( + nullptr, nullptr, md::cmds::Run::MDType::Configured, true, true); -// bts::api::synthetic::SyntheticSecurityService synthetic_service(sc); -// bts::admin::AdminServiceServer admin_service(sc); -// bts::md::MDClient mdclient( -// &bts::utils::Dispatcher::current(), &synthetic_service); + bts::api::synthetic::SyntheticSecurityService synthetic_service(sc); + bts::admin::AdminServiceServer admin_service(sc); + bts::md::MDClient mdclient( + &bts::utils::Dispatcher::current(), &synthetic_service); -// bts::md::QueryServerPtr md_query_server( -// bts::md::run_query_server(sc, mdclient, stats)); + bts::md::QueryServerPtr md_query_server( + bts::md::run_query_server(sc, mdclient, stats)); -// bts::utils::Dispatcher::current().run(); -// }); -// } + bts::utils::Dispatcher::current().run(); + }); +} -// Web::~Web() {} +Web::~Web() {} -// } // namespace bts::cmds +} // namespace bts::cmds diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index e5b83a05a..561f6aa37 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -1,421 +1,423 @@ -// #include "WebServer.h" -// #include "ApiGateway.h" -// #include "MultipartFormDecoder.h" -// #include "lib/api/apigateway.pb.h" -// #include "lib/api/core/ApiClientInterop.h" -// #include "lib/logging/logging.h" -// #include "lib/os/os.h" -// #include "lib/tracing/PerfLog.h" -// #include "lib/utils/Dispatcher.h" -// #include "lib/utils/TimeStamp.h" +// #define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT 1 -// #include -// #include +#include "WebServer.h" +#include "ApiGateway.h" +#include "MultipartFormDecoder.h" +#include "lib/api/apigateway.pb.h" +#include "lib/api/core/ApiClientInterop.h" +#include "lib/logging/logging.h" +#include "lib/os/os.h" +#include "lib/tracing/PerfLog.h" +#include "lib/utils/Dispatcher.h" +#include "lib/utils/TimeStamp.h" -// #include -// #include -// #include +#include +#include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include +#include +#include +#include -// typedef websocketpp::server WsServer; -// typedef WsServer::endpoint::connection_ptr connection_ptr; -// using websocketpp::connection_hdl; -// using websocketpp::lib::bind; -// using websocketpp::lib::placeholders::_1; -// using websocketpp::lib::placeholders::_2; +#include +#include +#include +#include +#include +#include +#include +#include -// using namespace bts::api::gateway; +typedef websocketpp::server WsServer; +typedef WsServer::endpoint::connection_ptr connection_ptr; +using websocketpp::connection_hdl; +using websocketpp::lib::bind; +using websocketpp::lib::placeholders::_1; +using websocketpp::lib::placeholders::_2; -// std::string read_file(const std::string &path) { -// std::ifstream f{path}; -// auto sz = boost::filesystem::file_size(path); -// std::string contents(sz, ' '); -// f.read(&contents[0], sz); -// return contents; -// } +using namespace bts::api::gateway; -// namespace bts { -// namespace http { +std::string read_file(const std::string &path) { + std::ifstream f{path}; + auto sz = boost::filesystem::file_size(path); + std::string contents(sz, ' '); + f.read(&contents[0], sz); + return contents; +} -// struct ServerState { -// std::mutex _m; -// utils::Dispatcher &_dispatcher; -// std::map> -// _session; -// WsServer _server; -// int _port; -// std::string _www; -// std::string _conf; -// const api::ServiceContext &_ctx; -// metrics::MetricsContainer &_metrics; -// std::shared_ptr> _mtimer; -// trace::PerfLog &_perf_log; +namespace bts { +namespace http { -// ServerState( -// const api::ServiceContext &ctx, -// metrics::MetricsContainer &metrics, -// trace::PerfLog &l, -// int port) -// : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), -// _session(), _server(), _port(port), _www(), _ctx(ctx), -// _metrics(metrics), -// _mtimer(std::make_shared>( -// "spark_metrics_query_duration_ms", -// std::array({0.5, 1.0, 5.0, 10.0}))), -// _perf_log(l) { -// _www = os::sparkdata_path("www"); -// _conf = os::sparkdata_path("conf"); +struct ServerState { + std::mutex _m; + utils::Dispatcher &_dispatcher; + std::map> + _session; + WsServer _server; + int _port; + std::string _www; + std::string _conf; + const api::ServiceContext &_ctx; + metrics::MetricsContainer &_metrics; + std::shared_ptr> _mtimer; + trace::PerfLog &_perf_log; -// _metrics.publish(_mtimer); + ServerState( + const api::ServiceContext &ctx, + metrics::MetricsContainer &metrics, + trace::PerfLog &l, + int port) + : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), + _session(), _server(), _port(port), _www(), _ctx(ctx), + _metrics(metrics), + _mtimer(std::make_shared>( + "spark_metrics_query_duration_ms", + std::array({0.5, 1.0, 5.0, 10.0}))), + _perf_log(l) { + _www = os::sparkdata_path("www"); + _conf = os::sparkdata_path("conf"); -// _server.init_asio(_dispatcher.io_service()); -// _server.set_open_handler(bind(&ServerState::on_open, this, ::_1)); -// _server.set_close_handler(bind(&ServerState::on_close, this, ::_1)); -// _server.set_message_handler( -// bind(&ServerState::on_message, this, ::_1, ::_2)); -// _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); -// // Turn off logging -// _server.clear_access_channels(websocketpp::log::alevel::all); -// _server.clear_error_channels(websocketpp::log::alevel::all); -// _server.set_open_handshake_timeout(0); -// run(); -// } + _metrics.publish(_mtimer); -// // starts listening -// void run() { -// _server.set_reuse_addr(true); -// _server.listen(_port); -// _server.start_accept(); -// } + _server.init_asio(_dispatcher.io_service()); + _server.set_open_handler(bind(&ServerState::on_open, this, ::_1)); + _server.set_close_handler(bind(&ServerState::on_close, this, ::_1)); + _server.set_message_handler( + bind(&ServerState::on_message, this, ::_1, ::_2)); + _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); + // Turn off logging + _server.clear_access_channels(websocketpp::log::alevel::all); + _server.clear_error_channels(websocketpp::log::alevel::all); + _server.set_open_handshake_timeout(0); + run(); + } -// void on_open(connection_hdl hdl) { -// auto con = _server.get_con_from_hdl(hdl); -// if (con) { -// LOG(Http, Info, "Web client connection from {}", -// con->get_remote_endpoint()); -// std::lock_guard lock(_m); -// _session[hdl] = ApiGatewaySession(_ctx); -// } -// } + // starts listening + void run() { + _server.set_reuse_addr(true); + _server.listen(_port); + _server.start_accept(); + } -// void on_close(connection_hdl hdl) { -// auto con = _server.get_con_from_hdl(hdl); -// if (con) { -// LOG(Http, Info, "Web client disconnected: {}", -// con->get_remote_endpoint()); -// std::lock_guard lock(_m); -// _session.erase(hdl); -// } -// } + void on_open(connection_hdl hdl) { + auto con = _server.get_con_from_hdl(hdl); + if (con) { + LOG(Http, Info, "Web client connection from {}", + con->get_remote_endpoint()); + std::lock_guard lock(_m); + _session[hdl] = ApiGatewaySession(_ctx); + } + } -// void on_message(connection_hdl hdl, WsServer::message_ptr msg) { -// std::lock_guard lock(_m); -// auto iter = _session.find(hdl); -// if (iter != _session.end()) { -// GatewayRequest request; -// if (request.ParseFromString(msg->get_payload())) { -// iter->second.handle( -// request, [this, hdl](const GatewayResponse &response) { -// websocketpp::lib::error_code ec; -// _server.send( -// hdl, response.SerializeAsString(), -// websocketpp::frame::opcode::binary, ec); -// if (ec) { -// LOG(Http, Warn, "Error sending from websocket: '{}'", -// ec.message()); -// } -// }); -// } else { -// LOG(Http, Info, "Could not parse request as GatewayRequest: {}", -// msg->get_payload()); -// } -// } -// } + void on_close(connection_hdl hdl) { + auto con = _server.get_con_from_hdl(hdl); + if (con) { + LOG(Http, Info, "Web client disconnected: {}", + con->get_remote_endpoint()); + std::lock_guard lock(_m); + _session.erase(hdl); + } + } -// void return_dotall(connection_ptr &con) { -// std::vector files; -// auto iter = boost::filesystem::directory_iterator(_conf); -// auto end = boost::filesystem::directory_iterator(); -// // Collect all .conf file -// for (; iter != end; ++iter) { -// auto ext = iter->path().filename().string().substr( -// iter->path().filename().stem().size()); -// if (boost::iequals(ext, ".conf")) { -// files.push_back(iter->path()); -// } -// } -// // Sort them so we at least it's stable -// std::sort(files.begin(), files.end()); -// // Concatanate -// std::string body; -// for (const auto &p : files) { -// body += "##########################\n"; -// body += "## " + p.filename().string(); -// body += "\n##########################\n"; -// body += read_file(p.string()); -// } + void on_message(connection_hdl hdl, WsServer::message_ptr msg) { + std::lock_guard lock(_m); + auto iter = _session.find(hdl); + if (iter != _session.end()) { + GatewayRequest request; + if (request.ParseFromString(msg->get_payload())) { + iter->second.handle( + request, [this, hdl](const GatewayResponse &response) { + websocketpp::lib::error_code ec; + _server.send( + hdl, response.SerializeAsString(), + websocketpp::frame::opcode::binary, ec); + if (ec) { + LOG(Http, Warn, "Error sending from websocket: '{}'", + ec.message()); + } + }); + } else { + LOG(Http, Info, "Could not parse request as GatewayRequest: {}", + msg->get_payload()); + } + } + } -// con->set_body(body); -// con->set_status(websocketpp::http::status_code::ok); -// } + void return_dotall(connection_ptr &con) { + std::vector files; + auto iter = boost::filesystem::directory_iterator(_conf); + auto end = boost::filesystem::directory_iterator(); + // Collect all .conf file + for (; iter != end; ++iter) { + auto ext = iter->path().filename().string().substr( + iter->path().filename().stem().size()); + if (boost::iequals(ext, ".conf")) { + files.push_back(iter->path()); + } + } + // Sort them so we at least it's stable + std::sort(files.begin(), files.end()); + // Concatanate + std::string body; + for (const auto &p : files) { + body += "##########################\n"; + body += "## " + p.filename().string(); + body += "\n##########################\n"; + body += read_file(p.string()); + } -// void return_metrics(connection_ptr &con) { -// utils::TimeStamp start = utils::TimeStamp::now(); -// std::stringstream ss; -// _metrics.print(ss); -// con->set_body(ss.str()); -// con->set_status(websocketpp::http::status_code::ok); -// _mtimer->observe( -// (utils::TimeStamp::now() - start).microseconds() / 1000.0); -// } + con->set_body(body); + con->set_status(websocketpp::http::status_code::ok); + } -// void return_perf_trace_data(connection_ptr &con, size_t max_rows) { -// utils::TimeStamp start = utils::TimeStamp::now(); -// std::stringstream ss; -// _perf_log.print_latest_traces(ss, max_rows); -// con->set_body(ss.str()); -// con->set_status(websocketpp::http::status_code::ok); -// _mtimer->observe( -// (utils::TimeStamp::now() - start).microseconds() / 1000.0); -// } + void return_metrics(connection_ptr &con) { + utils::TimeStamp start = utils::TimeStamp::now(); + std::stringstream ss; + _metrics.print(ss); + con->set_body(ss.str()); + con->set_status(websocketpp::http::status_code::ok); + _mtimer->observe( + (utils::TimeStamp::now() - start).microseconds() / 1000.0); + } -// void bad_request(connection_ptr &con, const std::string &message) { -// con->set_body(message); -// con->set_status(websocketpp::http::status_code::bad_request); -// } + void return_perf_trace_data(connection_ptr &con, size_t max_rows) { + utils::TimeStamp start = utils::TimeStamp::now(); + std::stringstream ss; + _perf_log.print_latest_traces(ss, max_rows); + con->set_body(ss.str()); + con->set_status(websocketpp::http::status_code::ok); + _mtimer->observe( + (utils::TimeStamp::now() - start).microseconds() / 1000.0); + } -// std::vector -// split_string(std::string body, std::string &deliniator) { -// std::vector result; -// size_t i = body.find(deliniator); -// while (i != std::string::npos) { -// result.push_back(body.substr(0, i)); -// body = body.substr(i + deliniator.size()); -// i = body.find(deliniator); -// } -// return result; -// } + void bad_request(connection_ptr &con, const std::string &message) { + con->set_body(message); + con->set_status(websocketpp::http::status_code::bad_request); + } -// void handle_file_upload(connection_ptr &con) { -// auto content_type = con->get_request_header("Content-Type"); -// auto data = decode_form_data(content_type, con->get_request_body()); -// if (data) { -// for (const auto &part : data.value().parts) { -// if (!part.filename.empty()) { -// LOG(Http, Info, "Received file upload: {}", part.filename); -// } -// } -// } else { -// LOG(Http, Warn, -// "Failed to decode form data. Ensure you are using " -// "'enctype=\"multipart/form-data\"'"); -// } + std::vector + split_string(std::string body, std::string &deliniator) { + std::vector result; + size_t i = body.find(deliniator); + while (i != std::string::npos) { + result.push_back(body.substr(0, i)); + body = body.substr(i + deliniator.size()); + i = body.find(deliniator); + } + return result; + } -// con->set_body("got it"); -// con->set_status(websocketpp::http::status_code::ok); -// } + void handle_file_upload(connection_ptr &con) { + auto content_type = con->get_request_header("Content-Type"); + auto data = decode_form_data(content_type, con->get_request_body()); + if (data) { + for (const auto &part : data.value().parts) { + if (!part.filename.empty()) { + LOG(Http, Info, "Received file upload: {}", part.filename); + } + } + } else { + LOG(Http, Warn, + "Failed to decode form data. Ensure you are using " + "'enctype=\"multipart/form-data\"'"); + } -// bool require_authentication( -// connection_ptr &con, -// const std::string &username, -// const std::string &password) { -// auto auth = con->get_request_header("Authorization"); -// if (!auth.empty() && auth.size() >= 7 && -// boost::iequals(auth.substr(0, 6), "Basic ")) { -// auto b64 = auth.substr(6); -// auto decoded = websocketpp::base64_decode(b64); -// auto colon = decoded.find(':'); -// if (colon != std::string::npos) { -// auto user = decoded.substr(0, colon); -// auto pass = decoded.substr(colon + 1); -// if (user == username && pass == password) -// return true; -// } -// } + con->set_body("got it"); + con->set_status(websocketpp::http::status_code::ok); + } -// // Failed -// con->append_header("WWW-Authenticate", "Basic realm=\"BTS\""); -// con->set_status(websocketpp::http::status_code::unauthorized); -// con->set_body("Not Authorized"); -// return false; -// } + bool require_authentication( + connection_ptr &con, + const std::string &username, + const std::string &password) { + auto auth = con->get_request_header("Authorization"); + if (!auth.empty() && auth.size() >= 7 && + boost::iequals(auth.substr(0, 6), "Basic ")) { + auto b64 = auth.substr(6); + auto decoded = websocketpp::base64_decode(b64); + auto colon = decoded.find(':'); + if (colon != std::string::npos) { + auto user = decoded.substr(0, colon); + auto pass = decoded.substr(colon + 1); + if (user == username && pass == password) + return true; + } + } -// void check_auth_and_return_info(connection_ptr &con) { -// if (require_authentication( -// con, "bts", "bbb835af-b1ea-42d3-8be1-fd9d5555530d")) { -// auto horrible_json = get_server_info(_ctx); -// con->set_body(horrible_json); -// con->set_status(websocketpp::http::status_code::ok); -// } -// } + // Failed + con->append_header("WWW-Authenticate", "Basic realm=\"BTS\""); + con->set_status(websocketpp::http::status_code::unauthorized); + con->set_body("Not Authorized"); + return false; + } -// void directory_index( -// connection_ptr &con, -// const std::string &resource, -// const boost::filesystem::path &path) { -// // directory listing -// std::string body = "\n"; -// body += ""; -// body += "\n"; -// body += "\n"; -// body += "\n"; -// body += "

Index of " + resource + "

\n"; -// auto iter = boost::filesystem::directory_iterator(path); -// auto end = boost::filesystem::directory_iterator(); -// body += "\n"; -// body += "\n"; -// con->set_status(websocketpp::http::status_code::ok); -// con->set_body(body); -// } + void check_auth_and_return_info(connection_ptr &con) { + if (require_authentication( + con, "bts", "bbb835af-b1ea-42d3-8be1-fd9d5555530d")) { + auto horrible_json = get_server_info(_ctx); + con->set_body(horrible_json); + con->set_status(websocketpp::http::status_code::ok); + } + } -// boost::filesystem::path web_ui_path(const boost::filesystem::path &root) { -// auto reldir = root / "web/ui"; -// if (boost::filesystem::exists(reldir)) -// return reldir; -// reldir = root / "ui"; -// if (boost::filesystem::exists(reldir)) -// return reldir; -// if (root.has_parent_path()) -// return web_ui_path(root.parent_path()); -// return _www; -// } + void directory_index( + connection_ptr &con, + const std::string &resource, + const boost::filesystem::path &path) { + // directory listing + std::string body = "\n"; + body += ""; + body += "\n"; + body += "\n"; + body += "\n"; + body += "

Index of " + resource + "

\n"; + auto iter = boost::filesystem::directory_iterator(path); + auto end = boost::filesystem::directory_iterator(); + body += "\n"; + body += "\n"; + con->set_status(websocketpp::http::status_code::ok); + con->set_body(body); + } -// boost::filesystem::path map_path_to_filesystem(const std::string &resource) { -// std::string config = "/config"; -// std::string files = "/files"; -// std::string perf_trace = "/perf_trace"; -// std::string docs = "/docs"; + boost::filesystem::path web_ui_path(const boost::filesystem::path &root) { + auto reldir = root / "web/ui"; + if (boost::filesystem::exists(reldir)) + return reldir; + reldir = root / "ui"; + if (boost::filesystem::exists(reldir)) + return reldir; + if (root.has_parent_path()) + return web_ui_path(root.parent_path()); + return _www; + } -// if (resource.compare(0, config.size(), config) == 0) { -// return _conf + resource.substr(config.size()); -// } else if (resource.compare(0, files.size(), files) == 0) { -// return _www + resource.substr(files.size()); -// } else if (resource.compare(0, perf_trace.size(), perf_trace) == 0) { -// return os::sparkd_wd() + "/data_files" + resource; -// } else if (resource.compare(0, docs.size(), docs) == 0) { -// return os::sparkd_wd() + "/web" + resource; -// } -// return web_ui_path(os::get_install_path()) / resource; -// } + boost::filesystem::path map_path_to_filesystem(const std::string &resource) { + std::string config = "/config"; + std::string files = "/files"; + std::string perf_trace = "/perf_trace"; + std::string docs = "/docs"; -// void return_file(connection_ptr &con, const boost::filesystem::path &path) { -// con->set_body(read_file(path.string())); -// con->set_status(websocketpp::http::status_code::ok); -// } + if (resource.compare(0, config.size(), config) == 0) { + return _conf + resource.substr(config.size()); + } else if (resource.compare(0, files.size(), files) == 0) { + return _www + resource.substr(files.size()); + } else if (resource.compare(0, perf_trace.size(), perf_trace) == 0) { + return os::sparkd_wd() + "/data_files" + resource; + } else if (resource.compare(0, docs.size(), docs) == 0) { + return os::sparkd_wd() + "/web" + resource; + } + return web_ui_path(os::get_install_path()) / resource; + } -// void return_bts_installer(connection_ptr &con) { -// std::string installer_bits = read_file(_www + "/bts_installer.exe"); -// const std::string installer_config = _www + "install_config.json"; -// if (boost::filesystem::is_regular_file(installer_config)) { -// auto conf = read_file(installer_config); -// std::string needle = "$HOST"; -// std::size_t pos; -// do { -// pos = conf.find(needle, 0); -// if (pos != std::string::npos) { -// auto host = con->get_uri()->get_host(); -// conf.replace(pos, needle.size(), host); -// } -// } while (pos != std::string::npos); -// installer_bits += conf; -// } -// con->set_body(installer_bits); -// con->set_status(websocketpp::http::status_code::ok); -// } + void return_file(connection_ptr &con, const boost::filesystem::path &path) { + con->set_body(read_file(path.string())); + con->set_status(websocketpp::http::status_code::ok); + } -// std::string strip_query_str(const std::string &request) { -// auto position = request.find("?"); -// if (position != std::string::npos) { -// return request.substr(0, position); -// } -// return request; -// } + void return_bts_installer(connection_ptr &con) { + std::string installer_bits = read_file(_www + "/bts_installer.exe"); + const std::string installer_config = _www + "install_config.json"; + if (boost::filesystem::is_regular_file(installer_config)) { + auto conf = read_file(installer_config); + std::string needle = "$HOST"; + std::size_t pos; + do { + pos = conf.find(needle, 0); + if (pos != std::string::npos) { + auto host = con->get_uri()->get_host(); + conf.replace(pos, needle.size(), host); + } + } while (pos != std::string::npos); + installer_bits += conf; + } + con->set_body(installer_bits); + con->set_status(websocketpp::http::status_code::ok); + } -// void on_http(connection_hdl hdl) { -// auto con = _server.get_con_from_hdl(hdl); -// auto resource = strip_query_str(con->get_resource()); -// LOG(Http, Diag, "HTTP GET: {}", resource); -// if (boost::iequals(resource, "/config/.all")) { -// return_dotall(con); -// } else if (boost::iequals(resource, "/metrics")) { -// return_metrics(con); -// } else if (boost::iequals(resource, "/perf_trace_data")) { -// return_perf_trace_data(con, 1000); -// } else if (std::regex_match( -// resource, std::regex("/perf_trace_data/(\\d++)"))) { -// std::regex rx = std::regex("/perf_trace_data/(\\d++)"); -// std::smatch matches; -// if (std::regex_match(resource, matches, rx)) { -// auto max_rows = std::atoi(matches[1].str().c_str()); -// return_perf_trace_data(con, max_rows); -// } else -// return_perf_trace_data(con, 1000); -// } else if (boost::iequals(resource, "/server_info")) { -// check_auth_and_return_info(con); -// } else if ( -// boost::iequals(resource, "/bts_installer.exe") && -// boost::filesystem::is_regular_file(_www + "/bts_installer.exe")) { -// return_bts_installer(con); -// } else if (boost::iequals(resource, "/robots.txt")) { -// con->set_status(websocketpp::http::status_code::ok); -// std::string body = "User-agent: *\nDisallow: /"; -// con->set_body(body); -// } else if (boost::iequals(resource, "/upload")) { -// handle_file_upload(con); -// } else { -// auto path = map_path_to_filesystem(resource); -// if (boost::filesystem::is_directory(path)) { -// auto index = path / "index.html"; -// if (boost::filesystem::is_regular_file(index)) { -// return_file(con, index); -// } else { -// directory_index(con, resource, path); -// } -// } else if (boost::filesystem::is_regular_file(path)) { -// return_file(con, path); -// } else { -// con->set_status(websocketpp::http::status_code::not_found); -// con->set_body("Cannot find " + resource); -// } -// } -// } -// }; + std::string strip_query_str(const std::string &request) { + auto position = request.find("?"); + if (position != std::string::npos) { + return request.substr(0, position); + } + return request; + } -// SparkWebServer::SparkWebServer( -// const api::ServiceContext &ctx, -// metrics::MetricsContainer &metrics, -// trace::PerfLog &l, -// int port) -// : _me(std::make_shared(ctx, metrics, l, port)) {} + void on_http(connection_hdl hdl) { + auto con = _server.get_con_from_hdl(hdl); + auto resource = strip_query_str(con->get_resource()); + LOG(Http, Diag, "HTTP GET: {}", resource); + if (boost::iequals(resource, "/config/.all")) { + return_dotall(con); + } else if (boost::iequals(resource, "/metrics")) { + return_metrics(con); + } else if (boost::iequals(resource, "/perf_trace_data")) { + return_perf_trace_data(con, 1000); + } else if (std::regex_match( + resource, std::regex("/perf_trace_data/(\\d++)"))) { + std::regex rx = std::regex("/perf_trace_data/(\\d++)"); + std::smatch matches; + if (std::regex_match(resource, matches, rx)) { + auto max_rows = std::atoi(matches[1].str().c_str()); + return_perf_trace_data(con, max_rows); + } else + return_perf_trace_data(con, 1000); + } else if (boost::iequals(resource, "/server_info")) { + check_auth_and_return_info(con); + } else if ( + boost::iequals(resource, "/bts_installer.exe") && + boost::filesystem::is_regular_file(_www + "/bts_installer.exe")) { + return_bts_installer(con); + } else if (boost::iequals(resource, "/robots.txt")) { + con->set_status(websocketpp::http::status_code::ok); + std::string body = "User-agent: *\nDisallow: /"; + con->set_body(body); + } else if (boost::iequals(resource, "/upload")) { + handle_file_upload(con); + } else { + auto path = map_path_to_filesystem(resource); + if (boost::filesystem::is_directory(path)) { + auto index = path / "index.html"; + if (boost::filesystem::is_regular_file(index)) { + return_file(con, index); + } else { + directory_index(con, resource, path); + } + } else if (boost::filesystem::is_regular_file(path)) { + return_file(con, path); + } else { + con->set_status(websocketpp::http::status_code::not_found); + con->set_body("Cannot find " + resource); + } + } + } +}; -// } // namespace http -// } // namespace bts +SparkWebServer::SparkWebServer( + const api::ServiceContext &ctx, + metrics::MetricsContainer &metrics, + trace::PerfLog &l, + int port) + : _me(std::make_shared(ctx, metrics, l, port)) {} + +} // namespace http +} // namespace bts From 723442227cbf51e0e79db885d503513a1abed257 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 19 Nov 2021 14:36:05 -0500 Subject: [PATCH 100/100] Update externals to include new websocketpp --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 5d2136fae..deb80e672 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 5d2136faeeb098516471fcfcc16e6924efc1a88f +Subproject commit deb80e67290e1f430dddff50a929b7c6ae130184