From c0021e2f382336be712940f4b1f28ef7c35b9b4c Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Tue, 13 Apr 2021 19:05:47 +0200 Subject: [PATCH 1/7] modernize-use-override --- benchmark/benchmark.cpp | 4 +- .../src/lsp/feature_language_features.h | 6 +- .../src/lsp/feature_text_synchronization.h | 4 +- .../src/lsp/feature_workspace_folders.h | 4 +- language_server/test/dispatcher_test.cpp | 10 +-- language_server/test/regress_test.cpp | 2 +- language_server/test/request_manager_test.cpp | 8 +-- .../checking/data_definition/data_def_types.h | 72 +++++++++---------- .../src/checking/instruction_checker.h | 4 +- parser_library/src/context/macro_param_data.h | 14 ++-- .../ordinary_assembly_context.h | 2 +- .../src/context/variables/macro_param.h | 8 +-- .../src/context/variables/set_symbol.h | 8 +-- .../src/context/variables/system_variable.h | 16 ++--- .../src/debugging/attribute_variable.h | 12 ++-- .../src/debugging/debug_lib_provider.h | 4 +- .../src/debugging/macro_param_variable.h | 12 ++-- .../src/debugging/ordinary_symbol_variable.h | 12 ++-- .../src/debugging/set_symbol_variable.h | 6 +- parser_library/src/diagnosable_ctx.h | 2 +- parser_library/src/diagnosable_impl.h | 6 +- .../conditional_assembly/ca_operator_binary.h | 8 +-- .../conditional_assembly/ca_operator_unary.h | 12 ++-- .../src/expressions/data_definition.h | 2 +- .../src/expressions/evaluation_context.h | 2 +- .../src/expressions/mach_operator.h | 13 ++-- .../src/expressions/nominal_value.h | 6 +- parser_library/src/lexing/input_source.h | 2 +- parser_library/src/lexing/token_stream.h | 8 +-- parser_library/src/parsing/error_strategy.h | 8 +-- .../src/parsing/parser_error_listener.h | 12 ++-- .../src/parsing/parser_error_listener_ctx.h | 4 +- parser_library/src/parsing/parser_impl.h | 2 +- .../src/processing/context_manager.h | 4 +- .../instruction_sets/asm_processor.h | 2 +- .../instruction_sets/ca_processor.h | 2 +- .../data_def_postponed_statement.h | 4 +- .../instruction_sets/instruction_processor.h | 2 +- .../instruction_sets/low_language_processor.h | 2 +- .../instruction_sets/mach_processor.h | 2 +- .../instruction_sets/macro_processor.h | 2 +- .../postponed_statement_impl.h | 2 +- .../statement_processors/copy_processor.h | 12 ++-- .../statement_processors/empty_processor.h | 12 ++-- .../lookahead_processor.h | 12 ++-- .../statement_processors/macrodef_processor.h | 12 ++-- .../copy_statement_provider.h | 4 +- .../macro_statement_provider.h | 4 +- .../members_statement_provider.h | 2 +- .../src/semantics/concatenation_term.h | 10 +-- .../src/semantics/variable_symbol.h | 4 +- parser_library/src/workspace_manager_impl.h | 2 +- parser_library/src/workspaces/file_impl.h | 24 +++---- .../data_definition/data_definition_common.h | 2 +- .../test/debugging/debugger_test.cpp | 5 +- .../test/expressions/ca_constant_test.cpp | 2 +- .../test/expressions/ca_function_test.cpp | 12 ++-- parser_library/test/expressions/expr_mocks.h | 2 +- parser_library/test/lsp/lsp_features_test.cpp | 4 +- parser_library/test/message_consumer_mock.h | 2 +- parser_library/test/metrics_test.cpp | 8 +-- parser_library/test/mock_parse_lib_provider.h | 6 +- .../test/workspace/load_config_test.cpp | 18 ++--- .../test/workspace/workspace_test.cpp | 4 +- .../test/workspace_manager_test.cpp | 2 +- 65 files changed, 238 insertions(+), 244 deletions(-) diff --git a/benchmark/benchmark.cpp b/benchmark/benchmark.cpp index 76e8f7ec3..5a731bdad 100644 --- a/benchmark/benchmark.cpp +++ b/benchmark/benchmark.cpp @@ -62,7 +62,7 @@ using json = nlohmann::json; class diagnostic_counter : public hlasm_plugin::parser_library::diagnostics_consumer { public: - virtual void consume_diagnostics(hlasm_plugin::parser_library::diagnostic_list diagnostics) override + void consume_diagnostics(hlasm_plugin::parser_library::diagnostic_list diagnostics) override { for (size_t i = 0; i < diagnostics.diagnostics_size(); i++) { @@ -81,7 +81,7 @@ class diagnostic_counter : public hlasm_plugin::parser_library::diagnostics_cons class metrics_collector : public hlasm_plugin::parser_library::performance_metrics_consumer { public: - virtual void consume_performance_metrics(const hlasm_plugin::parser_library::performance_metrics& metrics) override + void consume_performance_metrics(const hlasm_plugin::parser_library::performance_metrics& metrics) override { metrics_ = metrics; } diff --git a/language_server/src/lsp/feature_language_features.h b/language_server/src/lsp/feature_language_features.h index 26f251a47..f04715f32 100644 --- a/language_server/src/lsp/feature_language_features.h +++ b/language_server/src/lsp/feature_language_features.h @@ -30,9 +30,9 @@ class feature_language_features : public feature public: feature_language_features(parser_library::workspace_manager& ws_mngr, response_provider& response_provider); - void virtual register_methods(std::map& methods) override; - json virtual register_capabilities() override; - void virtual initialize_feature(const json& initialise_params) override; + void register_methods(std::map& methods) override; + json register_capabilities() override; + void initialize_feature(const json& initialise_params) override; private: void definition(const json& id, const json& params); diff --git a/language_server/src/lsp/feature_text_synchronization.h b/language_server/src/lsp/feature_text_synchronization.h index d76a731f9..7b2ded4bf 100644 --- a/language_server/src/lsp/feature_text_synchronization.h +++ b/language_server/src/lsp/feature_text_synchronization.h @@ -42,9 +42,9 @@ class feature_text_synchronization : public feature // Adds the implemented methods into the map. void register_methods(std::map& methods) override; // Returns set capabilities connected with text synchonization - json virtual register_capabilities() override; + json register_capabilities() override; // Does nothing, not needed. - void virtual initialize_feature(const json& initialise_params) override; + void initialize_feature(const json& initialise_params) override; private: // Handles textDocument/didOpen notification. diff --git a/language_server/src/lsp/feature_workspace_folders.h b/language_server/src/lsp/feature_workspace_folders.h index 898315966..b3dd4895a 100644 --- a/language_server/src/lsp/feature_workspace_folders.h +++ b/language_server/src/lsp/feature_workspace_folders.h @@ -34,9 +34,9 @@ class feature_workspace_folders : public feature // Adds workspace/* methods to the map. void register_methods(std::map&) override; // Returns workspaces capability. - json virtual register_capabilities() override; + json register_capabilities() override; // Opens workspace specified in the initialize request. - void virtual initialize_feature(const json& initialise_params) override; + void initialize_feature(const json& initialise_params) override; private: // Handles workspace/didChangeWorkspaceFolders notification. diff --git a/language_server/test/dispatcher_test.cpp b/language_server/test/dispatcher_test.cpp index 4ae7e9c9f..9eff629a5 100644 --- a/language_server/test/dispatcher_test.cpp +++ b/language_server/test/dispatcher_test.cpp @@ -37,11 +37,11 @@ class server_mock : public server std::vector messages; - virtual void request(const json&, const std::string&, const json&, method) override {} - virtual void respond(const json&, const std::string&, const json&) override {} - virtual void notify(const std::string&, const json&) override {} - virtual void respond_error(const json&, const std::string&, int, const std::string&, const json&) override {} - virtual void message_received(const json& message) override + void request(const json&, const std::string&, const json&, method) override {} + void respond(const json&, const std::string&, const json&) override {} + void notify(const std::string&, const json&) override {} + void respond_error(const json&, const std::string&, int, const std::string&, const json&) override {} + void message_received(const json& message) override { ++counter; if (counter == messages_limit) diff --git a/language_server/test/regress_test.cpp b/language_server/test/regress_test.cpp index e8d5924a3..1c6d7afe4 100644 --- a/language_server/test/regress_test.cpp +++ b/language_server/test/regress_test.cpp @@ -29,7 +29,7 @@ using server_notification = std::pair; class message_provider_mock : public send_message_provider { public: - virtual void reply(const json& result) override { notfs.push_back(result); } + void reply(const json& result) override { notfs.push_back(result); } std::vector notfs; }; diff --git a/language_server/test/request_manager_test.cpp b/language_server/test/request_manager_test.cpp index 857bb9bf8..caaf5b410 100644 --- a/language_server/test/request_manager_test.cpp +++ b/language_server/test/request_manager_test.cpp @@ -43,10 +43,10 @@ class server_mock_rm : public server } } - virtual void request(const json&, const std::string&, const json&, method) override {} - virtual void respond(const json&, const std::string&, const json&) override {} - virtual void notify(const std::string&, const json&) override {} - virtual void respond_error(const json&, const std::string&, int, const std::string&, const json&) override {} + void request(const json&, const std::string&, const json&, method) override {} + void respond(const json&, const std::string&, const json&) override {} + void notify(const std::string&, const json&) override {} + void respond_error(const json&, const std::string&, int, const std::string&, const json&) override {} int messages_received = 0; diff --git a/parser_library/src/checking/data_definition/data_def_types.h b/parser_library/src/checking/data_definition/data_def_types.h index 872930e2b..34a5d3356 100644 --- a/parser_library/src/checking/data_definition/data_def_types.h +++ b/parser_library/src/checking/data_definition/data_def_types.h @@ -27,12 +27,12 @@ class data_def_type_B final : public data_def_type public: data_def_type_B(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; }; class data_def_type_CA_CE : public data_def_type @@ -40,8 +40,8 @@ class data_def_type_CA_CE : public data_def_type public: data_def_type_CA_CE(char extension); - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; }; class data_def_type_C final : public data_def_type_CA_CE @@ -67,12 +67,12 @@ class data_def_type_CU final : public data_def_type public: data_def_type_CU(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; }; class data_def_type_G final : public data_def_type @@ -80,12 +80,12 @@ class data_def_type_G final : public data_def_type public: data_def_type_G(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; }; class data_def_type_X final : public data_def_type @@ -93,12 +93,12 @@ class data_def_type_X final : public data_def_type public: data_def_type_X(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; }; //************* fixed point types ***************** @@ -109,12 +109,12 @@ class data_def_type_H_F_FD : public data_def_type public: data_def_type_H_F_FD(char type, char extension, uint8_t word_length); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; protected: - virtual int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; + int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; }; class data_def_type_H final : public data_def_type_H_F_FD @@ -140,10 +140,10 @@ class data_def_type_P_Z : public data_def_type public: data_def_type_P_Z(char type); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; - virtual int16_t get_implicit_scale(const nominal_value_t& op) const override; + int16_t get_implicit_scale(const nominal_value_t& op) const override; }; class data_def_type_P final : public data_def_type_P_Z @@ -152,11 +152,11 @@ class data_def_type_P final : public data_def_type_P_Z data_def_type_P(); protected: - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; - virtual int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; + int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; }; class data_def_type_Z final : public data_def_type_P_Z @@ -165,9 +165,9 @@ class data_def_type_Z final : public data_def_type_P_Z data_def_type_Z(); protected: - virtual uint64_t get_nominal_length(const nominal_value_t& op) const override; - virtual uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; - virtual int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; + uint64_t get_nominal_length(const nominal_value_t& op) const override; + uint32_t get_nominal_length_attribute(const nominal_value_t& op) const override; + int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; }; //************* address types ***************** @@ -183,7 +183,7 @@ class data_def_type_A final : public data_def_type_A_AD_Y public: data_def_type_A(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -193,7 +193,7 @@ class data_def_type_AD final : public data_def_type_A_AD_Y public: data_def_type_AD(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -203,7 +203,7 @@ class data_def_type_Y final : public data_def_type_A_AD_Y public: data_def_type_Y(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -221,7 +221,7 @@ class data_def_type_S final : public data_def_type_S_SY public: data_def_type_S(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -231,7 +231,7 @@ class data_def_type_SY final : public data_def_type_S_SY public: data_def_type_SY(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -247,7 +247,7 @@ class data_def_type_single_symbol : public data_def_type context::alignment implicit_alignment, uint64_t implicit_length); - virtual bool expects_single_symbol() const override; + bool expects_single_symbol() const override; }; class data_def_type_R final : public data_def_type_single_symbol @@ -261,7 +261,7 @@ class data_def_type_RD final : public data_def_type_single_symbol public: data_def_type_RD(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -277,7 +277,7 @@ class data_def_type_VD final : public data_def_type_single_symbol public: data_def_type_VD(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -305,7 +305,7 @@ class data_def_type_J final : public data_def_type_single_symbol public: data_def_type_J(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -315,7 +315,7 @@ class data_def_type_JD final : public data_def_type_single_symbol public: data_def_type_JD(); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; }; @@ -333,12 +333,12 @@ class data_def_type_E_D_L : public data_def_type context::alignment align, uint64_t implicit_length); - virtual bool check(const data_definition_operand& op, + bool check(const data_definition_operand& op, const diagnostic_collector& add_diagnostic, bool check_nominal) const override; protected: - virtual int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; + int32_t get_integer_attribute_impl(uint32_t length, int32_t scale) const override; }; class data_def_type_E final : public data_def_type_E_D_L diff --git a/parser_library/src/checking/instruction_checker.h b/parser_library/src/checking/instruction_checker.h index b150c8f31..400ef51a9 100644 --- a/parser_library/src/checking/instruction_checker.h +++ b/parser_library/src/checking/instruction_checker.h @@ -40,7 +40,7 @@ class assembler_checker : public instruction_checker { public: assembler_checker(); - virtual bool check(const std::string& instruction_name, + bool check(const std::string& instruction_name, const std::vector& operand_vector, const range& stmt_range, const diagnostic_collector& add_diagnostic) const override; @@ -56,7 +56,7 @@ class assembler_checker : public instruction_checker class machine_checker : public instruction_checker { public: - virtual bool check(const std::string& instruction_name, + bool check(const std::string& instruction_name, const std::vector& operand_vector, const range& stmt_range, const diagnostic_collector& add_diagnostic) const override; diff --git a/parser_library/src/context/macro_param_data.h b/parser_library/src/context/macro_param_data.h index 922ef0183..09ff8a799 100644 --- a/parser_library/src/context/macro_param_data.h +++ b/parser_library/src/context/macro_param_data.h @@ -64,7 +64,7 @@ class macro_param_data_dummy : public macro_param_data_component // gets this dummy const macro_param_data_component* get_ith(size_t idx) const override; - virtual size_t size() const override; + size_t size() const override; }; // class representing data of macro parameters holding only single string (=C_t) @@ -74,13 +74,13 @@ class macro_param_data_single : public macro_param_data_component public: // returns whole data, here the only string - virtual const C_t& get_value() const override; + const C_t& get_value() const override; // gets value of the idx-th value, when exceeds size of data, returns default value // get_ith(0) returns this to mimic HLASM - virtual const macro_param_data_component* get_ith(size_t idx) const override; + const macro_param_data_component* get_ith(size_t idx) const override; - virtual size_t size() const override; + size_t size() const override; macro_param_data_single(C_t value); }; @@ -93,12 +93,12 @@ class macro_param_data_composite : public macro_param_data_component public: // returns data of all nested classes in brackets separated by comma - virtual const C_t& get_value() const override; + const C_t& get_value() const override; // gets value of the idx-th value, when exceeds size of data, returns default value - virtual const macro_param_data_component* get_ith(size_t idx) const override; + const macro_param_data_component* get_ith(size_t idx) const override; - virtual size_t size() const override; + size_t size() const override; macro_param_data_composite(std::vector value); }; diff --git a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h index b975bd48d..ad87d9beb 100644 --- a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h +++ b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h @@ -62,7 +62,7 @@ class ordinary_assembly_context : public dependency_solver const symbol* get_symbol_reference(context::id_index name) const; // gets symbol by name - virtual const symbol* get_symbol(id_index name) const override; + const symbol* get_symbol(id_index name) const override; symbol* get_symbol(id_index name); // access current section diff --git a/parser_library/src/context/variables/macro_param.h b/parser_library/src/context/variables/macro_param.h index ade231048..6aee91606 100644 --- a/parser_library/src/context/variables/macro_param.h +++ b/parser_library/src/context/variables/macro_param.h @@ -48,9 +48,9 @@ class macro_param_base : public variable_symbol virtual const macro_param_data_component* get_data(const std::vector& offset) const; // N' attribute of the symbol - virtual A_t number(std::vector offset) const override; + A_t number(std::vector offset) const override; // K' attribute of the symbol - virtual A_t count(std::vector offset) const override; + A_t count(std::vector offset) const override; virtual size_t size(std::vector offset) const; @@ -73,7 +73,7 @@ class keyword_param : public macro_param_base const macro_data_shared_ptr default_data; protected: - virtual const macro_param_data_component* real_data() const override; + const macro_param_data_component* real_data() const override; }; // represents macro param with default value, name and no position, keyword param @@ -87,7 +87,7 @@ class positional_param : public macro_param_base positional_param(id_index name, size_t position, const macro_param_data_component& assigned_value); protected: - virtual const macro_param_data_component* real_data() const override; + const macro_param_data_component* real_data() const override; }; } // namespace context diff --git a/parser_library/src/context/variables/set_symbol.h b/parser_library/src/context/variables/set_symbol.h index d8a829e33..553988406 100644 --- a/parser_library/src/context/variables/set_symbol.h +++ b/parser_library/src/context/variables/set_symbol.h @@ -111,17 +111,17 @@ class set_symbol : public set_symbol_base } // N' attribute of the symbol - virtual A_t number(std::vector) const override + A_t number(std::vector) const override { return (A_t)(is_scalar || data.empty() ? 0 : data.rbegin()->first + 1); } // K' attribute of the symbol - virtual A_t count(std::vector offset) const override; + A_t count(std::vector offset) const override; - virtual size_t size() const override { return data.size(); }; + size_t size() const override { return data.size(); }; - virtual std::vector keys() const override + std::vector keys() const override { std::vector keys; keys.reserve(data.size()); diff --git a/parser_library/src/context/variables/system_variable.h b/parser_library/src/context/variables/system_variable.h index 4d94e9df0..cea5d9042 100644 --- a/parser_library/src/context/variables/system_variable.h +++ b/parser_library/src/context/variables/system_variable.h @@ -33,24 +33,24 @@ class system_variable : public macro_param_base system_variable(id_index name, macro_data_ptr value, bool is_global); // gets value of data where parameter is list of nested data offsets - virtual const C_t& get_value(const std::vector& offset) const override; + const C_t& get_value(const std::vector& offset) const override; // gets value of data where parameter is offset to data field - virtual const C_t& get_value(size_t idx) const override; + const C_t& get_value(size_t idx) const override; // gets value of whole macro parameter - virtual const C_t& get_value() const override; + const C_t& get_value() const override; // gets param struct - virtual const macro_param_data_component* get_data(const std::vector& offset) const override; + const macro_param_data_component* get_data(const std::vector& offset) const override; // N' attribute of the symbol - virtual A_t number(std::vector offset) const override; + A_t number(std::vector offset) const override; // K' attribute of the symbol - virtual A_t count(std::vector offset) const override; + A_t count(std::vector offset) const override; - virtual size_t size(std::vector offset) const override; + size_t size(std::vector offset) const override; protected: - virtual const macro_param_data_component* real_data() const override; + const macro_param_data_component* real_data() const override; }; } // namespace context diff --git a/parser_library/src/debugging/attribute_variable.h b/parser_library/src/debugging/attribute_variable.h index 299d35cc6..c2547abf3 100644 --- a/parser_library/src/debugging/attribute_variable.h +++ b/parser_library/src/debugging/attribute_variable.h @@ -26,16 +26,16 @@ class attribute_variable : public variable public: attribute_variable(std::string name, std::string value); - virtual set_type type() const override; + set_type type() const override; - virtual bool is_scalar() const override; + bool is_scalar() const override; - virtual std::vector values() const override; - virtual size_t size() const override; + std::vector values() const override; + size_t size() const override; protected: - virtual const std::string& get_string_value() const override; - virtual const std::string& get_string_name() const override; + const std::string& get_string_value() const override; + const std::string& get_string_name() const override; }; diff --git a/parser_library/src/debugging/debug_lib_provider.h b/parser_library/src/debugging/debug_lib_provider.h index d6e9f90a9..25dca25f5 100644 --- a/parser_library/src/debugging/debug_lib_provider.h +++ b/parser_library/src/debugging/debug_lib_provider.h @@ -31,7 +31,7 @@ class debug_lib_provider : public workspaces::parse_lib_provider : ws_(ws) {} - virtual workspaces::parse_result parse_library( + workspaces::parse_result parse_library( const std::string& library, analyzing_context ctx, const workspaces::library_data data) override { auto& proc_grp = ws_.get_proc_grp_by_program(ctx.hlasm_ctx->opencode_file_name()); @@ -45,7 +45,7 @@ class debug_lib_provider : public workspaces::parse_lib_provider return false; } - virtual bool has_library(const std::string& library, const std::string& program) const override + bool has_library(const std::string& library, const std::string& program) const override { auto& proc_grp = ws_.get_proc_grp_by_program(program); for (auto&& lib : proc_grp.libraries()) diff --git a/parser_library/src/debugging/macro_param_variable.h b/parser_library/src/debugging/macro_param_variable.h index a383dc475..6b6fdd506 100644 --- a/parser_library/src/debugging/macro_param_variable.h +++ b/parser_library/src/debugging/macro_param_variable.h @@ -26,16 +26,16 @@ class macro_param_variable : public variable { public: macro_param_variable(const context::macro_param_base& param, std::vector index); - virtual set_type type() const override; + set_type type() const override; - virtual bool is_scalar() const override; + bool is_scalar() const override; - virtual std::vector values() const override; - virtual size_t size() const override; + std::vector values() const override; + size_t size() const override; protected: - virtual const std::string& get_string_value() const override; - virtual const std::string& get_string_name() const override; + const std::string& get_string_value() const override; + const std::string& get_string_name() const override; private: const context::macro_param_base& macro_param_; diff --git a/parser_library/src/debugging/ordinary_symbol_variable.h b/parser_library/src/debugging/ordinary_symbol_variable.h index 909c0468e..c7325a758 100644 --- a/parser_library/src/debugging/ordinary_symbol_variable.h +++ b/parser_library/src/debugging/ordinary_symbol_variable.h @@ -28,16 +28,16 @@ class ordinary_symbol_variable : public variable ordinary_symbol_variable(const context::symbol& symbol); - virtual set_type type() const override; + set_type type() const override; - virtual bool is_scalar() const override; + bool is_scalar() const override; - virtual std::vector values() const override; - virtual size_t size() const override; + std::vector values() const override; + size_t size() const override; protected: - virtual const std::string& get_string_value() const override; - virtual const std::string& get_string_name() const override; + const std::string& get_string_value() const override; + const std::string& get_string_name() const override; private: const context::symbol& symbol_; diff --git a/parser_library/src/debugging/set_symbol_variable.h b/parser_library/src/debugging/set_symbol_variable.h index 6cdc195a6..0fa56307c 100644 --- a/parser_library/src/debugging/set_symbol_variable.h +++ b/parser_library/src/debugging/set_symbol_variable.h @@ -34,12 +34,12 @@ class set_symbol_variable : public variable bool is_scalar() const override; - virtual std::vector values() const override; + std::vector values() const override; size_t size() const override; protected: - virtual const std::string& get_string_value() const override; - virtual const std::string& get_string_name() const override; + const std::string& get_string_value() const override; + const std::string& get_string_name() const override; private: template diff --git a/parser_library/src/diagnosable_ctx.h b/parser_library/src/diagnosable_ctx.h index e62afa508..d19f5d8d3 100644 --- a/parser_library/src/diagnosable_ctx.h +++ b/parser_library/src/diagnosable_ctx.h @@ -28,7 +28,7 @@ class diagnosable_ctx : public diagnosable_impl context::hlasm_context& ctx_; public: - virtual void add_diagnostic(diagnostic_s diagnostic) const override + void add_diagnostic(diagnostic_s diagnostic) const override { add_diagnostic_inner( diagnostic_op( diff --git a/parser_library/src/diagnosable_impl.h b/parser_library/src/diagnosable_impl.h index e261d4a6c..d05f888a0 100644 --- a/parser_library/src/diagnosable_impl.h +++ b/parser_library/src/diagnosable_impl.h @@ -25,7 +25,7 @@ template class collectable_impl : public virtual collectable { public: - virtual typename collectable::diagnostic_container& diags() const override { return container; } + typename collectable::diagnostic_container& diags() const override { return container; } protected: // Collects diagnostics from one collectable: calls its collect_diags @@ -46,9 +46,9 @@ class collectable_impl : public virtual collectable } } - virtual void add_diagnostic(T diagnostic) const override { container.push_back(std::move(diagnostic)); } + void add_diagnostic(T diagnostic) const override { container.push_back(std::move(diagnostic)); } - virtual bool is_once_only() const override { return true; } + bool is_once_only() const override { return true; } virtual ~collectable_impl() {}; diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h b/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h index 04ca7a760..760625557 100644 --- a/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h +++ b/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h @@ -54,8 +54,7 @@ class ca_basic_binary_operator : public ca_binary_operator : ca_binary_operator(std::move(left_expr), std::move(right_expr), OP::type, std::move(expr_range)) {} - virtual context::SET_t operation( - context::SET_t lhs, context::SET_t rhs, const evaluation_context& eval_ctx) const override + context::SET_t operation(context::SET_t lhs, context::SET_t rhs, const evaluation_context& eval_ctx) const override { return OP::operation(std::move(lhs), std::move(rhs), expr_range, eval_ctx); } @@ -73,10 +72,9 @@ class ca_function_binary_operator : public ca_binary_operator context::SET_t_enum expr_kind, range expr_range); - virtual void resolve_expression_tree(context::SET_t_enum kind) override; + void resolve_expression_tree(context::SET_t_enum kind) override; - virtual context::SET_t operation( - context::SET_t lhs, context::SET_t rhs, const evaluation_context& eval_ctx) const override; + context::SET_t operation(context::SET_t lhs, context::SET_t rhs, const evaluation_context& eval_ctx) const override; static int compare_string(const context::C_t& lhs, const context::C_t& rhs); static int compare_relational(const context::SET_t& lhs, const context::SET_t& rhs, context::SET_t_enum type); diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h b/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h index 313d06ff4..6fbf6ec5f 100644 --- a/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h +++ b/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h @@ -47,7 +47,7 @@ class ca_plus_operator : public ca_unary_operator public: ca_plus_operator(ca_expr_ptr expr, range expr_range); - virtual context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; + context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; }; class ca_minus_operator : public ca_unary_operator @@ -55,7 +55,7 @@ class ca_minus_operator : public ca_unary_operator public: ca_minus_operator(ca_expr_ptr expr, range expr_range); - virtual context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; + context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; }; class ca_par_operator : public ca_unary_operator @@ -63,9 +63,9 @@ class ca_par_operator : public ca_unary_operator public: ca_par_operator(ca_expr_ptr expr, range expr_range); - virtual void resolve_expression_tree(context::SET_t_enum kind) override; + void resolve_expression_tree(context::SET_t_enum kind) override; - virtual context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; + context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; }; // NOT, BYTE, ... @@ -76,9 +76,9 @@ class ca_function_unary_operator : public ca_unary_operator ca_function_unary_operator(ca_expr_ptr expr, ca_expr_ops function, context::SET_t_enum expr_kind, range expr_range); - virtual void resolve_expression_tree(context::SET_t_enum kind) override; + void resolve_expression_tree(context::SET_t_enum kind) override; - virtual context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; + context::SET_t operation(context::SET_t operand, const evaluation_context& eval_ctx) const override; }; } // namespace hlasm_plugin::parser_library::expressions diff --git a/parser_library/src/expressions/data_definition.h b/parser_library/src/expressions/data_definition.h index cb0fee012..c795d1d7a 100644 --- a/parser_library/src/expressions/data_definition.h +++ b/parser_library/src/expressions/data_definition.h @@ -72,7 +72,7 @@ struct data_definition : public diagnosable_op_impl, public context::dependable position begin); // Returns conjunction of all dependencies of all expression in data_definition. - virtual context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; + context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; // Returns conjunction of dependencies of length modifier and duplication factor, which are the only ones // that matter when determining how much space DC needs. context::dependency_collector get_length_dependencies(context::dependency_solver& solver) const; diff --git a/parser_library/src/expressions/evaluation_context.h b/parser_library/src/expressions/evaluation_context.h index 3c83bbcac..82b7441aa 100644 --- a/parser_library/src/expressions/evaluation_context.h +++ b/parser_library/src/expressions/evaluation_context.h @@ -38,7 +38,7 @@ struct evaluation_context : diagnosable_ctx evaluation_context(const evaluation_context&) = delete; - virtual void collect_diags() const override + void collect_diags() const override { // nothing to collect } diff --git a/parser_library/src/expressions/mach_operator.h b/parser_library/src/expressions/mach_operator.h index cb9fdb15a..688c66858 100644 --- a/parser_library/src/expressions/mach_operator.h +++ b/parser_library/src/expressions/mach_operator.h @@ -50,7 +50,7 @@ class mach_expr_binary final : public mach_expression right_->fill_location_counter(std::move(addr)); } - virtual void apply(mach_expr_visitor& visitor) const override + void apply(mach_expr_visitor& visitor) const override { left_->apply(visitor); right_->apply(visitor); @@ -83,16 +83,13 @@ class mach_expr_unary final : public mach_expression context::dependency_collector get_dependencies(mach_evaluate_info info) const override; - virtual value_t evaluate(mach_evaluate_info info) const override; + value_t evaluate(mach_evaluate_info info) const override; - virtual void fill_location_counter(context::address addr) override - { - child_->fill_location_counter(std::move(addr)); - } + void fill_location_counter(context::address addr) override { child_->fill_location_counter(std::move(addr)); } - virtual void apply(mach_expr_visitor& visitor) const override { child_->apply(visitor); } + void apply(mach_expr_visitor& visitor) const override { child_->apply(visitor); } - virtual const mach_expression* leftmost_term() const override { return child_->leftmost_term(); } + const mach_expression* leftmost_term() const override { return child_->leftmost_term(); } void collect_diags() const override { collect_diags_from_child(*child_); } }; diff --git a/parser_library/src/expressions/nominal_value.h b/parser_library/src/expressions/nominal_value.h index 69dd76bdf..142e21370 100644 --- a/parser_library/src/expressions/nominal_value.h +++ b/parser_library/src/expressions/nominal_value.h @@ -36,7 +36,7 @@ using nominal_value_ptr = std::unique_ptr; struct nominal_value_string final : public nominal_value_t { - virtual context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; + context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; nominal_value_string(std::string value, range rng); std::string value; @@ -46,7 +46,7 @@ struct nominal_value_string final : public nominal_value_t // Represents address in the form D(B) struct address_nominal : public context::dependable { - virtual context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; + context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; address_nominal(); address_nominal(mach_expr_ptr displacement, mach_expr_ptr base); mach_expr_ptr displacement; @@ -58,7 +58,7 @@ using expr_or_address_list = std::vector; struct nominal_value_exprs final : public nominal_value_t { - virtual context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; + context::dependency_collector get_dependencies(context::dependency_solver& solver) const override; nominal_value_exprs(expr_or_address_list exprs); expr_or_address_list exprs; diff --git a/parser_library/src/lexing/input_source.h b/parser_library/src/lexing/input_source.h index a610f2036..7b620dcdb 100644 --- a/parser_library/src/lexing/input_source.h +++ b/parser_library/src/lexing/input_source.h @@ -42,7 +42,7 @@ class input_source : public antlr4::ANTLRInputStream input_source& operator=(input_source&&) = delete; input_source(input_source&&) = delete; - virtual std::string getText(const antlr4::misc::Interval& interval) override; + std::string getText(const antlr4::misc::Interval& interval) override; virtual ~input_source() = default; }; diff --git a/parser_library/src/lexing/token_stream.h b/parser_library/src/lexing/token_stream.h index d86dc9f5d..476a30f01 100644 --- a/parser_library/src/lexing/token_stream.h +++ b/parser_library/src/lexing/token_stream.h @@ -54,16 +54,16 @@ class token_stream : public antlr4::BufferedTokenStream void rewind_input(lexer::stream_position pos); - virtual void reset() override; + void reset() override; // prepares this object to append more tokens void append(); protected: - virtual ssize_t adjustSeekIndex(size_t i) override; + ssize_t adjustSeekIndex(size_t i) override; - virtual antlr4::Token* LB(size_t k) override; + antlr4::Token* LB(size_t k) override; - virtual void setup() override; + void setup() override; bool is_on_channel(antlr4::Token* token); diff --git a/parser_library/src/parsing/error_strategy.h b/parser_library/src/parsing/error_strategy.h index d2c3cd0b4..199b11f42 100644 --- a/parser_library/src/parsing/error_strategy.h +++ b/parser_library/src/parsing/error_strategy.h @@ -29,7 +29,7 @@ enum tokens // copied from antlr4::DefaultErrorStrategy. class error_strategy : public antlr4::DefaultErrorStrategy { - virtual void reportError(antlr4::Parser* recognizer, const antlr4::RecognitionException& e) override + void reportError(antlr4::Parser* recognizer, const antlr4::RecognitionException& e) override { if (inErrorRecoveryMode(recognizer)) { @@ -61,7 +61,7 @@ class error_strategy : public antlr4::DefaultErrorStrategy } } - virtual antlr4::Token* getMissingSymbol(antlr4::Parser* recognizer) override + antlr4::Token* getMissingSymbol(antlr4::Parser* recognizer) override { using namespace antlr4; @@ -104,9 +104,9 @@ class error_strategy : public antlr4::DefaultErrorStrategy return _errorSymbols.back().get(); } - virtual antlr4::Token* singleTokenDeletion(antlr4::Parser*) override { return nullptr; } + antlr4::Token* singleTokenDeletion(antlr4::Parser*) override { return nullptr; } - virtual bool singleTokenInsertion(antlr4::Parser*) override { return false; } + bool singleTokenInsertion(antlr4::Parser*) override { return false; } std::vector> _errorSymbols; }; diff --git a/parser_library/src/parsing/parser_error_listener.h b/parser_library/src/parsing/parser_error_listener.h index 7265dd8c7..60126c50e 100644 --- a/parser_library/src/parsing/parser_error_listener.h +++ b/parser_library/src/parsing/parser_error_listener.h @@ -27,14 +27,14 @@ namespace hlasm_plugin::parser_library::parsing { class parser_error_listener_base : public antlr4::ANTLRErrorListener { public: - virtual void syntaxError(antlr4::Recognizer* recognizer, + void syntaxError(antlr4::Recognizer* recognizer, antlr4::Token* offendingSymbol, size_t line, size_t charPositionInLine, const std::string& msg, std::exception_ptr e) override; - virtual void reportAmbiguity(antlr4::Parser* recognizer, + void reportAmbiguity(antlr4::Parser* recognizer, const antlr4::dfa::DFA& dfa, size_t startIndex, size_t stopIndex, @@ -42,14 +42,14 @@ class parser_error_listener_base : public antlr4::ANTLRErrorListener const antlrcpp::BitSet& ambigAlts, antlr4::atn::ATNConfigSet* configs) override; - virtual void reportAttemptingFullContext(antlr4::Parser* recognizer, + void reportAttemptingFullContext(antlr4::Parser* recognizer, const antlr4::dfa::DFA& dfa, size_t startIndex, size_t stopIndex, const antlrcpp::BitSet& conflictingAlts, antlr4::atn::ATNConfigSet* configs) override; - virtual void reportContextSensitivity(antlr4::Parser* recognizer, + void reportContextSensitivity(antlr4::Parser* recognizer, const antlr4::dfa::DFA& dfa, size_t startIndex, size_t stopIndex, @@ -66,10 +66,10 @@ class parser_error_listener : public parser_error_listener_base, public diagnosa public: parser_error_listener(std::string file_name); - virtual void collect_diags() const override; + void collect_diags() const override; protected: - virtual void add_parser_diagnostic( + void add_parser_diagnostic( range diagnostic_range, diagnostic_severity severity, std::string code, std::string message) override; private: diff --git a/parser_library/src/parsing/parser_error_listener_ctx.h b/parser_library/src/parsing/parser_error_listener_ctx.h index cec21c27a..ae778f2d4 100644 --- a/parser_library/src/parsing/parser_error_listener_ctx.h +++ b/parser_library/src/parsing/parser_error_listener_ctx.h @@ -30,10 +30,10 @@ class parser_error_listener_ctx : public parser_error_listener_base, public diag std::optional substituted, semantics::range_provider provider = semantics::range_provider()); - virtual void collect_diags() const override; + void collect_diags() const override; protected: - virtual void add_parser_diagnostic( + void add_parser_diagnostic( range diagnostic_range, diagnostic_severity severity, std::string code, std::string message) override; private: diff --git a/parser_library/src/parsing/parser_impl.h b/parser_library/src/parsing/parser_impl.h index 2baa04db3..70e818d4f 100644 --- a/parser_library/src/parsing/parser_impl.h +++ b/parser_library/src/parsing/parser_impl.h @@ -137,7 +137,7 @@ class parser_impl : public antlr4::Parser, void parse_operands(const std::string& text, range text_range); void parse_lookahead_operands(const std::string& text, range text_range); - virtual antlr4::misc::IntervalSet getExpectedTokens() override; + antlr4::misc::IntervalSet getExpectedTokens() override; }; // structure containing parser components diff --git a/parser_library/src/processing/context_manager.h b/parser_library/src/processing/context_manager.h index fee85ebf5..67777dc26 100644 --- a/parser_library/src/processing/context_manager.h +++ b/parser_library/src/processing/context_manager.h @@ -48,10 +48,10 @@ class context_manager : public diagnosable_ctx bool test_symbol_for_read( const context::var_sym_ptr& var, const std::vector& subscript, range symbol_range) const; - virtual void collect_diags() const override; + void collect_diags() const override; private: - virtual void add_diagnostic(diagnostic_s diagnostic) const override; + void add_diagnostic(diagnostic_s diagnostic) const override; }; } // namespace hlasm_plugin::parser_library::processing diff --git a/parser_library/src/processing/instruction_sets/asm_processor.h b/parser_library/src/processing/instruction_sets/asm_processor.h index 3bc360379..de7d39f84 100644 --- a/parser_library/src/processing/instruction_sets/asm_processor.h +++ b/parser_library/src/processing/instruction_sets/asm_processor.h @@ -35,7 +35,7 @@ class asm_processor : public low_language_processor workspaces::parse_lib_provider& lib_provider, statement_fields_parser& parser); - virtual void process(context::shared_stmt_ptr stmt) override; + void process(context::shared_stmt_ptr stmt) override; static void process_copy(const semantics::complete_statement& stmt, analyzing_context ctx, diff --git a/parser_library/src/processing/instruction_sets/ca_processor.h b/parser_library/src/processing/instruction_sets/ca_processor.h index 037f2c857..f6975f7d8 100644 --- a/parser_library/src/processing/instruction_sets/ca_processor.h +++ b/parser_library/src/processing/instruction_sets/ca_processor.h @@ -36,7 +36,7 @@ class ca_processor : public instruction_processor workspaces::parse_lib_provider& lib_provider, processing_state_listener& listener); - virtual void process(context::shared_stmt_ptr stmt) override; + void process(context::shared_stmt_ptr stmt) override; private: process_table_t create_table(context::hlasm_context& hlasm_ctx); diff --git a/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h b/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h index 40f99befc..7bb393378 100644 --- a/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h +++ b/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h @@ -33,7 +33,7 @@ struct data_def_postponed_statement : public postponed_statement_impl, public co // Inherited via resolvable - virtual context::dependency_collector get_dependencies(context::dependency_solver& solver) const override + context::dependency_collector get_dependencies(context::dependency_solver& solver) const override { context::dependency_collector conjunction; for (const auto& op : operands_ref().value) @@ -65,7 +65,7 @@ struct data_def_postponed_statement : public postponed_statement_impl, public co return (int32_t)len; } - virtual context::symbol_value resolve(context::dependency_solver& solver) const override + context::symbol_value resolve(context::dependency_solver& solver) const override { return get_operands_length(operands_ref().value, solver); } diff --git a/parser_library/src/processing/instruction_sets/instruction_processor.h b/parser_library/src/processing/instruction_sets/instruction_processor.h index a146aa95c..6f9c919c6 100644 --- a/parser_library/src/processing/instruction_sets/instruction_processor.h +++ b/parser_library/src/processing/instruction_sets/instruction_processor.h @@ -34,7 +34,7 @@ class instruction_processor : public diagnosable_ctx { virtual void process(context::shared_stmt_ptr stmt) = 0; - virtual void collect_diags() const override { collect_diags_from_child(eval_ctx); } + void collect_diags() const override { collect_diags_from_child(eval_ctx); } protected: analyzing_context ctx; diff --git a/parser_library/src/processing/instruction_sets/low_language_processor.h b/parser_library/src/processing/instruction_sets/low_language_processor.h index 6343e9bc5..f6fb6860a 100644 --- a/parser_library/src/processing/instruction_sets/low_language_processor.h +++ b/parser_library/src/processing/instruction_sets/low_language_processor.h @@ -31,7 +31,7 @@ class low_language_processor : public instruction_processor, public context::loc checking::instruction_checker& checker, const diagnosable_ctx& diagnoser); - virtual void resolve_unknown_loctr_dependency( + void resolve_unknown_loctr_dependency( context::space_ptr sp, const context::address& addr, range err_range) override; protected: diff --git a/parser_library/src/processing/instruction_sets/mach_processor.h b/parser_library/src/processing/instruction_sets/mach_processor.h index 463f724c0..5e087bf41 100644 --- a/parser_library/src/processing/instruction_sets/mach_processor.h +++ b/parser_library/src/processing/instruction_sets/mach_processor.h @@ -32,7 +32,7 @@ class mach_processor : public low_language_processor workspaces::parse_lib_provider& lib_provider, statement_fields_parser& parser); - virtual void process(context::shared_stmt_ptr stmt) override; + void process(context::shared_stmt_ptr stmt) override; }; } // namespace processing diff --git a/parser_library/src/processing/instruction_sets/macro_processor.h b/parser_library/src/processing/instruction_sets/macro_processor.h index 86bef99a8..f6285800c 100644 --- a/parser_library/src/processing/instruction_sets/macro_processor.h +++ b/parser_library/src/processing/instruction_sets/macro_processor.h @@ -36,7 +36,7 @@ class macro_processor : public instruction_processor macro_processor( analyzing_context ctx, branching_provider& branch_provider, workspaces::parse_lib_provider& lib_provider); - virtual void process(context::shared_stmt_ptr stmt) override; + void process(context::shared_stmt_ptr stmt) override; static context::macro_data_ptr string_to_macrodata(std::string data); diff --git a/parser_library/src/processing/instruction_sets/postponed_statement_impl.h b/parser_library/src/processing/instruction_sets/postponed_statement_impl.h index f302c12ea..1709b1a47 100644 --- a/parser_library/src/processing/instruction_sets/postponed_statement_impl.h +++ b/parser_library/src/processing/instruction_sets/postponed_statement_impl.h @@ -43,7 +43,7 @@ struct postponed_statement_impl : public context::postponed_statement, public re const op_code& opcode_ref() const override { return stmt.opcode_ref(); } processing_format format_ref() const override { return stmt.format_ref(); } - const context::processing_stack_t& location_stack() const { return stmt_location_stack; } + const context::processing_stack_t& location_stack() const override { return stmt_location_stack; } }; diff --git a/parser_library/src/processing/statement_processors/copy_processor.h b/parser_library/src/processing/statement_processors/copy_processor.h index 775bd0d3f..ebc725244 100644 --- a/parser_library/src/processing/statement_processors/copy_processor.h +++ b/parser_library/src/processing/statement_processors/copy_processor.h @@ -38,13 +38,13 @@ class copy_processor : public statement_processor public: copy_processor(analyzing_context ctx, processing_state_listener& listener, copy_start_data start); - virtual processing_status get_processing_status(const semantics::instruction_si& instruction) const override; - virtual void process_statement(context::shared_stmt_ptr statement) override; - virtual void end_processing() override; - virtual bool terminal_condition(const statement_provider_kind kind) const override; - virtual bool finished() override; + processing_status get_processing_status(const semantics::instruction_si& instruction) const override; + void process_statement(context::shared_stmt_ptr statement) override; + void end_processing() override; + bool terminal_condition(const statement_provider_kind kind) const override; + bool finished() override; - virtual void collect_diags() const override; + void collect_diags() const override; private: void process_MACRO(); diff --git a/parser_library/src/processing/statement_processors/empty_processor.h b/parser_library/src/processing/statement_processors/empty_processor.h index 36916df3b..e7f118f7e 100644 --- a/parser_library/src/processing/statement_processors/empty_processor.h +++ b/parser_library/src/processing/statement_processors/empty_processor.h @@ -26,13 +26,13 @@ class empty_processor : public statement_processor { public: empty_processor(analyzing_context ctx); - virtual processing_status get_processing_status(const semantics::instruction_si& instruction) const override; - virtual void process_statement(context::shared_stmt_ptr statement) override; - virtual void end_processing() override; - virtual bool terminal_condition(const statement_provider_kind kind) const override; - virtual bool finished() override; + processing_status get_processing_status(const semantics::instruction_si& instruction) const override; + void process_statement(context::shared_stmt_ptr statement) override; + void end_processing() override; + bool terminal_condition(const statement_provider_kind kind) const override; + bool finished() override; - virtual void collect_diags() const override; + void collect_diags() const override; }; } // namespace processing diff --git a/parser_library/src/processing/statement_processors/lookahead_processor.h b/parser_library/src/processing/statement_processors/lookahead_processor.h index e05a69673..f559e1feb 100644 --- a/parser_library/src/processing/statement_processors/lookahead_processor.h +++ b/parser_library/src/processing/statement_processors/lookahead_processor.h @@ -48,13 +48,13 @@ class lookahead_processor : public statement_processor workspaces::parse_lib_provider& lib_provider, lookahead_start_data start); - virtual processing_status get_processing_status(const semantics::instruction_si& instruction) const override; - virtual void process_statement(context::shared_stmt_ptr statement) override; - virtual void end_processing() override; - virtual bool terminal_condition(const statement_provider_kind kind) const override; - virtual bool finished() override; + processing_status get_processing_status(const semantics::instruction_si& instruction) const override; + void process_statement(context::shared_stmt_ptr statement) override; + void end_processing() override; + bool terminal_condition(const statement_provider_kind kind) const override; + bool finished() override; - virtual void collect_diags() const override; + void collect_diags() const override; private: void process_MACRO(); diff --git a/parser_library/src/processing/statement_processors/macrodef_processor.h b/parser_library/src/processing/statement_processors/macrodef_processor.h index e2807991d..7544e285c 100644 --- a/parser_library/src/processing/statement_processors/macrodef_processor.h +++ b/parser_library/src/processing/statement_processors/macrodef_processor.h @@ -52,16 +52,16 @@ class macrodef_processor : public statement_processor workspaces::parse_lib_provider& provider, macrodef_start_data start); - virtual processing_status get_processing_status(const semantics::instruction_si& instruction) const override; - virtual void process_statement(context::shared_stmt_ptr statement) override; - virtual void end_processing() override; - virtual bool terminal_condition(const statement_provider_kind kind) const override; - virtual bool finished() override; + processing_status get_processing_status(const semantics::instruction_si& instruction) const override; + void process_statement(context::shared_stmt_ptr statement) override; + void end_processing() override; + bool terminal_condition(const statement_provider_kind kind) const override; + bool finished() override; static processing_status get_macro_processing_status( const semantics::instruction_si& instruction, context::hlasm_context& hlasm_ctx); - virtual void collect_diags() const override; + void collect_diags() const override; private: void process_statement(const context::hlasm_statement& statement); diff --git a/parser_library/src/processing/statement_providers/copy_statement_provider.h b/parser_library/src/processing/statement_providers/copy_statement_provider.h index 8ddd0e4c0..a98e0fc6a 100644 --- a/parser_library/src/processing/statement_providers/copy_statement_provider.h +++ b/parser_library/src/processing/statement_providers/copy_statement_provider.h @@ -28,10 +28,10 @@ class copy_statement_provider : public members_statement_provider workspaces::parse_lib_provider& lib_provider, processing::processing_state_listener& listener); - virtual bool finished() const override; + bool finished() const override; protected: - virtual context::statement_cache* get_next() override; + context::statement_cache* get_next() override; }; } // namespace hlasm_plugin::parser_library::processing diff --git a/parser_library/src/processing/statement_providers/macro_statement_provider.h b/parser_library/src/processing/statement_providers/macro_statement_provider.h index 13c808d0f..c2f6f06e7 100644 --- a/parser_library/src/processing/statement_providers/macro_statement_provider.h +++ b/parser_library/src/processing/statement_providers/macro_statement_provider.h @@ -30,10 +30,10 @@ class macro_statement_provider : public members_statement_provider workspaces::parse_lib_provider& lib_provider, processing::processing_state_listener& listener); - virtual bool finished() const override; + bool finished() const override; protected: - virtual context::statement_cache* get_next() override; + context::statement_cache* get_next() override; }; } // namespace processing diff --git a/parser_library/src/processing/statement_providers/members_statement_provider.h b/parser_library/src/processing/statement_providers/members_statement_provider.h index ccc987f6a..e3530551f 100644 --- a/parser_library/src/processing/statement_providers/members_statement_provider.h +++ b/parser_library/src/processing/statement_providers/members_statement_provider.h @@ -33,7 +33,7 @@ class members_statement_provider : public statement_provider workspaces::parse_lib_provider& lib_provider, processing::processing_state_listener& listener); - virtual context::shared_stmt_ptr get_next(const statement_processor& processor) override; + context::shared_stmt_ptr get_next(const statement_processor& processor) override; protected: analyzing_context ctx; diff --git a/parser_library/src/semantics/concatenation_term.h b/parser_library/src/semantics/concatenation_term.h index cf3119491..e558a5757 100644 --- a/parser_library/src/semantics/concatenation_term.h +++ b/parser_library/src/semantics/concatenation_term.h @@ -31,7 +31,7 @@ struct char_str_conc : concatenation_point std::string value; range conc_range; - virtual std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; + std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; }; // concatenation point representing variable symbol @@ -41,7 +41,7 @@ struct var_sym_conc : concatenation_point vs_ptr symbol; - virtual std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; + std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; static std::string evaluate(context::SET_t varsym_value); }; @@ -51,7 +51,7 @@ struct dot_conc : concatenation_point { dot_conc(); - virtual std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; + std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; }; // concatenation point representing equals sign @@ -59,7 +59,7 @@ struct equals_conc : concatenation_point { equals_conc(); - virtual std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; + std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; }; // concatenation point representing macro operand sublist @@ -69,7 +69,7 @@ struct sublist_conc : concatenation_point std::vector list; - virtual std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; + std::string evaluate(const expressions::evaluation_context& eval_ctx) const override; }; } // namespace hlasm_plugin::parser_library::semantics diff --git a/parser_library/src/semantics/variable_symbol.h b/parser_library/src/semantics/variable_symbol.h index 5353ecb88..83c24e3e0 100644 --- a/parser_library/src/semantics/variable_symbol.h +++ b/parser_library/src/semantics/variable_symbol.h @@ -66,7 +66,7 @@ struct basic_variable_symbol : variable_symbol const context::id_index name; - virtual context::id_index evaluate_name(const expressions::evaluation_context& eval_ctx) const; + context::id_index evaluate_name(const expressions::evaluation_context& eval_ctx) const override; }; struct created_variable_symbol : variable_symbol @@ -76,7 +76,7 @@ struct created_variable_symbol : variable_symbol const concat_chain created_name; - virtual context::id_index evaluate_name(const expressions::evaluation_context& eval_ctx) const; + context::id_index evaluate_name(const expressions::evaluation_context& eval_ctx) const override; }; } // namespace hlasm_plugin::parser_library::semantics diff --git a/parser_library/src/workspace_manager_impl.h b/parser_library/src/workspace_manager_impl.h index c0fe4872b..7b087d38d 100644 --- a/parser_library/src/workspace_manager_impl.h +++ b/parser_library/src/workspace_manager_impl.h @@ -199,7 +199,7 @@ class workspace_manager::impl : public diagnosable_impl } private: - virtual void collect_diags() const override + void collect_diags() const override { collect_diags_from_child(file_manager_); diff --git a/parser_library/src/workspaces/file_impl.h b/parser_library/src/workspaces/file_impl.h index b02534572..7df4dae53 100644 --- a/parser_library/src/workspaces/file_impl.h +++ b/parser_library/src/workspaces/file_impl.h @@ -36,18 +36,18 @@ class file_impl : public virtual file, public virtual diagnosable_impl file_impl(file_impl&&) = default; file_impl& operator=(file_impl&&) = default; - virtual void collect_diags() const override; - - virtual const file_uri& get_file_name() override; - virtual const std::string& get_text() override; - virtual version_t get_version() override; - virtual bool update_and_get_bad() override; - virtual bool get_lsp_editing() override; - - virtual void did_open(std::string new_text, version_t version) override; - virtual void did_change(std::string new_text) override; - virtual void did_change(range range, std::string new_text) override; - virtual void did_close() override; + void collect_diags() const override; + + const file_uri& get_file_name() override; + const std::string& get_text() override; + version_t get_version() override; + bool update_and_get_bad() override; + bool get_lsp_editing() override; + + void did_open(std::string new_text, version_t version) override; + void did_change(std::string new_text) override; + void did_change(range range, std::string new_text) override; + void did_close() override; static std::string replace_non_utf8_chars(const std::string& text); static std::vector create_line_indices(const std::string& text); diff --git a/parser_library/test/checking/data_definition/data_definition_common.h b/parser_library/test/checking/data_definition/data_definition_common.h index 39017c3cc..d6832aa33 100644 --- a/parser_library/test/checking/data_definition/data_definition_common.h +++ b/parser_library/test/checking/data_definition/data_definition_common.h @@ -34,7 +34,7 @@ class diag_collector : public diagnosable_ctx : diagnosable_ctx(ctx) {} // Inherited via diagnosable_ctx - virtual void collect_diags() const override {}; + void collect_diags() const override {}; context::hlasm_context ctx; }; diff --git a/parser_library/test/debugging/debugger_test.cpp b/parser_library/test/debugging/debugger_test.cpp index 9aef9ef12..fb3dff7de 100644 --- a/parser_library/test/debugging/debugger_test.cpp +++ b/parser_library/test/debugging/debugger_test.cpp @@ -252,8 +252,7 @@ class workspace_mock : public workspace : workspace(file_mngr, config) {} - virtual parse_result parse_library( - const std::string& library, analyzing_context ctx, const library_data data) override + parse_result parse_library(const std::string& library, analyzing_context ctx, const library_data data) override { std::shared_ptr found = get_file_manager().add_processor_file(library); if (found) @@ -261,7 +260,7 @@ class workspace_mock : public workspace return false; } - virtual const asm_option& get_asm_options(const std::string&) + const asm_option& get_asm_options(const std::string&) override { asm_opts = { "SEVEN", "" }; return asm_opts; diff --git a/parser_library/test/expressions/ca_constant_test.cpp b/parser_library/test/expressions/ca_constant_test.cpp index f4ebf6982..debdd4d8b 100644 --- a/parser_library/test/expressions/ca_constant_test.cpp +++ b/parser_library/test/expressions/ca_constant_test.cpp @@ -36,7 +36,7 @@ TEST(ca_constant, undefined_attributes) class collectable_mock : public diagnosable_op_impl { - virtual void collect_diags() const override {} + void collect_diags() const override {} }; TEST(ca_constant, self_def_term_invalid_input) diff --git a/parser_library/test/expressions/ca_function_test.cpp b/parser_library/test/expressions/ca_function_test.cpp index 74eeaedf7..98f680f04 100644 --- a/parser_library/test/expressions/ca_function_test.cpp +++ b/parser_library/test/expressions/ca_function_test.cpp @@ -61,17 +61,17 @@ class set_expr : public ca_expression , value(std::move(value)) {} - virtual undef_sym_set get_undefined_attributed_symbols(const evaluation_context&) const override { return {}; }; + undef_sym_set get_undefined_attributed_symbols(const evaluation_context&) const override { return {}; }; - virtual void resolve_expression_tree(context::SET_t_enum) override {} + void resolve_expression_tree(context::SET_t_enum) override {} - virtual bool is_character_expression() const override { return false; } + bool is_character_expression() const override { return false; } - virtual void apply(ca_expr_visitor&) const override {} + void apply(ca_expr_visitor&) const override {} - virtual context::SET_t evaluate(const evaluation_context&) const override { return value; } + context::SET_t evaluate(const evaluation_context&) const override { return value; } - virtual void collect_diags() const override {} + void collect_diags() const override {} }; class ca_func : public ::testing::TestWithParam diff --git a/parser_library/test/expressions/expr_mocks.h b/parser_library/test/expressions/expr_mocks.h index c77ceafe9..4650a010c 100644 --- a/parser_library/test/expressions/expr_mocks.h +++ b/parser_library/test/expressions/expr_mocks.h @@ -22,7 +22,7 @@ using namespace hlasm_plugin::parser_library; class dep_sol_mock : public context::dependency_solver { - virtual const context::symbol* get_symbol(context::id_index) const { return nullptr; }; + const context::symbol* get_symbol(context::id_index) const override { return nullptr; }; }; class lib_prov_mock : public workspaces::parse_lib_provider diff --git a/parser_library/test/lsp/lsp_features_test.cpp b/parser_library/test/lsp/lsp_features_test.cpp index 1b3cff7eb..355b28682 100644 --- a/parser_library/test/lsp/lsp_features_test.cpp +++ b/parser_library/test/lsp/lsp_features_test.cpp @@ -31,8 +31,8 @@ class lsp_features_test : public testing::Test + context::instruction::assembler_instructions.size() + context::instruction::ca_instructions.size() + context::instruction::mnemonic_codes.size()) {}; - virtual void SetUp() { a.analyze(); } - virtual void TearDown() {} + void SetUp() override { a.analyze(); } + void TearDown() override {} protected: const std::string contents = diff --git a/parser_library/test/message_consumer_mock.h b/parser_library/test/message_consumer_mock.h index 01189cb61..208e4068d 100644 --- a/parser_library/test/message_consumer_mock.h +++ b/parser_library/test/message_consumer_mock.h @@ -22,7 +22,7 @@ namespace hlasm_plugin::parser_library { class message_consumer_mock : public hlasm_plugin::parser_library::message_consumer { public: - virtual void show_message(const std::string& message, message_type type) override + void show_message(const std::string& message, message_type type) override { messages.push_back(std::make_pair(message, type)); } diff --git a/parser_library/test/metrics_test.cpp b/parser_library/test/metrics_test.cpp index 8b2b58b38..a1c76de80 100644 --- a/parser_library/test/metrics_test.cpp +++ b/parser_library/test/metrics_test.cpp @@ -26,7 +26,7 @@ using namespace hlasm_plugin::parser_library; class metrics_mock : public performance_metrics_consumer { public: - virtual void consume_performance_metrics(const performance_metrics& metrics) { metrics_ = metrics; } + void consume_performance_metrics(const performance_metrics& metrics) override { metrics_ = metrics; } performance_metrics metrics_; }; @@ -34,7 +34,7 @@ class metrics_mock : public performance_metrics_consumer class diagnostic_counter_mock : public hlasm_plugin::parser_library::diagnostics_consumer { public: - virtual void consume_diagnostics(hlasm_plugin::parser_library::diagnostic_list diagnostics) override + void consume_diagnostics(hlasm_plugin::parser_library::diagnostic_list diagnostics) override { for (size_t i = 0; i < diagnostics.diagnostics_size(); i++) { @@ -54,8 +54,8 @@ class benchmark_test : public testing::Test { public: benchmark_test() {}; - virtual void SetUp() {} - virtual void TearDown() {} + void SetUp() override {} + void TearDown() override {} void setUpAnalyzer(const std::string& content) { a = std::make_unique(content, SOURCE_FILE, lib_provider); diff --git a/parser_library/test/mock_parse_lib_provider.h b/parser_library/test/mock_parse_lib_provider.h index bf5479e6d..10d4c2cd7 100644 --- a/parser_library/test/mock_parse_lib_provider.h +++ b/parser_library/test/mock_parse_lib_provider.h @@ -25,7 +25,7 @@ class mock_parse_lib_provider : public workspaces::parse_lib_provider asm_option asm_options; public: - virtual workspaces::parse_result parse_library( + workspaces::parse_result parse_library( const std::string& library, analyzing_context ctx, const workspaces::library_data data) override { (void)library; @@ -42,9 +42,9 @@ class mock_parse_lib_provider : public workspaces::parse_lib_provider } return true; } - virtual bool has_library(const std::string&, const std::string&) const override { return true; } + bool has_library(const std::string&, const std::string&) const override { return true; } - virtual const asm_option& get_asm_options(const std::string&) { return asm_options; } + const asm_option& get_asm_options(const std::string&) override { return asm_options; } private: const std::string macro_contents = diff --git a/parser_library/test/workspace/load_config_test.cpp b/parser_library/test/workspace/load_config_test.cpp index 69e69d6b8..a374c399c 100644 --- a/parser_library/test/workspace/load_config_test.cpp +++ b/parser_library/test/workspace/load_config_test.cpp @@ -38,11 +38,11 @@ class file_proc_grps : public file_impl file_uri uri = "test_uri"; - virtual const file_uri& get_file_name() override { return uri; } + const file_uri& get_file_name() override { return uri; } - virtual const std::string& get_text() override { return file; } + const std::string& get_text() override { return file; } - virtual bool update_and_get_bad() override { return false; } + bool update_and_get_bad() override { return false; } std::string file = is_windows() ? R"({ @@ -108,11 +108,11 @@ class file_pgm_conf : public file_impl file_uri uri = "test_uri"; - virtual const file_uri& get_file_name() override { return uri; } + const file_uri& get_file_name() override { return uri; } - virtual const std::string& get_text() override { return file; } + const std::string& get_text() override { return file; } - virtual bool update_and_get_bad() override { return false; } + bool update_and_get_bad() override { return false; } std::string file = is_windows() ? R"({ "pgms": [ @@ -156,9 +156,9 @@ class file_manager_proc_grps_test : public file_manager_impl // Inherited via file_manager - virtual void did_open_file(const std::string&, version_t, std::string) override {} - virtual void did_change_file(const std::string&, version_t, const document_change*, size_t) override {} - virtual void did_close_file(const std::string&) override {} + void did_open_file(const std::string&, version_t, std::string) override {} + void did_change_file(const std::string&, version_t, const document_change*, size_t) override {} + void did_close_file(const std::string&) override {} }; TEST(workspace, load_config_synthetic) diff --git a/parser_library/test/workspace/workspace_test.cpp b/parser_library/test/workspace/workspace_test.cpp index 203e17950..9c971f792 100644 --- a/parser_library/test/workspace/workspace_test.cpp +++ b/parser_library/test/workspace/workspace_test.cpp @@ -240,9 +240,9 @@ class file_with_text : public processor_file_impl did_open(text, 1); } - virtual const std::string& get_text() override { return get_text_ref(); } + const std::string& get_text() override { return get_text_ref(); } - virtual bool update_and_get_bad() override { return false; } + bool update_and_get_bad() override { return false; } }; const char* faulty_macro_path = is_windows() ? "lib\\ERROR" : "lib/ERROR"; diff --git a/parser_library/test/workspace_manager_test.cpp b/parser_library/test/workspace_manager_test.cpp index cdfbb7732..e60f76b9f 100644 --- a/parser_library/test/workspace_manager_test.cpp +++ b/parser_library/test/workspace_manager_test.cpp @@ -29,7 +29,7 @@ class diag_consumer_mock : public diagnostics_consumer { public: // Inherited via diagnostics_consumer - virtual void consume_diagnostics(diagnostic_list diagnostics) override { diags = diagnostics; } + void consume_diagnostics(diagnostic_list diagnostics) override { diags = diagnostics; } diagnostic_list diags; }; From 3fa161bc3bd9494979fc314835f2447ce8c71e1e Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Tue, 13 Apr 2021 19:51:36 +0200 Subject: [PATCH 2/7] modernize-concat-nested-namespaces --- parser_library/include/parser_library.h | 7 +++---- parser_library/include/range.h | 6 ++---- parser_library/include/workspace_manager.h | 9 +++++---- parser_library/src/analyzer.h | 6 ++---- parser_library/src/checking/asm_instr_check.cpp | 8 ++------ parser_library/src/checking/asm_instr_check.h | 8 ++------ parser_library/src/checking/asm_instr_class.h | 9 ++------- .../src/checking/instruction_checker.cpp | 9 +++------ parser_library/src/checking/instruction_checker.h | 8 ++------ parser_library/src/context/code_scope.h | 8 ++------ parser_library/src/context/copy_member.h | 8 ++------ parser_library/src/context/id_storage.h | 8 ++------ parser_library/src/context/instruction.h | 9 ++------- parser_library/src/context/instruction_type.h | 8 ++------ parser_library/src/context/macro_param_data.h | 8 ++------ parser_library/src/context/operation_code.h | 9 ++------- .../src/context/ordinary_assembly/address.h | 9 ++------- .../context/ordinary_assembly/address_resolver.h | 8 ++------ .../src/context/ordinary_assembly/dependable.h | 9 ++------- .../ordinary_assembly/dependency_collector.h | 8 ++------ .../context/ordinary_assembly/location_counter.h | 9 ++------- .../ordinary_assembly/location_counter_data.h | 9 ++------- .../src/context/ordinary_assembly/section.h | 8 ++------ .../src/context/ordinary_assembly/symbol.h | 8 ++------ .../context/ordinary_assembly/symbol_attributes.h | 8 ++------ parser_library/src/context/processing_context.h | 8 ++------ parser_library/src/context/sequence_symbol.h | 8 ++------ parser_library/src/context/variables/macro_param.h | 8 ++------ .../src/context/variables/system_variable.h | 8 ++------ parser_library/src/context/variables/variable.h | 8 ++------ parser_library/src/ebcdic_encoding.h | 6 ++---- parser_library/src/error_messages.h | 6 ++---- .../src/expressions/evaluation_context.h | 8 ++------ parser_library/src/lexing/input_source.h | 9 +++------ parser_library/src/lexing/lexer.h | 9 +++------ parser_library/src/lexing/token.h | 9 +++------ parser_library/src/lexing/token_factory.h | 8 ++------ parser_library/src/lexing/token_stream.h | 8 ++------ parser_library/src/parser_library.cpp | 7 +++---- parser_library/src/parsing/parser_impl.h | 14 ++++---------- parser_library/src/parsing/parser_tools.cpp | 10 ++++------ parser_library/src/parsing/parser_tools.h | 9 +++------ parser_library/src/processing/branching_provider.h | 8 ++------ .../data_def_postponed_statement.h | 10 ++-------- .../instruction_sets/instruction_processor.h | 8 ++------ .../processing/instruction_sets/mach_processor.h | 8 ++------ .../processing/instruction_sets/macro_processor.h | 8 ++------ .../instruction_sets/postponed_statement_impl.h | 10 ++-------- parser_library/src/processing/op_code.h | 8 ++------ parser_library/src/processing/opencode_provider.h | 8 ++------ parser_library/src/processing/processing_format.h | 8 ++------ .../src/processing/processing_state_listener.h | 8 ++------ parser_library/src/processing/statement.h | 9 ++------- .../src/processing/statement_fields_parser.h | 8 ++------ .../statement_processors/copy_processing_info.h | 8 ++------ .../statement_processors/copy_processor.h | 8 ++------ .../statement_processors/empty_processor.h | 8 ++------ .../statement_providers/macro_statement_provider.h | 8 ++------ .../statement_providers/statement_provider_kind.h | 8 ++------ parser_library/src/semantics/collector.h | 8 ++------ parser_library/src/semantics/highlighting_info.h | 8 ++------ parser_library/src/semantics/range_provider.h | 8 ++------ parser_library/src/semantics/statement_fields.h | 10 ++-------- 63 files changed, 140 insertions(+), 382 deletions(-) diff --git a/parser_library/include/parser_library.h b/parser_library/include/parser_library.h index 0e903709e..0687db48e 100644 --- a/parser_library/include/parser_library.h +++ b/parser_library/include/parser_library.h @@ -25,8 +25,7 @@ #include "parser_library_export.h" -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { class PARSER_LIBRARY_EXPORT parser_library { @@ -34,8 +33,8 @@ class PARSER_LIBRARY_EXPORT parser_library parser_library() {}; void parse(const std::string&); }; -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library #endif diff --git a/parser_library/include/range.h b/parser_library/include/range.h index eef7408bc..da57cefc8 100644 --- a/parser_library/include/range.h +++ b/parser_library/include/range.h @@ -22,8 +22,7 @@ #include "parser_library_export.h" -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { using position_t = uint64_t; @@ -74,6 +73,5 @@ struct PARSER_LIBRARY_EXPORT file_range const std::string* file; }; -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library #endif diff --git a/parser_library/include/workspace_manager.h b/parser_library/include/workspace_manager.h index 5f26a03e6..0db9aab78 100644 --- a/parser_library/include/workspace_manager.h +++ b/parser_library/include/workspace_manager.h @@ -31,12 +31,13 @@ #include "parser_library_export.h" #include "protocol.h" -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { + namespace workspaces { class workspace; class parse_lib_provider; } // namespace workspaces + using ws_id = workspaces::workspace*; // Interface that can be implemented to be able to get list of @@ -106,6 +107,6 @@ class PARSER_LIBRARY_EXPORT workspace_manager private: impl* impl_; }; -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library #endif // !HLASMPLUGIN_PARSERLIBRARY_WORKSPACE_MANAGER_H diff --git a/parser_library/src/analyzer.h b/parser_library/src/analyzer.h index 045315ced..547c1c9bf 100644 --- a/parser_library/src/analyzer.h +++ b/parser_library/src/analyzer.h @@ -25,8 +25,7 @@ #include "processing/processing_manager.h" #include "workspaces/parse_lib_provider.h" -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { // this class analyzes provided text and produces diagnostics and highlighting info with respect to provided context class analyzer : public diagnosable_ctx @@ -70,6 +69,5 @@ class analyzer : public diagnosable_ctx void register_stmt_analyzer(processing::statement_analyzer* stmt_analyzer); }; -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library #endif diff --git a/parser_library/src/checking/asm_instr_check.cpp b/parser_library/src/checking/asm_instr_check.cpp index a9bdcd8b6..65936eb3f 100644 --- a/parser_library/src/checking/asm_instr_check.cpp +++ b/parser_library/src/checking/asm_instr_check.cpp @@ -17,9 +17,7 @@ #include -namespace hlasm_plugin { -namespace parser_library { -namespace checking { +namespace hlasm_plugin::parser_library::checking { xattr::xattr(const std::vector& allowed_types, const std::string& name_of_instruction) : assembler_instruction(allowed_types, name_of_instruction, 1, -1) {}; @@ -1445,6 +1443,4 @@ bool acontrol::check(const std::vector& to_check, return true; } -} // namespace checking -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::checking diff --git a/parser_library/src/checking/asm_instr_check.h b/parser_library/src/checking/asm_instr_check.h index 1c40185a7..d0a953046 100644 --- a/parser_library/src/checking/asm_instr_check.h +++ b/parser_library/src/checking/asm_instr_check.h @@ -21,9 +21,7 @@ #include "asm_instr_class.h" #include "data_definition/data_def_type_base.h" -namespace hlasm_plugin { -namespace parser_library { -namespace checking { +namespace hlasm_plugin::parser_library::checking { /* TO DO - notes - dxd, dc, ds instructions - if evaluation and control takes places before checker, these instructions need only one @@ -369,8 +367,6 @@ class process final : public assembler_instruction const diagnostic_collector& add_diagnostic) const override; }; -} // namespace checking -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::checking #endif diff --git a/parser_library/src/checking/asm_instr_class.h b/parser_library/src/checking/asm_instr_class.h index 073720355..2c2de13c8 100644 --- a/parser_library/src/checking/asm_instr_class.h +++ b/parser_library/src/checking/asm_instr_class.h @@ -25,9 +25,7 @@ #include "diagnosable.h" #include "instr_operand.h" -namespace hlasm_plugin { -namespace parser_library { -namespace checking { +namespace hlasm_plugin::parser_library::checking { // defining label types before instruction, used as parameter in assembler_instruction class enum label_types @@ -127,9 +125,6 @@ class assembler_instruction bool check_assembler_process_operand(const asm_operand* input, const diagnostic_collector& add_diagnostic) const; }; - -} // namespace checking -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::checking #endif diff --git a/parser_library/src/checking/instruction_checker.cpp b/parser_library/src/checking/instruction_checker.cpp index d613bba49..b4f2c14f6 100644 --- a/parser_library/src/checking/instruction_checker.cpp +++ b/parser_library/src/checking/instruction_checker.cpp @@ -16,9 +16,7 @@ #include -namespace hlasm_plugin { -namespace parser_library { -namespace checking { +namespace hlasm_plugin::parser_library::checking { assembler_checker::assembler_checker() { initialize_assembler_map(); } bool assembler_checker::check(const std::string& instruction_name, @@ -441,6 +439,5 @@ bool machine_checker::check(const std::string& instruction_name, return hlasm_plugin::parser_library::context::instruction::machine_instructions.at(mach_name)->check( instruction_name, ops, stmt_range, add_diagnostic); } -} // namespace checking -} // namespace parser_library -} // namespace hlasm_plugin \ No newline at end of file + +} // namespace hlasm_plugin::parser_library::checking \ No newline at end of file diff --git a/parser_library/src/checking/instruction_checker.h b/parser_library/src/checking/instruction_checker.h index 400ef51a9..34f802e00 100644 --- a/parser_library/src/checking/instruction_checker.h +++ b/parser_library/src/checking/instruction_checker.h @@ -20,9 +20,7 @@ #include "asm_instr_check.h" #include "context/instruction.h" -namespace hlasm_plugin { -namespace parser_library { -namespace checking { +namespace hlasm_plugin::parser_library::checking { // interface for unified checking class instruction_checker @@ -62,8 +60,6 @@ class machine_checker : public instruction_checker const diagnostic_collector& add_diagnostic) const override; }; -} // namespace checking -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::checking #endif diff --git a/parser_library/src/context/code_scope.h b/parser_library/src/context/code_scope.h index c9172b1ce..6c752e9b9 100644 --- a/parser_library/src/context/code_scope.h +++ b/parser_library/src/context/code_scope.h @@ -19,9 +19,7 @@ #include "variables/set_symbol.h" #include "variables/system_variable.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // helper struct for HLASM code scopes // contains locally valid set symbols, sequence symbols and pointer to macro class (if code is in any) @@ -60,7 +58,5 @@ struct code_scope macro_def_ptr this_macro_def_; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/copy_member.h b/parser_library/src/context/copy_member.h index ba8291201..efdbe6c41 100644 --- a/parser_library/src/context/copy_member.h +++ b/parser_library/src/context/copy_member.h @@ -19,9 +19,7 @@ #include "location.h" #include "statement_cache.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // structure represents invocation of COPY member in HLASM macro library struct copy_member_invocation @@ -63,7 +61,5 @@ struct copy_member copy_member_invocation enter() { return copy_member_invocation(name, cached_definition, definition_location); } }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/id_storage.h b/parser_library/src/context/id_storage.h index f5f634413..c94299771 100644 --- a/parser_library/src/context/id_storage.h +++ b/parser_library/src/context/id_storage.h @@ -18,9 +18,7 @@ #include #include -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // storage for identifiers @@ -71,9 +69,7 @@ class id_storage using id_index = id_storage::const_pointer; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/instruction.h b/parser_library/src/context/instruction.h index e41c8cc77..b6a07881e 100644 --- a/parser_library/src/context/instruction.h +++ b/parser_library/src/context/instruction.h @@ -24,9 +24,7 @@ #include "checking/instr_operand.h" #include "diagnostic.h" #include "id_storage.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // all mach_format types for operands of machine instructions: // formats with length 16 are arranged in range (0,2),formats with length 32 are arranged in range(3,20),formats with @@ -303,9 +301,6 @@ class instruction static const std::map mach_format_to_string; }; - -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/instruction_type.h b/parser_library/src/context/instruction_type.h index 88e6ad373..14d6b9992 100644 --- a/parser_library/src/context/instruction_type.h +++ b/parser_library/src/context/instruction_type.h @@ -15,9 +15,7 @@ #ifndef HLASMPLUGIN_PARSERLIBRARY_CONTEXT_INSTRUCTION_TYPE_H #define HLASMPLUGIN_PARSERLIBRARY_CONTEXT_INSTRUCTION_TYPE_H -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // enum class for all instruction types enum class instruction_type @@ -29,8 +27,6 @@ enum class instruction_type UNDEF }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/macro_param_data.h b/parser_library/src/context/macro_param_data.h index 09ff8a799..9d6615828 100644 --- a/parser_library/src/context/macro_param_data.h +++ b/parser_library/src/context/macro_param_data.h @@ -20,9 +20,7 @@ #include "common_types.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class macro_param_data_component; using macro_data_ptr = std::unique_ptr; @@ -103,7 +101,5 @@ class macro_param_data_composite : public macro_param_data_component macro_param_data_composite(std::vector value); }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/operation_code.h b/parser_library/src/context/operation_code.h index b5d6f44d5..54c2ff568 100644 --- a/parser_library/src/context/operation_code.h +++ b/parser_library/src/context/operation_code.h @@ -19,10 +19,7 @@ #include "instruction.h" #include "macro.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { - +namespace hlasm_plugin::parser_library::context { // structure that represents operation code of an instruction struct opcode_t @@ -41,9 +38,7 @@ struct opcode_t explicit operator bool() const { return macro_opcode || machine_opcode; } }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/address.h b/parser_library/src/context/ordinary_assembly/address.h index 75798b9e9..520b9ca9e 100644 --- a/parser_library/src/context/ordinary_assembly/address.h +++ b/parser_library/src/context/ordinary_assembly/address.h @@ -23,9 +23,7 @@ #include "alignment.h" #include "context/id_storage.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class location_counter; class section; @@ -138,9 +136,6 @@ struct space bool resolved_; }; - -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/address_resolver.h b/parser_library/src/context/ordinary_assembly/address_resolver.h index cf4ee4239..fcb2e3435 100644 --- a/parser_library/src/context/ordinary_assembly/address_resolver.h +++ b/parser_library/src/context/ordinary_assembly/address_resolver.h @@ -18,9 +18,7 @@ #include "address.h" #include "dependable.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { struct address_resolver_base : public resolvable {}; @@ -80,8 +78,6 @@ struct alignable_address_abs_part_resolver : public address_resolver_base const resolvable* dependency_source_; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/dependable.h b/parser_library/src/context/ordinary_assembly/dependable.h index bcdc89e24..440ff9ccd 100644 --- a/parser_library/src/context/ordinary_assembly/dependable.h +++ b/parser_library/src/context/ordinary_assembly/dependable.h @@ -18,9 +18,7 @@ #include "dependency_collector.h" #include "symbol.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // interface for obtaining symbol from its name class dependency_solver @@ -45,8 +43,5 @@ class resolvable : public dependable virtual symbol_value resolve(dependency_solver& solver) const = 0; }; - -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/dependency_collector.h b/parser_library/src/context/ordinary_assembly/dependency_collector.h index 96dd123f2..f899f0951 100644 --- a/parser_library/src/context/ordinary_assembly/dependency_collector.h +++ b/parser_library/src/context/ordinary_assembly/dependency_collector.h @@ -21,9 +21,7 @@ #include "address.h" #include "symbol_attributes.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // helper structure that holds dependencies throughout whole process of getting dependencies struct dependency_collector @@ -65,7 +63,5 @@ struct dependency_collector static void adjust_address(address& addr); }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif \ No newline at end of file diff --git a/parser_library/src/context/ordinary_assembly/location_counter.h b/parser_library/src/context/ordinary_assembly/location_counter.h index 65ef82b7e..a5bc19d1d 100644 --- a/parser_library/src/context/ordinary_assembly/location_counter.h +++ b/parser_library/src/context/ordinary_assembly/location_counter.h @@ -17,9 +17,7 @@ #include "location_counter_data.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class section; class location_counter; @@ -107,8 +105,5 @@ class location_counter bool check_if_higher_value(size_t idx) const; }; - -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/location_counter_data.h b/parser_library/src/context/ordinary_assembly/location_counter_data.h index eb7e05ff5..8c9feabf1 100644 --- a/parser_library/src/context/ordinary_assembly/location_counter_data.h +++ b/parser_library/src/context/ordinary_assembly/location_counter_data.h @@ -20,10 +20,7 @@ #include "address.h" #include "alignment.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { - +namespace hlasm_plugin::parser_library::context { /* to satisfy the requirements of ORG instructions, multuple location counter data are needed @@ -111,7 +108,5 @@ struct location_counter_data space_storage spaces() const; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/section.h b/parser_library/src/context/ordinary_assembly/section.h index d3e911fe0..5a7a68b65 100644 --- a/parser_library/src/context/ordinary_assembly/section.h +++ b/parser_library/src/context/ordinary_assembly/section.h @@ -19,9 +19,7 @@ #include "location_counter.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { enum class section_kind { @@ -61,7 +59,5 @@ class section location_counter& current_location_counter() const; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/symbol.h b/parser_library/src/context/ordinary_assembly/symbol.h index 4a44ed49a..9e847f536 100644 --- a/parser_library/src/context/ordinary_assembly/symbol.h +++ b/parser_library/src/context/ordinary_assembly/symbol.h @@ -22,9 +22,7 @@ #include "location.h" #include "symbol_attributes.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // defines kind of symbol value, absolute or relocatable or undefined enum class symbol_value_kind @@ -85,7 +83,5 @@ class symbol symbol_attributes attributes_; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/ordinary_assembly/symbol_attributes.h b/parser_library/src/context/ordinary_assembly/symbol_attributes.h index eb0349ae3..515f939e1 100644 --- a/parser_library/src/context/ordinary_assembly/symbol_attributes.h +++ b/parser_library/src/context/ordinary_assembly/symbol_attributes.h @@ -19,9 +19,7 @@ #include "context/common_types.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // enumeration of all data attributes enum class data_attr_kind @@ -108,7 +106,5 @@ struct symbol_attributes len_attr integer_; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/processing_context.h b/parser_library/src/context/processing_context.h index 3b72be07d..c117aacdf 100644 --- a/parser_library/src/context/processing_context.h +++ b/parser_library/src/context/processing_context.h @@ -19,9 +19,7 @@ #include "processing/processing_format.h" #include "source_snapshot.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { // structure holding information about currently processed source struct source_context @@ -73,7 +71,5 @@ struct processing_frame using processing_stack_t = std::vector; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/sequence_symbol.h b/parser_library/src/context/sequence_symbol.h index 6b680c2cf..deb424e94 100644 --- a/parser_library/src/context/sequence_symbol.h +++ b/parser_library/src/context/sequence_symbol.h @@ -19,9 +19,7 @@ #include "source_snapshot.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { struct sequence_symbol; struct opencode_sequence_symbol; @@ -75,8 +73,6 @@ struct macro_sequence_symbol : public sequence_symbol macro_sequence_symbol(id_index name, location symbol_location, size_t statement_offset); }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif \ No newline at end of file diff --git a/parser_library/src/context/variables/macro_param.h b/parser_library/src/context/variables/macro_param.h index 6aee91606..6b3e91a56 100644 --- a/parser_library/src/context/variables/macro_param.h +++ b/parser_library/src/context/variables/macro_param.h @@ -18,9 +18,7 @@ #include "context/macro_param_data.h" #include "variable.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class keyword_param; class positional_param; @@ -90,8 +88,6 @@ class positional_param : public macro_param_base const macro_param_data_component* real_data() const override; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/variables/system_variable.h b/parser_library/src/context/variables/system_variable.h index cea5d9042..d8b08b136 100644 --- a/parser_library/src/context/variables/system_variable.h +++ b/parser_library/src/context/variables/system_variable.h @@ -17,9 +17,7 @@ #include "macro_param.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class system_variable; using sys_sym_ptr = std::shared_ptr; @@ -53,8 +51,6 @@ class system_variable : public macro_param_base const macro_param_data_component* real_data() const override; }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/context/variables/variable.h b/parser_library/src/context/variables/variable.h index 9c0ccf49a..4d9d5ca4b 100644 --- a/parser_library/src/context/variables/variable.h +++ b/parser_library/src/context/variables/variable.h @@ -21,9 +21,7 @@ #include "context/common_types.h" #include "context/id_storage.h" -namespace hlasm_plugin { -namespace parser_library { -namespace context { +namespace hlasm_plugin::parser_library::context { class set_symbol_base; class macro_param_base; @@ -61,8 +59,6 @@ class variable_symbol variable_symbol(variable_kind var_kind, id_index name, bool is_global); }; -} // namespace context -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::context #endif diff --git a/parser_library/src/ebcdic_encoding.h b/parser_library/src/ebcdic_encoding.h index 58b762d3a..34b7caa46 100644 --- a/parser_library/src/ebcdic_encoding.h +++ b/parser_library/src/ebcdic_encoding.h @@ -17,8 +17,7 @@ #include -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { // Class that provides support for EBCDIC encoding. class ebcdic_encoding @@ -82,7 +81,6 @@ class ebcdic_encoding inline unsigned char operator""_ebcdic(char c) { return ebcdic_encoding::a2e[static_cast(c)]; } -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library #endif diff --git a/parser_library/src/error_messages.h b/parser_library/src/error_messages.h index ad5fcae62..faa0064a6 100644 --- a/parser_library/src/error_messages.h +++ b/parser_library/src/error_messages.h @@ -20,8 +20,7 @@ #include "diagnostic.h" -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { class error_messages { @@ -180,7 +179,6 @@ class error_messages } }; -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library #endif diff --git a/parser_library/src/expressions/evaluation_context.h b/parser_library/src/expressions/evaluation_context.h index 82b7441aa..ed89c44f8 100644 --- a/parser_library/src/expressions/evaluation_context.h +++ b/parser_library/src/expressions/evaluation_context.h @@ -18,9 +18,7 @@ #include "diagnosable_ctx.h" #include "workspaces/parse_lib_provider.h" -namespace hlasm_plugin { -namespace parser_library { -namespace expressions { +namespace hlasm_plugin::parser_library::expressions { // structure holding required objects to correcly perform evaluation of expressions struct evaluation_context : diagnosable_ctx @@ -44,8 +42,6 @@ struct evaluation_context : diagnosable_ctx } }; -} // namespace expressions -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::expressions #endif diff --git a/parser_library/src/lexing/input_source.h b/parser_library/src/lexing/input_source.h index 7b620dcdb..834bc6514 100644 --- a/parser_library/src/lexing/input_source.h +++ b/parser_library/src/lexing/input_source.h @@ -19,9 +19,7 @@ #include "parser_library_export.h" -namespace hlasm_plugin { -namespace parser_library { -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { /* custom ANTLRInputStream supports input rewinding, appending and resetting @@ -46,8 +44,7 @@ class input_source : public antlr4::ANTLRInputStream virtual ~input_source() = default; }; -} // namespace lexing -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library::lexing #endif diff --git a/parser_library/src/lexing/lexer.h b/parser_library/src/lexing/lexer.h index 3783d8b84..f86f3da0e 100644 --- a/parser_library/src/lexing/lexer.h +++ b/parser_library/src/lexing/lexer.h @@ -30,9 +30,7 @@ #include "token_factory.h" -namespace hlasm_plugin { -namespace parser_library { -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { class input_source; @@ -239,7 +237,6 @@ class lexer : public antlr4::TokenSource bool is_process() const; }; -} // namespace lexing -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library::lexing #endif diff --git a/parser_library/src/lexing/token.h b/parser_library/src/lexing/token.h index c4d01ce1b..278062d86 100644 --- a/parser_library/src/lexing/token.h +++ b/parser_library/src/lexing/token.h @@ -22,9 +22,7 @@ #include "input_source.h" #include "parser_library_export.h" -namespace hlasm_plugin { -namespace parser_library { -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { class token : public antlr4::Token { @@ -79,7 +77,6 @@ class token : public antlr4::Token size_t char_position_in_line_16_; size_t end_of_token_in_line_utf16_; }; -} // namespace lexing -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library::lexing #endif diff --git a/parser_library/src/lexing/token_factory.h b/parser_library/src/lexing/token_factory.h index 0fa1a5051..dd1ccaa3b 100644 --- a/parser_library/src/lexing/token_factory.h +++ b/parser_library/src/lexing/token_factory.h @@ -23,9 +23,7 @@ #include "parser_library_export.h" #include "token.h" -namespace hlasm_plugin { -namespace parser_library { -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { class token_factory { @@ -52,7 +50,5 @@ class token_factory size_t end_of_token_in_line_utf16); }; -} // namespace lexing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::lexing #endif diff --git a/parser_library/src/lexing/token_stream.h b/parser_library/src/lexing/token_stream.h index 476a30f01..57ae171d3 100644 --- a/parser_library/src/lexing/token_stream.h +++ b/parser_library/src/lexing/token_stream.h @@ -23,9 +23,7 @@ #include "lexer.h" -namespace hlasm_plugin { -namespace parser_library { -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { // custom implementation of antlr token stream // helps to control the filtering of the token stream @@ -75,7 +73,5 @@ class token_stream : public antlr4::BufferedTokenStream std::vector tokens_; }; -} // namespace lexing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::lexing #endif diff --git a/parser_library/src/parser_library.cpp b/parser_library/src/parser_library.cpp index 9787f4a1c..baf9fddc8 100644 --- a/parser_library/src/parser_library.cpp +++ b/parser_library/src/parser_library.cpp @@ -25,8 +25,7 @@ using namespace hlasm_plugin::parser_library::lexing; using namespace hlasm_plugin::parser_library::parsing; -namespace hlasm_plugin { -namespace parser_library { +namespace hlasm_plugin::parser_library { // Parses specified string and outputs analysis to standard out. // Used for testing purposes. @@ -74,5 +73,5 @@ void parser_library::parse(const std::string& src) std::cout << diag.diag_range.start.line << ": " << diag.message << "\n"; } } -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library diff --git a/parser_library/src/parsing/parser_impl.h b/parser_library/src/parsing/parser_impl.h index 70e818d4f..d5f5f781b 100644 --- a/parser_library/src/parsing/parser_impl.h +++ b/parser_library/src/parsing/parser_impl.h @@ -26,16 +26,13 @@ #include "semantics/collector.h" #include "semantics/source_info_processor.h" -namespace hlasm_plugin { -namespace parser_library { - -namespace lexing { +namespace hlasm_plugin::parser_library::lexing { class input_source; class lexer; class token_stream; -} // namespace lexing +} // namespace hlasm_plugin::parser_library::lexing -namespace parsing { +namespace hlasm_plugin::parser_library::parsing { using self_def_t = std::int32_t; @@ -154,9 +151,6 @@ struct parser_holder ~parser_holder(); }; - -} // namespace parsing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::parsing #endif diff --git a/parser_library/src/parsing/parser_tools.cpp b/parser_library/src/parsing/parser_tools.cpp index d81c112f9..87ed300c2 100644 --- a/parser_library/src/parsing/parser_tools.cpp +++ b/parser_library/src/parsing/parser_tools.cpp @@ -16,9 +16,8 @@ #include "lexing/lexer.h" -namespace hlasm_plugin { -namespace parser_library { -namespace parsing { +namespace hlasm_plugin::parser_library::parsing { + std::vector get_sub_trees(antlr4::tree::ParseTree* tree, size_t type) { std::vector return_trees; @@ -89,6 +88,5 @@ void useful_tree::out_tree_rec(antlr4::ParserRuleContext* tree, std::string inde } } } -} // namespace parsing -} // namespace parser_library -} // namespace hlasm_plugin \ No newline at end of file + +} // namespace hlasm_plugin::parser_library::parsing \ No newline at end of file diff --git a/parser_library/src/parsing/parser_tools.h b/parser_library/src/parsing/parser_tools.h index 422e97f05..022dd85c5 100644 --- a/parser_library/src/parsing/parser_tools.h +++ b/parser_library/src/parsing/parser_tools.h @@ -19,9 +19,7 @@ #include "antlr4-runtime.h" -namespace hlasm_plugin { -namespace parser_library { -namespace parsing { +namespace hlasm_plugin::parser_library::parsing { // returns first subtree of specific type of the given tree // will not work properly with empty rules in grammar std::vector get_sub_trees(antlr4::tree::ParseTree* tree, size_t type); @@ -47,6 +45,5 @@ class useful_tree void out_tree_rec(antlr4::ParserRuleContext* tree, std::string indent, std::ostream& stream); }; -} // namespace parsing -} // namespace parser_library -} // namespace hlasm_plugin + +} // namespace hlasm_plugin::parser_library::parsing diff --git a/parser_library/src/processing/branching_provider.h b/parser_library/src/processing/branching_provider.h index 96fff0462..391985d2c 100644 --- a/parser_library/src/processing/branching_provider.h +++ b/parser_library/src/processing/branching_provider.h @@ -19,9 +19,7 @@ #include "context/ordinary_assembly/dependant.h" #include "range.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // interface for registering and using sequence symbols class branching_provider @@ -33,7 +31,5 @@ class branching_provider virtual ~branching_provider() = default; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h b/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h index 7bb393378..7bebc4567 100644 --- a/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h +++ b/parser_library/src/processing/instruction_sets/data_def_postponed_statement.h @@ -20,9 +20,7 @@ #include "checking/data_definition/data_definition_operand.h" #include "postponed_statement_impl.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { template struct data_def_postponed_statement : public postponed_statement_impl, public context::resolvable @@ -71,9 +69,5 @@ struct data_def_postponed_statement : public postponed_statement_impl, public co } }; - - -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif \ No newline at end of file diff --git a/parser_library/src/processing/instruction_sets/instruction_processor.h b/parser_library/src/processing/instruction_sets/instruction_processor.h index 6f9c919c6..b9ffcbfa5 100644 --- a/parser_library/src/processing/instruction_sets/instruction_processor.h +++ b/parser_library/src/processing/instruction_sets/instruction_processor.h @@ -24,9 +24,7 @@ #include "processing/statement.h" #include "workspaces/parse_lib_provider.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // interface for processing instructions // processing is divided into classes for assembler, conditional assembly, machine, macro instruction processing @@ -55,7 +53,5 @@ class instruction_processor : public diagnosable_ctx {} }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/instruction_sets/mach_processor.h b/parser_library/src/processing/instruction_sets/mach_processor.h index 5e087bf41..d41484a08 100644 --- a/parser_library/src/processing/instruction_sets/mach_processor.h +++ b/parser_library/src/processing/instruction_sets/mach_processor.h @@ -17,9 +17,7 @@ #include "low_language_processor.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // processor of machine instructions class mach_processor : public low_language_processor @@ -35,7 +33,5 @@ class mach_processor : public low_language_processor void process(context::shared_stmt_ptr stmt) override; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif \ No newline at end of file diff --git a/parser_library/src/processing/instruction_sets/macro_processor.h b/parser_library/src/processing/instruction_sets/macro_processor.h index f6285800c..5b32c9c15 100644 --- a/parser_library/src/processing/instruction_sets/macro_processor.h +++ b/parser_library/src/processing/instruction_sets/macro_processor.h @@ -19,9 +19,7 @@ #include "diagnostic_adder.h" #include "instruction_processor.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { struct macro_arguments { @@ -60,7 +58,5 @@ class macro_processor : public instruction_processor range op_range) const; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif \ No newline at end of file diff --git a/parser_library/src/processing/instruction_sets/postponed_statement_impl.h b/parser_library/src/processing/instruction_sets/postponed_statement_impl.h index 1709b1a47..e53b2b508 100644 --- a/parser_library/src/processing/instruction_sets/postponed_statement_impl.h +++ b/parser_library/src/processing/instruction_sets/postponed_statement_impl.h @@ -20,9 +20,7 @@ #include "context/ordinary_assembly/postponed_statement.h" #include "processing/statement.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // implementation of postponed_statement interface struct postponed_statement_impl : public context::postponed_statement, public resolved_statement @@ -46,9 +44,5 @@ struct postponed_statement_impl : public context::postponed_statement, public re const context::processing_stack_t& location_stack() const override { return stmt_location_stack; } }; - - -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/op_code.h b/parser_library/src/processing/op_code.h index a53b9a4ed..83c3bc22b 100644 --- a/parser_library/src/processing/op_code.h +++ b/parser_library/src/processing/op_code.h @@ -21,9 +21,7 @@ #include "context/instruction_type.h" #include "processing_format.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // structure holding resolved operation code of the instruction (solving OPSYNs and so on) struct op_code @@ -43,7 +41,5 @@ struct op_code using processing_status = std::pair; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/opencode_provider.h b/parser_library/src/processing/opencode_provider.h index 5820286b7..4ff207306 100644 --- a/parser_library/src/processing/opencode_provider.h +++ b/parser_library/src/processing/opencode_provider.h @@ -18,9 +18,7 @@ #include "context/source_snapshot.h" #include "statement_providers/statement_provider.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // interface for hiding parser implementation class opencode_provider : public statement_provider @@ -36,7 +34,5 @@ class opencode_provider : public statement_provider virtual ~opencode_provider() = default; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/processing_format.h b/parser_library/src/processing/processing_format.h index e2fc5d230..0f5787795 100644 --- a/parser_library/src/processing/processing_format.h +++ b/parser_library/src/processing/processing_format.h @@ -17,9 +17,7 @@ #include -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { enum class processing_kind : uint8_t { @@ -67,7 +65,5 @@ struct processing_format operand_occurence occurence; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/processing_state_listener.h b/parser_library/src/processing/processing_state_listener.h index 2aa4b2c24..5d300c6b6 100644 --- a/parser_library/src/processing/processing_state_listener.h +++ b/parser_library/src/processing/processing_state_listener.h @@ -19,9 +19,7 @@ #include "statement_processors/lookahead_processing_info.h" #include "statement_processors/macrodef_processing_info.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // interface for listening that a statement processor needs to be started or has finished class processing_state_listener @@ -41,7 +39,5 @@ class processing_state_listener virtual ~processing_state_listener() = default; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement.h b/parser_library/src/processing/statement.h index 9fc0af874..4949b73b3 100644 --- a/parser_library/src/processing/statement.h +++ b/parser_library/src/processing/statement.h @@ -23,9 +23,7 @@ // this file contains inherited structures from hlasm_statement that are used during the processing -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // statement that contains resolved operation code and also all semantic fields struct resolved_statement : public context::hlasm_statement, public semantics::complete_statement @@ -89,8 +87,5 @@ struct rebuilt_statement : public resolved_statement processing_format format_ref() const override { return base_stmt->format_ref(); } }; - -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_fields_parser.h b/parser_library/src/processing/statement_fields_parser.h index bf33b6e15..280d40a73 100644 --- a/parser_library/src/processing/statement_fields_parser.h +++ b/parser_library/src/processing/statement_fields_parser.h @@ -20,9 +20,7 @@ #include "semantics/range_provider.h" #include "semantics/statement_fields.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { class statement_provider; using provider_ptr = std::unique_ptr; @@ -41,7 +39,5 @@ class statement_fields_parser virtual ~statement_fields_parser() = default; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_processors/copy_processing_info.h b/parser_library/src/processing/statement_processors/copy_processing_info.h index 6f235ec00..69452c5b1 100644 --- a/parser_library/src/processing/statement_processors/copy_processing_info.h +++ b/parser_library/src/processing/statement_processors/copy_processing_info.h @@ -18,9 +18,7 @@ #include "context/hlasm_statement.h" #include "context/id_storage.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // data to start copy_processor struct copy_start_data @@ -39,7 +37,5 @@ struct copy_processing_result bool invalid_member; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_processors/copy_processor.h b/parser_library/src/processing/statement_processors/copy_processor.h index ebc725244..28b436488 100644 --- a/parser_library/src/processing/statement_processors/copy_processor.h +++ b/parser_library/src/processing/statement_processors/copy_processor.h @@ -20,9 +20,7 @@ #include "processing/processing_state_listener.h" #include "statement_processor.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // processor that processes copy members class copy_processor : public statement_processor @@ -51,7 +49,5 @@ class copy_processor : public statement_processor void process_MEND(); }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_processors/empty_processor.h b/parser_library/src/processing/statement_processors/empty_processor.h index e7f118f7e..621ea6169 100644 --- a/parser_library/src/processing/statement_processors/empty_processor.h +++ b/parser_library/src/processing/statement_processors/empty_processor.h @@ -17,9 +17,7 @@ #include "statement_processor.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // processor ignoring provided statements class empty_processor : public statement_processor @@ -35,7 +33,5 @@ class empty_processor : public statement_processor void collect_diags() const override; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_providers/macro_statement_provider.h b/parser_library/src/processing/statement_providers/macro_statement_provider.h index c2f6f06e7..bd3bc8346 100644 --- a/parser_library/src/processing/statement_providers/macro_statement_provider.h +++ b/parser_library/src/processing/statement_providers/macro_statement_provider.h @@ -17,9 +17,7 @@ #include "members_statement_provider.h" -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // statement provider providing statements of macro defintion class macro_statement_provider : public members_statement_provider @@ -36,8 +34,6 @@ class macro_statement_provider : public members_statement_provider context::statement_cache* get_next() override; }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/processing/statement_providers/statement_provider_kind.h b/parser_library/src/processing/statement_providers/statement_provider_kind.h index 3d68ed08e..6d00221ab 100644 --- a/parser_library/src/processing/statement_providers/statement_provider_kind.h +++ b/parser_library/src/processing/statement_providers/statement_provider_kind.h @@ -15,9 +15,7 @@ #ifndef PROCESSING_STATEMENT_PROVIDER_KIND_H #define PROCESSING_STATEMENT_PROVIDER_KIND_H -namespace hlasm_plugin { -namespace parser_library { -namespace processing { +namespace hlasm_plugin::parser_library::processing { // kind of statement providers enum class statement_provider_kind @@ -27,7 +25,5 @@ enum class statement_provider_kind OPEN = 2 // MACRO = 0, AINS = 1, COPY = 2, OPEN = 3 -- priority }; -} // namespace processing -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::processing #endif diff --git a/parser_library/src/semantics/collector.h b/parser_library/src/semantics/collector.h index 69231770f..d3edc855d 100644 --- a/parser_library/src/semantics/collector.h +++ b/parser_library/src/semantics/collector.h @@ -23,9 +23,7 @@ #include "source_info_processor.h" #include "statement.h" -namespace hlasm_plugin { -namespace parser_library { -namespace semantics { +namespace hlasm_plugin::parser_library::semantics { // class containing methods for collecting parsed statement fields class collector @@ -77,7 +75,5 @@ class collector void add_operand_remark_hl_symbols(); }; -} // namespace semantics -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::semantics #endif diff --git a/parser_library/src/semantics/highlighting_info.h b/parser_library/src/semantics/highlighting_info.h index f4e50690e..c77dbcce0 100644 --- a/parser_library/src/semantics/highlighting_info.h +++ b/parser_library/src/semantics/highlighting_info.h @@ -22,9 +22,7 @@ #include "protocol.h" -namespace hlasm_plugin { -namespace parser_library { -namespace semantics { +namespace hlasm_plugin::parser_library::semantics { // vector of tokens using lines_info = std::vector; @@ -49,8 +47,6 @@ struct highlighting_info continuation_info cont_info; }; -} // namespace semantics -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::semantics #endif diff --git a/parser_library/src/semantics/range_provider.h b/parser_library/src/semantics/range_provider.h index 01029a7c1..ac269152f 100644 --- a/parser_library/src/semantics/range_provider.h +++ b/parser_library/src/semantics/range_provider.h @@ -19,9 +19,7 @@ #include "range.h" -namespace hlasm_plugin { -namespace parser_library { -namespace semantics { +namespace hlasm_plugin::parser_library::semantics { // state of range adjusting enum class adjusting_state @@ -57,7 +55,5 @@ struct range_provider position adjust_position(position pos); }; -} // namespace semantics -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::semantics #endif diff --git a/parser_library/src/semantics/statement_fields.h b/parser_library/src/semantics/statement_fields.h index 56f60f657..686b72f92 100644 --- a/parser_library/src/semantics/statement_fields.h +++ b/parser_library/src/semantics/statement_fields.h @@ -24,9 +24,7 @@ // this file contains structures representing each statement field -namespace hlasm_plugin { -namespace parser_library { -namespace semantics { +namespace hlasm_plugin::parser_library::semantics { enum class label_si_type { @@ -163,9 +161,5 @@ struct remarks_si std::vector value; }; - - -} // namespace semantics -} // namespace parser_library -} // namespace hlasm_plugin +} // namespace hlasm_plugin::parser_library::semantics #endif From 20f35702a9438daea9824c1c9768e2c5c5ce8f39 Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Wed, 14 Apr 2021 12:06:37 +0200 Subject: [PATCH 3/7] Coverity issues --- language_server/src/request_manager.h | 2 +- parser_library/src/context/instruction.h | 37 +++++++++---------- .../src/context/ordinary_assembly/address.h | 4 +- .../src/expressions/data_definition.cpp | 2 +- parser_library/src/lexing/lexer.h | 2 +- parser_library/src/lsp/macro_info.h | 4 +- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/language_server/src/request_manager.h b/language_server/src/request_manager.h index 2ae2047a0..d6dc2d475 100644 --- a/language_server/src/request_manager.h +++ b/language_server/src/request_manager.h @@ -63,7 +63,7 @@ class request_manager // the request manager invalidates older requests on the // same file, when a new request to the same file comes std::string currently_running_file_; - std::atomic currently_running_server_; + std::atomic currently_running_server_ = nullptr; void handle_request_(const std::atomic* end_loop); std::string get_request_file_(json r, bool* is_parsing_required = nullptr) const; diff --git a/parser_library/src/context/instruction.h b/parser_library/src/context/instruction.h index b6a07881e..9fc4c5d72 100644 --- a/parser_library/src/context/instruction.h +++ b/parser_library/src/context/instruction.h @@ -29,12 +29,15 @@ namespace hlasm_plugin::parser_library::context { // all mach_format types for operands of machine instructions: // formats with length 16 are arranged in range (0,2),formats with length 32 are arranged in range(3,20),formats with // length 48 are arranged in range (21,77) -enum class mach_format +enum class mach_format : unsigned char { - E, + length_16, + E = length_16, I, RR, - IE, + + length_32, + IE = length_32, RRD, RRE, RRF_a, @@ -52,7 +55,9 @@ enum class mach_format RX_b, S, SI, - MII, + + length_48, + MII = length_48, RIE_a, RIE_b, RIE_c, @@ -168,10 +173,7 @@ const checking::machine_operand_format reg_imm_12_S = checking::machine_operand_ const checking::machine_operand_format reg_imm_16_S = checking::machine_operand_format(reg_imm_16s, empty, empty); const checking::machine_operand_format reg_imm_24_S = checking::machine_operand_format(reg_imm_24s, empty, empty); const checking::machine_operand_format reg_imm_32_S = checking::machine_operand_format(reg_imm_32s, empty, empty); -// intervals dividing formats based on length -const int length_sixteen_interval = 3; -const int length_thirtytwo_interval = 21; -const int length_fortyeight_interval = 78; + // machine instruction representation for checking class machine_instruction { @@ -204,21 +206,16 @@ class machine_instruction bool check_nth_operand(size_t place, const checking::machine_operand* operand); - int get_length_by_format(mach_format instruction_format) const + static int get_length_by_format(mach_format instruction_format) { auto interval = (int)(instruction_format); - if (interval < length_sixteen_interval) - { - return 16; - } - if (interval < length_thirtytwo_interval) - { - return 32; - } - if (interval < length_fortyeight_interval) - { + if (interval >= (int)mach_format::length_48) return 48; - } + if (interval >= (int)mach_format::length_32) + return 32; + if (interval >= (int)mach_format::length_16) + return 16; + return 0; } virtual bool check(const std::string& name_of_instruction, const std::vector operands, diff --git a/parser_library/src/context/ordinary_assembly/address.h b/parser_library/src/context/ordinary_assembly/address.h index 520b9ca9e..4fdc71df6 100644 --- a/parser_library/src/context/ordinary_assembly/address.h +++ b/parser_library/src/context/ordinary_assembly/address.h @@ -109,8 +109,8 @@ struct space // previous address values // for LOCTR_UNKNOWN space kind address previous_loctr_value; - size_t previous_boundary; - int previous_offset; + size_t previous_boundary = 0; + int previous_offset = 0; location_counter& owner; diff --git a/parser_library/src/expressions/data_definition.cpp b/parser_library/src/expressions/data_definition.cpp index df1824343..66897479e 100644 --- a/parser_library/src/expressions/data_definition.cpp +++ b/parser_library/src/expressions/data_definition.cpp @@ -203,7 +203,7 @@ bool data_definition::check_single_symbol_ok(const diagnostic_collector& add_dia auto symbol = dynamic_cast(expr); if (!symbol) { - add_diagnostic(diagnostic_op::error_D030(expr->get_range(), &type)); + add_diagnostic(diagnostic_op::error_D030(expr->get_range(), std::string(1, type))); ret = false; } } diff --git a/parser_library/src/lexing/lexer.h b/parser_library/src/lexing/lexer.h index f86f3da0e..a239aa7e8 100644 --- a/parser_library/src/lexing/lexer.h +++ b/parser_library/src/lexing/lexer.h @@ -156,7 +156,7 @@ class lexer : public antlr4::TokenSource // positions of the last line stream_position last_lln_begin_pos_ = { 0, 0 }; stream_position last_lln_end_pos_ = { static_cast(-1), static_cast(-1) }; - size_t last_line_pos_; + size_t last_line_pos_ = 0; std::queue token_queue_; Ref dummy_factory; diff --git a/parser_library/src/lsp/macro_info.h b/parser_library/src/lsp/macro_info.h index 630d6d7ea..202d3bf45 100644 --- a/parser_library/src/lsp/macro_info.h +++ b/parser_library/src/lsp/macro_info.h @@ -31,10 +31,10 @@ struct variable_symbol_definition // type of SET symbol context::SET_t_enum type; // flag whether SET symbol is global - bool global; + bool global = false; // statement number in macro - size_t def_location; + size_t def_location = 0; // file in opencode std::string file; From 3ddd462d572ba634b72f83477999cc394f1053f3 Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Wed, 14 Apr 2021 12:12:18 +0200 Subject: [PATCH 4/7] npm audit fix --- clients/vscode-hlasmplugin/package-lock.json | 4243 ++++++------------ clients/vscode-hlasmplugin/package.json | 4 +- 2 files changed, 1375 insertions(+), 2872 deletions(-) diff --git a/clients/vscode-hlasmplugin/package-lock.json b/clients/vscode-hlasmplugin/package-lock.json index 064c148c4..1554382a3 100644 --- a/clients/vscode-hlasmplugin/package-lock.json +++ b/clients/vscode-hlasmplugin/package-lock.json @@ -292,147 +292,152 @@ "dev": true }, "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", + "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.3", + "@nodelib/fs.stat": "2.0.4", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", + "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", - "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", + "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.3", + "@nodelib/fs.scandir": "2.1.4", "fastq": "^1.6.0" } }, "@octokit/auth-token": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz", - "integrity": "sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz", + "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==", "dev": true, "requires": { - "@octokit/types": "^4.0.1" + "@octokit/types": "^6.0.3" } }, "@octokit/core": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.3.tgz", - "integrity": "sha512-23AHK9xBW0v79Ck8h5U+5iA4MW7aosqv+Yr6uZXolVGNzzHwryNH5wM386/6+etiKUTwLFZTqyMU9oQpIBZcFA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz", + "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==", "dev": true, "requires": { - "@octokit/auth-token": "^2.4.0", - "@octokit/graphql": "^4.3.1", - "@octokit/request": "^5.4.0", - "@octokit/types": "^4.0.1", - "before-after-hook": "^2.1.0", - "universal-user-agent": "^5.0.0" + "@octokit/auth-token": "^2.4.4", + "@octokit/graphql": "^4.5.8", + "@octokit/request": "^5.4.12", + "@octokit/request-error": "^2.0.5", + "@octokit/types": "^6.0.3", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" } }, "@octokit/endpoint": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.2.tgz", - "integrity": "sha512-xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz", + "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==", "dev": true, "requires": { - "@octokit/types": "^4.0.1", - "is-plain-object": "^3.0.0", - "universal-user-agent": "^5.0.0" + "@octokit/types": "^6.0.3", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" } }, "@octokit/graphql": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.0.tgz", - "integrity": "sha512-StJWfn0M1QfhL3NKBz31e1TdDNZrHLLS57J2hin92SIfzlOVBuUaRkp31AGkGOAFOAVtyEX6ZiZcsjcJDjeb5g==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.1.tgz", + "integrity": "sha512-2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA==", "dev": true, "requires": { "@octokit/request": "^5.3.0", - "@octokit/types": "^4.0.1", - "universal-user-agent": "^5.0.0" + "@octokit/types": "^6.0.3", + "universal-user-agent": "^6.0.0" } }, + "@octokit/openapi-types": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz", + "integrity": "sha512-CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ==", + "dev": true + }, "@octokit/plugin-paginate-rest": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.1.tgz", - "integrity": "sha512-/tHpIF2XpN40AyhIq295YRjb4g7Q5eKob0qM3thYJ0Z+CgmNsWKM/fWse/SUR8+LdprP1O4ZzSKQE+71TCwK+w==", + "version": "2.13.3", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz", + "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==", "dev": true, "requires": { - "@octokit/types": "^4.0.1" + "@octokit/types": "^6.11.0" } }, "@octokit/plugin-request-log": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz", - "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz", + "integrity": "sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ==", "dev": true }, "@octokit/plugin-rest-endpoint-methods": { - "version": "3.13.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.13.3.tgz", - "integrity": "sha512-DlbMy6eZe4g67oqfmSS8H1DUYtnSVNrJZdUO77QpEphO8uecL4nlWXfUbZ2bNBb0925ZrRDZa4Sa3C2fSp/fgQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.0.tgz", + "integrity": "sha512-Jc7CLNUueIshXT+HWt6T+M0sySPjF32mSFQAK7UfAg8qGeRI6OM1GSBxDLwbXjkqy2NVdnqCedJcP1nC785JYg==", "dev": true, "requires": { - "@octokit/types": "^4.1.4", + "@octokit/types": "^6.13.0", "deprecation": "^2.3.1" } }, "@octokit/request": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.4.tgz", - "integrity": "sha512-vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ==", + "version": "5.4.15", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz", + "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==", "dev": true, "requires": { "@octokit/endpoint": "^6.0.1", "@octokit/request-error": "^2.0.0", - "@octokit/types": "^4.0.1", - "deprecation": "^2.0.0", - "is-plain-object": "^3.0.0", - "node-fetch": "^2.3.0", - "once": "^1.4.0", - "universal-user-agent": "^5.0.0" + "@octokit/types": "^6.7.1", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.1", + "universal-user-agent": "^6.0.0" } }, "@octokit/request-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz", - "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz", + "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==", "dev": true, "requires": { - "@octokit/types": "^4.0.1", + "@octokit/types": "^6.0.3", "deprecation": "^2.0.0", "once": "^1.4.0" } }, "@octokit/rest": { - "version": "17.9.2", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.9.2.tgz", - "integrity": "sha512-UXxiE0HhGQAPB3WDHTEu7lYMHH2uRcs/9f26XyHpGGiiXht8hgHWEk6fA7WglwwEvnj8V7mkJOgIntnij132UA==", + "version": "18.5.2", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.2.tgz", + "integrity": "sha512-Kz03XYfKS0yYdi61BkL9/aJ0pP2A/WK5vF/syhu9/kY30J8He3P68hv9GRpn8bULFx2K0A9MEErn4v3QEdbZcw==", "dev": true, "requires": { - "@octokit/core": "^2.4.3", - "@octokit/plugin-paginate-rest": "^2.2.0", - "@octokit/plugin-request-log": "^1.0.0", - "@octokit/plugin-rest-endpoint-methods": "^3.12.2" + "@octokit/core": "^3.2.3", + "@octokit/plugin-paginate-rest": "^2.6.2", + "@octokit/plugin-request-log": "^1.0.2", + "@octokit/plugin-rest-endpoint-methods": "5.0.0" } }, "@octokit/types": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.4.tgz", - "integrity": "sha512-W+aHUBA6pEZ8OC1fgfFW1/jrgtkaMVBhNr7jhhBErvbWQY4Ii9Hlf3LAurwcy5XXjz8EYluiCZjHhnQO4GSfNg==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz", + "integrity": "sha512-W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA==", "dev": true, "requires": { - "@types/node": ">= 8" + "@octokit/openapi-types": "^6.0.0" } }, "@semantic-release/changelog": { @@ -463,13 +468,19 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } + }, + "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 } } }, @@ -505,12 +516,12 @@ } }, "@semantic-release/github": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.0.7.tgz", - "integrity": "sha512-Sai2UucYQ+5rJzKVEVJ4eiZNDdoo0/CzfpValBdeU5h97uJE7t4CoBTmUWkiXlPOx46CSw1+JhI+PHC1PUxVZw==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.2.1.tgz", + "integrity": "sha512-+gOhbaG4T3xJb6aTZu1/7KvCmYKRChkasdIyFWdaGaTWVeGpdl4o0zMviV1z3kRcgPOSXeqjHSQ6SOQAfHQiDw==", "dev": true, "requires": { - "@octokit/rest": "^17.0.0", + "@octokit/rest": "^18.0.0", "@semantic-release/error": "^2.2.0", "aggregate-error": "^3.0.0", "bottleneck": "^2.18.1", @@ -529,21 +540,21 @@ }, "dependencies": { "agent-base": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz", - "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==", + "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": { "debug": "4" } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "http-proxy-agent": { @@ -568,9 +579,15 @@ } }, "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "url-join": { @@ -582,38 +599,99 @@ } }, "@semantic-release/npm": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-7.0.5.tgz", - "integrity": "sha512-D+oEmsx9aHE1q806NFQwSC9KdBO8ri/VO99eEz0wWbX2jyLqVyWr7t0IjKC8aSnkkQswg/4KN/ZjfF6iz1XOpw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-7.1.1.tgz", + "integrity": "sha512-zTYAno1j49XiH+uAVCY47dKOJAagA/MaJb26FFIfNujNHw3GYXk3ygsFa5CSa55xsO0qEMLcsDX3f3ByCg6nZw==", "dev": true, "requires": { "@semantic-release/error": "^2.2.0", "aggregate-error": "^3.0.0", - "execa": "^4.0.0", + "execa": "^5.0.0", "fs-extra": "^9.0.0", "lodash": "^4.17.15", "nerf-dart": "^1.0.0", - "normalize-url": "^5.0.0", - "npm": "^6.10.3", + "normalize-url": "^6.0.0", + "npm": "^7.0.0", "rc": "^1.2.8", "read-pkg": "^5.0.0", "registry-auth-token": "^4.0.0", "semver": "^7.1.2", - "tempy": "^0.5.0" + "tempy": "^1.0.0" }, "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "dev": true, + "requires": { + "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" + } + }, + "get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "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==", "dev": true + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "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": { + "lru-cache": "^6.0.0" + } + }, + "which": { + "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" + } } } }, "@semantic-release/release-notes-generator": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-9.0.1.tgz", - "integrity": "sha512-bOoTiH6SiiR0x2uywSNR7uZcRDl22IpZhj+Q5Bn0v+98MFtOMhCxFhbrKQjhbYoZw7vps1mvMRmFkp/g6R9cvQ==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-9.0.2.tgz", + "integrity": "sha512-xGFSidhGqB27uwgWCU6y0gbf4r/no5flOAkJyFFc4+bPf8S+LfAVm7xhhlK5VPXLt2Iu1RBH8F+IgMK2ah5YpA==", "dev": true, "requires": { "conventional-changelog-angular": "^5.0.0", @@ -623,19 +701,25 @@ "debug": "^4.0.0", "get-stream": "^5.0.0", "import-from": "^3.0.0", - "into-stream": "^5.0.0", + "into-stream": "^6.0.0", "lodash": "^4.17.4", "read-pkg-up": "^7.0.0" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } + }, + "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 } } }, @@ -675,9 +759,9 @@ "dev": true }, "@types/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", + "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", "dev": true }, "@types/mocha": { @@ -762,18 +846,18 @@ "dev": true }, "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "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.11.0" + "type-fest": "^0.21.3" }, "dependencies": { "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "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 } } @@ -852,9 +936,9 @@ "dev": true }, "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, "at-least-node": { @@ -888,9 +972,9 @@ "dev": true }, "before-after-hook": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz", - "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz", + "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw==", "dev": true }, "binary-extensions": { @@ -900,9 +984,9 @@ "dev": true }, "bl": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", - "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, "requires": { "buffer": "^5.5.0", @@ -1079,9 +1163,9 @@ "dev": true }, "cli-table": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", - "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz", + "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==", "dev": true, "requires": { "colors": "1.0.3" @@ -1160,13 +1244,13 @@ "dev": true }, "compare-func": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz", - "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", + "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", "dev": true, "requires": { "array-ify": "^1.0.0", - "dot-prop": "^3.0.0" + "dot-prop": "^5.1.0" } }, "concat-map": { @@ -1176,42 +1260,42 @@ "dev": true }, "conventional-changelog-angular": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz", - "integrity": "sha512-k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz", + "integrity": "sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==", "dev": true, "requires": { - "compare-func": "^1.3.1", + "compare-func": "^2.0.0", "q": "^1.5.1" } }, "conventional-changelog-conventionalcommits": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.3.0.tgz", - "integrity": "sha512-oYHydvZKU+bS8LnGqTMlNrrd7769EsuEHKy4fh1oMdvvDi7fem8U+nvfresJ1IDB8K00Mn4LpiA/lR+7Gs6rgg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz", + "integrity": "sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw==", "dev": true, "requires": { - "compare-func": "^1.3.1", + "compare-func": "^2.0.0", "lodash": "^4.17.15", "q": "^1.5.1" } }, "conventional-changelog-writer": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.16.tgz", - "integrity": "sha512-jmU1sDJDZpm/dkuFxBeRXvyNcJQeKhGtVcFFkwTphUAzyYWcwz2j36Wcv+Mv2hU3tpvLMkysOPXJTLO55AUrYQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz", + "integrity": "sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==", "dev": true, "requires": { - "compare-func": "^1.3.1", - "conventional-commits-filter": "^2.0.6", + "compare-func": "^2.0.0", + "conventional-commits-filter": "^2.0.7", "dateformat": "^3.0.0", "handlebars": "^4.7.6", "json-stringify-safe": "^5.0.1", "lodash": "^4.17.15", - "meow": "^7.0.0", + "meow": "^8.0.0", "semver": "^6.0.0", "split": "^1.0.0", - "through2": "^3.0.0" + "through2": "^4.0.0" }, "dependencies": { "semver": { @@ -1223,9 +1307,9 @@ } }, "conventional-commits-filter": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz", - "integrity": "sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", + "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", "dev": true, "requires": { "lodash.ismatch": "^4.4.0", @@ -1233,17 +1317,17 @@ } }, "conventional-commits-parser": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz", - "integrity": "sha512-RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz", + "integrity": "sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA==", "dev": true, "requires": { "JSONStream": "^1.0.4", "is-text-path": "^1.0.1", "lodash": "^4.17.15", - "meow": "^7.0.0", - "split2": "^2.0.0", - "through2": "^3.0.0", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0", "trim-off-newlines": "^1.0.0" } }, @@ -1263,16 +1347,16 @@ "dev": true }, "cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", "dev": true, "requires": { "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", + "import-fresh": "^3.2.1", "parse-json": "^5.0.0", "path-type": "^4.0.0", - "yaml": "^1.7.2" + "yaml": "^1.10.0" } }, "cross-spawn": { @@ -1393,6 +1477,39 @@ "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": { + "graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "dev": true + }, + "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, + "requires": { + "aggregate-error": "^3.0.0" + } + } + } + }, "denodeify": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", @@ -1456,12 +1573,12 @@ } }, "dot-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", - "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "requires": { - "is-obj": "^1.0.0" + "is-obj": "^2.0.0" } }, "duplexer2": { @@ -1596,6 +1713,12 @@ "es6-promise": "^4.0.3" } }, + "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": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1649,9 +1772,9 @@ } }, "fast-glob": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", - "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", + "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -1663,9 +1786,9 @@ } }, "fastq": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", - "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", + "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -1719,12 +1842,12 @@ } }, "find-versions": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", - "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz", + "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==", "dev": true, "requires": { - "semver-regex": "^2.0.0" + "semver-regex": "^3.1.2" } }, "flat": { @@ -1935,9 +2058,9 @@ "dev": true }, "globby": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", - "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", + "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", "dev": true, "requires": { "array-union": "^2.1.0", @@ -1961,9 +2084,9 @@ "dev": true }, "handlebars": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", "dev": true, "requires": { "minimist": "^1.2.5", @@ -2031,12 +2154,12 @@ "dev": true }, "hosted-git-info": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", - "integrity": "sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", + "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", "dev": true, "requires": { - "lru-cache": "^5.1.1" + "lru-cache": "^6.0.0" } }, "html-escaper": { @@ -2115,9 +2238,9 @@ "dev": true }, "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -2170,9 +2293,9 @@ "dev": true }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, "interpret": { @@ -2182,9 +2305,9 @@ "dev": true }, "into-stream": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-5.1.1.tgz", - "integrity": "sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz", + "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==", "dev": true, "requires": { "from2": "^2.3.0", @@ -2218,6 +2341,15 @@ "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", "dev": true }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", @@ -2252,9 +2384,21 @@ "dev": true }, "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true + }, + "is-path-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": "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": { @@ -2264,13 +2408,10 @@ "dev": true }, "is-plain-object": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz", - "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==", - "dev": true, - "requires": { - "isobject": "^4.0.0" - } + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true }, "is-regex": { "version": "1.0.5", @@ -2329,12 +2470,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "isobject": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", - "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", - "dev": true - }, "issue-parser": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/issue-parser/-/issue-parser-6.0.0.tgz", @@ -2600,9 +2735,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "lodash.capitalize": { @@ -2663,20 +2798,14 @@ } }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "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": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, - "macos-release": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz", - "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==", - "dev": true - }, "make-dir": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", @@ -2695,9 +2824,9 @@ } }, "map-obj": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz", - "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", + "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", "dev": true }, "markdown-it": { @@ -2722,39 +2851,38 @@ } }, "marked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", - "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.3.tgz", + "integrity": "sha512-5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA==", "dev": true }, "marked-terminal": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz", - "integrity": "sha512-5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.1.tgz", + "integrity": "sha512-t7Mdf6T3PvOEyN01c3tYxDzhyKZ8xnkp8Rs6Fohno63L/0pFTJ5Qtwto2AQVuDtbQiWzD+4E5AAu1Z2iLc8miQ==", "dev": true, "requires": { "ansi-escapes": "^4.3.1", "cardinal": "^2.1.1", - "chalk": "^4.0.0", + "chalk": "^4.1.0", "cli-table": "^0.3.1", "node-emoji": "^1.10.0", "supports-hyperlinks": "^2.1.0" }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -2783,9 +2911,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -2800,55 +2928,35 @@ "dev": true }, "meow": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz", - "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", "dev": true, "requires": { "@types/minimist": "^1.2.0", - "arrify": "^2.0.1", - "camelcase": "^6.0.0", "camelcase-keys": "^6.2.2", "decamelize-keys": "^1.1.0", "hard-rejection": "^2.1.0", - "minimist-options": "^4.0.2", - "normalize-package-data": "^2.5.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.13.1", - "yargs-parser": "^18.1.3" + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" }, "dependencies": { - "camelcase": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz", - "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==", - "dev": true - }, "type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "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==", "dev": true }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "dev": true } } }, @@ -2859,19 +2967,27 @@ "dev": true }, "merge2": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", - "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" + "picomatch": "^2.2.3" + }, + "dependencies": { + "picomatch": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "dev": true + } } }, "mime": { @@ -2916,14 +3032,6 @@ "arrify": "^1.0.1", "is-plain-obj": "^1.1.0", "kind-of": "^6.0.3" - }, - "dependencies": { - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - } } }, "mitt": { @@ -3014,9 +3122,9 @@ "dev": true }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "nerf-dart": { @@ -3025,12 +3133,6 @@ "integrity": "sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo=", "dev": true }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node-emoji": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", @@ -3051,9 +3153,9 @@ } }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", "dev": true }, "node-preload": { @@ -3066,22 +3168,35 @@ } }, "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==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", + "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", + "hosted-git-info": "^4.0.1", + "resolve": "^1.20.0", + "semver": "^7.3.4", "validate-npm-package-license": "^3.0.1" }, "dependencies": { - "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", - "dev": true + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + }, + "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": { + "lru-cache": "^6.0.0" + } } } }, @@ -3092,202 +3207,288 @@ "dev": true }, "normalize-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-5.0.0.tgz", - "integrity": "sha512-bAEm2fx8Dq/a35Z6PIRkkBBJvR56BbEJvhpNtvCZ4W9FyORSna77fn+xtYFjqk5JpBS+fMnAOG/wFgkQBmB7hw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.0.tgz", + "integrity": "sha512-3nv3dKMucKPEXhx/FEtJQR26ksYdyVlLEP9/dYvYwCbLbP6H8ya94IRf+mB93ec+fndv/Ye8SylWfD7jmN6kSA==", "dev": true }, "npm": { - "version": "6.14.5", - "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz", - "integrity": "sha512-CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/npm/-/npm-7.9.0.tgz", + "integrity": "sha512-GW9RbueF717kJ4ZUVsTlhKBEY7AqX28OwQCsfIAkRZclfeeqQDnsoJz6WWuYTMpGBJnB2xknF8Dp364c93FDYA==", "dev": true, "requires": { - "JSONStream": "^1.3.5", + "@npmcli/arborist": "^2.3.0", + "@npmcli/ci-detect": "^1.2.0", + "@npmcli/config": "^2.1.0", + "@npmcli/run-script": "^1.8.4", "abbrev": "~1.1.1", "ansicolors": "~0.3.2", "ansistyles": "~0.1.3", - "aproba": "^2.0.0", "archy": "~1.0.0", - "bin-links": "^1.1.7", - "bluebird": "^3.5.5", - "byte-size": "^5.0.1", - "cacache": "^12.0.3", - "call-limit": "^1.1.1", - "chownr": "^1.1.4", - "ci-info": "^2.0.0", + "byte-size": "^7.0.1", + "cacache": "^15.0.6", + "chalk": "^4.1.0", + "chownr": "^2.0.0", "cli-columns": "^3.1.2", - "cli-table3": "^0.5.1", - "cmd-shim": "^3.0.3", + "cli-table3": "^0.6.0", "columnify": "~1.5.4", - "config-chain": "^1.1.12", - "debuglog": "*", - "detect-indent": "~5.0.0", - "detect-newline": "^2.1.0", - "dezalgo": "~1.0.3", - "editor": "~1.0.0", - "figgy-pudding": "^3.5.1", - "find-npm-prefix": "^1.0.2", - "fs-vacuum": "~1.2.10", - "fs-write-stream-atomic": "~1.0.10", - "gentle-fs": "^2.3.0", - "glob": "^7.1.6", - "graceful-fs": "^4.2.4", - "has-unicode": "~2.0.1", - "hosted-git-info": "^2.8.8", - "iferr": "^1.0.2", - "imurmurhash": "*", - "infer-owner": "^1.0.4", - "inflight": "~1.0.6", - "inherits": "^2.0.4", - "ini": "^1.3.5", - "init-package-json": "^1.10.3", - "is-cidr": "^3.0.0", - "json-parse-better-errors": "^1.0.2", - "lazy-property": "~1.0.0", - "libcipm": "^4.0.7", - "libnpm": "^3.0.1", - "libnpmaccess": "^3.0.2", - "libnpmhook": "^5.0.3", - "libnpmorg": "^1.0.1", - "libnpmsearch": "^2.0.2", - "libnpmteam": "^1.0.2", - "libnpx": "^10.2.2", - "lock-verify": "^2.1.0", - "lockfile": "^1.0.4", - "lodash._baseindexof": "*", - "lodash._baseuniq": "~4.6.0", - "lodash._bindcallback": "*", - "lodash._cacheindexof": "*", - "lodash._createcache": "*", - "lodash._getnative": "*", - "lodash.clonedeep": "~4.5.0", - "lodash.restparam": "*", - "lodash.union": "~4.6.0", - "lodash.uniq": "~4.5.0", - "lodash.without": "~4.4.0", - "lru-cache": "^5.1.1", - "meant": "~1.0.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.5", - "move-concurrently": "^1.0.1", - "node-gyp": "^5.1.0", - "nopt": "^4.0.3", - "normalize-package-data": "^2.5.0", - "npm-audit-report": "^1.3.2", - "npm-cache-filename": "~1.0.2", - "npm-install-checks": "^3.0.2", - "npm-lifecycle": "^3.1.4", - "npm-package-arg": "^6.1.1", - "npm-packlist": "^1.4.8", - "npm-pick-manifest": "^3.0.2", - "npm-profile": "^4.0.4", - "npm-registry-fetch": "^4.0.4", - "npm-user-validate": "~1.0.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "hosted-git-info": "^4.0.2", + "ini": "^2.0.0", + "init-package-json": "^2.0.2", + "is-cidr": "^4.0.2", + "json-parse-even-better-errors": "^2.3.1", + "leven": "^3.1.0", + "libnpmaccess": "^4.0.1", + "libnpmdiff": "^2.0.4", + "libnpmfund": "^1.0.2", + "libnpmhook": "^6.0.1", + "libnpmorg": "^2.0.1", + "libnpmpack": "^2.0.1", + "libnpmpublish": "^4.0.0", + "libnpmsearch": "^3.1.0", + "libnpmteam": "^2.0.2", + "libnpmversion": "^1.1.0", + "make-fetch-happen": "^8.0.14", + "minipass": "^3.1.3", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "mkdirp-infer-owner": "^2.0.0", + "ms": "^2.1.2", + "node-gyp": "^7.1.2", + "nopt": "^5.0.0", + "npm-audit-report": "^2.1.4", + "npm-package-arg": "^8.1.2", + "npm-pick-manifest": "^6.1.1", + "npm-profile": "^5.0.2", + "npm-registry-fetch": "^9.0.0", + "npm-user-validate": "^1.0.1", "npmlog": "~4.1.2", - "once": "~1.4.0", - "opener": "^1.5.1", - "osenv": "^0.1.5", - "pacote": "^9.5.12", - "path-is-inside": "~1.0.2", - "promise-inflight": "~1.0.1", + "opener": "^1.5.2", + "pacote": "^11.3.1", + "parse-conflict-json": "^1.1.1", "qrcode-terminal": "^0.12.0", - "query-string": "^6.8.2", - "qw": "~1.0.1", "read": "~1.0.7", - "read-cmd-shim": "^1.0.5", - "read-installed": "~4.0.3", - "read-package-json": "^2.1.1", - "read-package-tree": "^5.3.1", - "readable-stream": "^3.6.0", + "read-package-json": "^3.0.1", + "read-package-json-fast": "^2.0.2", "readdir-scoped-modules": "^1.1.0", - "request": "^2.88.0", - "retry": "^0.12.0", - "rimraf": "^2.7.1", - "safe-buffer": "^5.1.2", - "semver": "^5.7.1", - "sha": "^3.0.0", - "slide": "~1.1.6", - "sorted-object": "~2.0.1", - "sorted-union-stream": "~2.1.3", - "ssri": "^6.0.1", - "stringify-package": "^1.0.1", - "tar": "^4.4.13", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "ssri": "^8.0.1", + "tar": "^6.1.0", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", - "uid-number": "0.0.6", - "umask": "~1.1.0", - "unique-filename": "^1.1.1", - "unpipe": "~1.0.0", - "update-notifier": "^2.5.0", - "uuid": "^3.3.3", - "validate-npm-package-license": "^3.0.4", + "treeverse": "^1.0.4", "validate-npm-package-name": "~3.0.0", - "which": "^1.3.1", - "worker-farm": "^1.7.0", - "write-file-atomic": "^2.4.3" + "which": "^2.0.2", + "write-file-atomic": "^3.0.3" }, "dependencies": { - "JSONStream": { - "version": "1.3.5", + "@npmcli/arborist": { + "version": "2.3.0", "bundled": true, "dev": true, "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, - "abbrev": { - "version": "1.1.1", + "@npmcli/installed-package-contents": "^1.0.7", + "@npmcli/map-workspaces": "^1.0.2", + "@npmcli/metavuln-calculator": "^1.1.0", + "@npmcli/move-file": "^1.1.0", + "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/node-gyp": "^1.0.1", + "@npmcli/run-script": "^1.8.2", + "bin-links": "^2.2.1", + "cacache": "^15.0.3", + "common-ancestor-path": "^1.0.1", + "json-parse-even-better-errors": "^2.3.1", + "json-stringify-nice": "^1.1.2", + "mkdirp-infer-owner": "^2.0.0", + "npm-install-checks": "^4.0.0", + "npm-package-arg": "^8.1.0", + "npm-pick-manifest": "^6.1.0", + "npm-registry-fetch": "^9.0.0", + "pacote": "^11.2.6", + "parse-conflict-json": "^1.1.1", + "promise-all-reject-late": "^1.0.0", + "promise-call-limit": "^1.0.1", + "read-package-json-fast": "^2.0.2", + "readdir-scoped-modules": "^1.1.0", + "semver": "^7.3.5", + "tar": "^6.1.0", + "treeverse": "^1.0.4", + "walk-up-path": "^1.0.0" + } + }, + "@npmcli/ci-detect": { + "version": "1.3.0", "bundled": true, "dev": true }, - "agent-base": { - "version": "4.3.0", + "@npmcli/config": { + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "es6-promisify": "^5.0.0" + "ini": "^2.0.0", + "mkdirp-infer-owner": "^2.0.0", + "nopt": "^5.0.0", + "semver": "^7.3.4", + "walk-up-path": "^1.0.0" } }, - "agentkeepalive": { - "version": "3.5.2", + "@npmcli/disparity-colors": { + "version": "1.0.1", "bundled": true, "dev": true, "requires": { - "humanize-ms": "^1.2.1" + "ansi-styles": "^4.3.0" } }, - "ajv": { - "version": "5.5.2", + "@npmcli/git": { + "version": "2.0.6", "bundled": true, "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" + "@npmcli/promise-spawn": "^1.1.0", + "lru-cache": "^6.0.0", + "mkdirp": "^1.0.3", + "npm-pick-manifest": "^6.0.0", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.2", + "unique-filename": "^1.1.1", + "which": "^2.0.2" } }, - "ansi-align": { - "version": "2.0.0", + "@npmcli/installed-package-contents": { + "version": "1.0.7", "bundled": true, "dev": true, "requires": { - "string-width": "^2.0.0" + "npm-bundled": "^1.1.1", + "npm-normalize-package-bin": "^1.0.1" } }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", + "@npmcli/map-workspaces": { + "version": "1.0.3", "bundled": true, "dev": true, "requires": { - "color-convert": "^1.9.0" + "@npmcli/name-from-folder": "^1.0.1", + "glob": "^7.1.6", + "minimatch": "^3.0.4", + "read-package-json-fast": "^2.0.1" + } + }, + "@npmcli/metavuln-calculator": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "requires": { + "cacache": "^15.0.5", + "pacote": "^11.1.11", + "semver": "^7.3.2" + } + }, + "@npmcli/move-file": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + } + }, + "@npmcli/name-from-folder": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "@npmcli/node-gyp": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "@npmcli/promise-spawn": { + "version": "1.3.2", + "bundled": true, + "dev": true, + "requires": { + "infer-owner": "^1.0.4" + } + }, + "@npmcli/run-script": { + "version": "1.8.4", + "bundled": true, + "dev": true, + "requires": { + "@npmcli/node-gyp": "^1.0.2", + "@npmcli/promise-spawn": "^1.3.2", + "infer-owner": "^1.0.4", + "node-gyp": "^7.1.0", + "read-package-json-fast": "^2.0.1" + } + }, + "@tootallnate/once": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "agent-base": { + "version": "6.0.2", + "bundled": true, + "dev": true, + "requires": { + "debug": "4" + } + }, + "agentkeepalive": { + "version": "4.1.4", + "bundled": true, + "dev": true, + "requires": { + "debug": "^4.1.0", + "depd": "^1.1.2", + "humanize-ms": "^1.2.1" + } + }, + "aggregate-error": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "ajv": { + "version": "6.12.6", + "bundled": true, + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "bundled": true, + "dev": true, + "requires": { + "color-convert": "^2.0.1" } }, "ansicolors": { @@ -3311,36 +3512,12 @@ "dev": true }, "are-we-there-yet": { - "version": "1.1.4", + "version": "1.1.5", "bundled": true, "dev": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "asap": { @@ -3372,7 +3549,7 @@ "dev": true }, "aws4": { - "version": "1.8.0", + "version": "1.11.0", "bundled": true, "dev": true }, @@ -3385,43 +3562,28 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "tweetnacl": "^0.14.3" } }, "bin-links": { - "version": "1.1.7", + "version": "2.2.1", "bundled": true, "dev": true, "requires": { - "bluebird": "^3.5.3", - "cmd-shim": "^3.0.0", - "gentle-fs": "^2.3.0", - "graceful-fs": "^4.1.15", + "cmd-shim": "^4.0.1", + "mkdirp": "^1.0.3", "npm-normalize-package-bin": "^1.0.0", - "write-file-atomic": "^2.3.0" + "read-cmd-shim": "^2.0.0", + "rimraf": "^3.0.0", + "write-file-atomic": "^3.0.3" } }, - "bluebird": { - "version": "3.5.5", + "binary-extensions": { + "version": "2.2.0", "bundled": true, "dev": true }, - "boxen": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" - } - }, "brace-expansion": { "version": "1.1.11", "bundled": true, @@ -3431,98 +3593,69 @@ "concat-map": "0.0.1" } }, - "buffer-from": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "builtins": { "version": "1.0.3", "bundled": true, "dev": true }, - "byline": { - "version": "5.0.0", - "bundled": true, - "dev": true - }, "byte-size": { - "version": "5.0.1", + "version": "7.0.1", "bundled": true, "dev": true }, "cacache": { - "version": "12.0.3", + "version": "15.0.6", "bundled": true, "dev": true, "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" } }, - "call-limit": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - }, - "capture-stack-trace": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "caseless": { "version": "0.12.0", "bundled": true, "dev": true }, "chalk": { - "version": "2.4.1", + "version": "4.1.0", "bundled": true, "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" } }, "chownr": { - "version": "1.1.4", - "bundled": true, - "dev": true - }, - "ci-info": { "version": "2.0.0", "bundled": true, "dev": true }, "cidr-regex": { - "version": "2.0.10", + "version": "3.1.1", "bundled": true, "dev": true, "requires": { - "ip-regex": "^2.1.0" + "ip-regex": "^4.1.0" } }, - "cli-boxes": { - "version": "1.0.0", + "clean-stack": { + "version": "2.2.0", "bundled": true, "dev": true }, @@ -3536,36 +3669,41 @@ } }, "cli-table3": { - "version": "0.5.1", + "version": "0.6.0", "bundled": true, "dev": true, "requires": { "colors": "^1.1.2", "object-assign": "^4.1.0", - "string-width": "^2.1.1" - } - }, - "cliui": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^4.2.0" }, "dependencies": { "ansi-regex": { + "version": "5.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { "version": "3.0.0", "bundled": true, "dev": true }, + "string-width": { + "version": "4.2.2", + "bundled": true, + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, "strip-ansi": { - "version": "4.0.0", + "version": "6.0.0", "bundled": true, "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.0" } } } @@ -3576,39 +3714,33 @@ "dev": true }, "cmd-shim": { - "version": "3.0.3", + "version": "4.1.0", "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "mkdirp": "~0.5.0" + "mkdirp-infer-owner": "^2.0.0" } }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true - }, "code-point-at": { "version": "1.1.0", "bundled": true, "dev": true }, "color-convert": { - "version": "1.9.1", + "version": "2.0.1", "bundled": true, "dev": true, "requires": { - "color-name": "^1.1.1" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", + "version": "1.1.4", "bundled": true, "dev": true }, "colors": { - "version": "1.3.3", + "version": "1.4.0", "bundled": true, "dev": true, "optional": true @@ -3623,405 +3755,131 @@ } }, "combined-stream": { - "version": "1.0.6", + "version": "1.0.8", "bundled": true, "dev": true, "requires": { "delayed-stream": "~1.0.0" } }, + "common-ancestor-path": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, "concat-map": { "version": "0.0.1", "bundled": true, "dev": true }, - "concat-stream": { - "version": "1.6.2", + "console-control-strings": { + "version": "1.1.0", "bundled": true, - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } + "dev": true }, - "config-chain": { - "version": "1.1.12", + "core-util-is": { + "version": "1.0.2", "bundled": true, - "dev": true, - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } + "dev": true }, - "configstore": { - "version": "3.1.2", + "dashdash": { + "version": "1.14.1", "bundled": true, "dev": true, "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "assert-plus": "^1.0.0" } }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", + "debug": { + "version": "4.3.1", "bundled": true, "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "ms": "2.1.2" }, "dependencies": { - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "iferr": { - "version": "0.1.5", + "ms": { + "version": "2.1.2", "bundled": true, "dev": true } } }, - "core-util-is": { - "version": "1.0.2", + "debuglog": { + "version": "1.0.1", "bundled": true, "dev": true }, - "create-error-class": { - "version": "3.0.2", + "defaults": { + "version": "1.0.3", "bundled": true, "dev": true, "requires": { - "capture-stack-trace": "^1.0.0" + "clone": "^1.0.2" } }, - "cross-spawn": { - "version": "5.1.0", + "delayed-stream": { + "version": "1.0.0", "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "bundled": true, - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "yallist": { - "version": "2.1.2", - "bundled": true, - "dev": true - } - } + "dev": true }, - "crypto-random-string": { + "delegates": { "version": "1.0.0", "bundled": true, "dev": true }, - "cyclist": { - "version": "0.2.2", + "depd": { + "version": "1.1.2", "bundled": true, "dev": true }, - "dashdash": { - "version": "1.14.1", + "dezalgo": { + "version": "1.0.3", "bundled": true, "dev": true, "requires": { - "assert-plus": "^1.0.0" + "asap": "^2.0.0", + "wrappy": "1" } }, - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - } - } - }, - "debuglog": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true - }, - "defaults": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "define-properties": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "detect-indent": { - "version": "5.0.0", - "bundled": true, - "dev": true - }, - "detect-newline": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "dezalgo": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "dot-prop": { - "version": "4.2.0", - "bundled": true, - "dev": true, - "requires": { - "is-obj": "^1.0.0" - } - }, - "dotenv": { - "version": "5.0.1", + "diff": { + "version": "5.0.0", "bundled": true, "dev": true }, - "duplexer3": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "duplexify": { - "version": "3.6.0", - "bundled": true, - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "ecc-jsbn": { "version": "0.1.2", "bundled": true, "dev": true, - "optional": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" } }, - "editor": { - "version": "1.0.0", + "emoji-regex": { + "version": "8.0.0", "bundled": true, "dev": true }, "encoding": { - "version": "0.1.12", - "bundled": true, - "dev": true, - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "end-of-stream": { - "version": "1.4.1", + "version": "0.1.13", "bundled": true, "dev": true, + "optional": true, "requires": { - "once": "^1.4.0" + "iconv-lite": "^0.6.2" } }, "env-paths": { - "version": "2.2.0", + "version": "2.2.1", "bundled": true, "dev": true }, "err-code": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "errno": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, - "es-abstract": { - "version": "1.12.0", - "bundled": true, - "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.2.0", - "bundled": true, - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es6-promise": { - "version": "4.2.8", - "bundled": true, - "dev": true - }, - "es6-promisify": { - "version": "5.0.0", - "bundled": true, - "dev": true, - "requires": { - "es6-promise": "^4.0.3" - } - }, - "escape-string-regexp": { - "version": "1.0.5", + "version": "2.0.3", "bundled": true, "dev": true }, - "execa": { - "version": "0.7.0", - "bundled": true, - "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" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, "extend": { "version": "3.0.2", "bundled": true, @@ -4033,65 +3891,14 @@ "dev": true }, "fast-deep-equal": { - "version": "1.1.0", + "version": "3.1.3", "bundled": true, "dev": true }, "fast-json-stable-stringify": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "figgy-pudding": { - "version": "3.5.1", - "bundled": true, - "dev": true - }, - "find-npm-prefix": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "find-up": { "version": "2.1.0", "bundled": true, - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "flush-write-stream": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } + "dev": true }, "forever-agent": { "version": "0.6.1", @@ -4099,115 +3906,21 @@ "dev": true }, "form-data": { - "version": "2.3.2", + "version": "2.3.3", "bundled": true, "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "1.0.6", + "combined-stream": "^1.0.6", "mime-types": "^2.1.12" } }, - "from2": { - "version": "2.3.0", - "bundled": true, - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "fs-minipass": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "requires": { - "minipass": "^2.6.0" - }, - "dependencies": { - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - } - } - }, - "fs-vacuum": { - "version": "1.2.10", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "path-is-inside": "^1.0.1", - "rimraf": "^2.5.2" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - }, - "dependencies": { - "iferr": { - "version": "0.1.5", - "bundled": true, - "dev": true - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } + "minipass": "^3.0.0" } }, "fs.realpath": { @@ -4240,6 +3953,14 @@ "bundled": true, "dev": true }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, "string-width": { "version": "1.0.2", "bundled": true, @@ -4252,54 +3973,6 @@ } } }, - "genfun": { - "version": "5.0.0", - "bundled": true, - "dev": true - }, - "gentle-fs": { - "version": "2.3.0", - "bundled": true, - "dev": true, - "requires": { - "aproba": "^1.1.2", - "chownr": "^1.1.2", - "cmd-shim": "^3.0.3", - "fs-vacuum": "^1.2.10", - "graceful-fs": "^4.1.11", - "iferr": "^0.1.5", - "infer-owner": "^1.0.4", - "mkdirp": "^0.5.1", - "path-is-inside": "^1.0.2", - "read-cmd-shim": "^1.0.1", - "slide": "^1.1.6" - }, - "dependencies": { - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "iferr": { - "version": "0.1.5", - "bundled": true, - "dev": true - } - } - }, - "get-caller-file": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, "getpass": { "version": "0.1.7", "bundled": true, @@ -4321,41 +3994,8 @@ "path-is-absolute": "^1.0.0" } }, - "global-dirs": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "requires": { - "ini": "^1.3.4" - } - }, - "got": { - "version": "6.7.1", - "bundled": true, - "dev": true, - "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, "graceful-fs": { - "version": "4.2.4", + "version": "4.2.6", "bundled": true, "dev": true }, @@ -4365,11 +4005,11 @@ "dev": true }, "har-validator": { - "version": "5.1.0", + "version": "5.1.5", "bundled": true, "dev": true, "requires": { - "ajv": "^5.3.0", + "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, @@ -4382,12 +4022,7 @@ } }, "has-flag": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "has-symbols": { - "version": "1.0.0", + "version": "4.0.0", "bundled": true, "dev": true }, @@ -4397,22 +4032,26 @@ "dev": true }, "hosted-git-info": { - "version": "2.8.8", + "version": "4.0.2", "bundled": true, - "dev": true + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } }, "http-cache-semantics": { - "version": "3.8.1", + "version": "4.1.0", "bundled": true, "dev": true }, "http-proxy-agent": { - "version": "2.1.0", + "version": "4.0.1", "bundled": true, "dev": true, "requires": { - "agent-base": "4", - "debug": "3.1.0" + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" } }, "http-signature": { @@ -4426,12 +4065,12 @@ } }, "https-proxy-agent": { - "version": "2.2.4", + "version": "5.0.0", "bundled": true, "dev": true, "requires": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" + "agent-base": "6", + "debug": "4" } }, "humanize-ms": { @@ -4443,18 +4082,14 @@ } }, "iconv-lite": { - "version": "0.4.23", + "version": "0.6.2", "bundled": true, "dev": true, + "optional": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, - "iferr": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, "ignore-walk": { "version": "3.0.3", "bundled": true, @@ -4463,13 +4098,13 @@ "minimatch": "^3.0.4" } }, - "import-lazy": { - "version": "2.1.0", + "imurmurhash": { + "version": "0.1.4", "bundled": true, "dev": true }, - "imurmurhash": { - "version": "0.1.4", + "indent-string": { + "version": "4.0.0", "bundled": true, "dev": true }, @@ -4493,139 +4128,61 @@ "dev": true }, "ini": { - "version": "1.3.5", + "version": "2.0.0", "bundled": true, "dev": true }, "init-package-json": { - "version": "1.10.3", + "version": "2.0.2", "bundled": true, "dev": true, "requires": { "glob": "^7.1.1", - "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0", + "npm-package-arg": "^8.1.0", "promzard": "^0.3.0", "read": "~1.0.1", - "read-package-json": "1 || 2", - "semver": "2.x || 3.x || 4 || 5", - "validate-npm-package-license": "^3.0.1", + "read-package-json": "^3.0.0", + "semver": "^7.3.2", + "validate-npm-package-license": "^3.0.4", "validate-npm-package-name": "^3.0.0" } }, - "invert-kv": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "ip": { "version": "1.1.5", "bundled": true, "dev": true }, "ip-regex": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "is-callable": { - "version": "1.1.4", + "version": "4.3.0", "bundled": true, "dev": true }, - "is-ci": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "requires": { - "ci-info": "^1.5.0" - }, - "dependencies": { - "ci-info": { - "version": "1.6.0", - "bundled": true, - "dev": true - } - } - }, "is-cidr": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "cidr-regex": "^2.0.10" - } - }, - "is-date-object": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", + "version": "4.0.2", "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "cidr-regex": "^3.1.1" } }, - "is-installed-globally": { - "version": "0.1.0", + "is-core-module": { + "version": "2.2.0", "bundled": true, "dev": true, "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" + "has": "^1.0.3" } }, - "is-npm": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-obj": { - "version": "1.0.1", + "is-fullwidth-code-point": { + "version": "2.0.0", "bundled": true, "dev": true }, - "is-path-inside": { + "is-lambda": { "version": "1.0.1", "bundled": true, - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-redirect": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "requires": { - "has": "^1.0.1" - } - }, - "is-retry-allowed": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, "dev": true }, - "is-symbol": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "has-symbols": "^1.0.0" - } - }, "is-typedarray": { "version": "1.0.0", "bundled": true, @@ -4649,11 +4206,10 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, - "json-parse-better-errors": { - "version": "1.0.2", + "json-parse-even-better-errors": { + "version": "2.3.1", "bundled": true, "dev": true }, @@ -4663,7 +4219,12 @@ "dev": true }, "json-schema-traverse": { - "version": "0.3.1", + "version": "0.4.1", + "bundled": true, + "dev": true + }, + "json-stringify-nice": { + "version": "1.1.3", "bundled": true, "dev": true }, @@ -4688,389 +4249,165 @@ "verror": "1.10.0" } }, - "latest-version": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "package-json": "^4.0.0" - } - }, - "lazy-property": { - "version": "1.0.0", + "just-diff": { + "version": "3.0.2", "bundled": true, "dev": true }, - "lcid": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "libcipm": { - "version": "4.0.7", + "just-diff-apply": { + "version": "3.0.0", "bundled": true, - "dev": true, - "requires": { - "bin-links": "^1.1.2", - "bluebird": "^3.5.1", - "figgy-pudding": "^3.5.1", - "find-npm-prefix": "^1.0.2", - "graceful-fs": "^4.1.11", - "ini": "^1.3.5", - "lock-verify": "^2.0.2", - "mkdirp": "^0.5.1", - "npm-lifecycle": "^3.0.0", - "npm-logical-tree": "^1.2.1", - "npm-package-arg": "^6.1.0", - "pacote": "^9.1.0", - "read-package-json": "^2.0.13", - "rimraf": "^2.6.2", - "worker-farm": "^1.6.0" - } + "dev": true }, - "libnpm": { - "version": "3.0.1", + "leven": { + "version": "3.1.0", "bundled": true, - "dev": true, - "requires": { - "bin-links": "^1.1.2", - "bluebird": "^3.5.3", - "find-npm-prefix": "^1.0.2", - "libnpmaccess": "^3.0.2", - "libnpmconfig": "^1.2.1", - "libnpmhook": "^5.0.3", - "libnpmorg": "^1.0.1", - "libnpmpublish": "^1.1.2", - "libnpmsearch": "^2.0.2", - "libnpmteam": "^1.0.2", - "lock-verify": "^2.0.2", - "npm-lifecycle": "^3.0.0", - "npm-logical-tree": "^1.2.1", - "npm-package-arg": "^6.1.0", - "npm-profile": "^4.0.2", - "npm-registry-fetch": "^4.0.0", - "npmlog": "^4.1.2", - "pacote": "^9.5.3", - "read-package-json": "^2.0.13", - "stringify-package": "^1.0.0" - } + "dev": true }, "libnpmaccess": { - "version": "3.0.2", + "version": "4.0.1", "bundled": true, "dev": true, "requires": { "aproba": "^2.0.0", - "get-stream": "^4.0.0", - "npm-package-arg": "^6.1.0", - "npm-registry-fetch": "^4.0.0" - } - }, - "libnpmconfig": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1", - "find-up": "^3.0.0", - "ini": "^1.3.5" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "bundled": true, - "dev": true - } + "minipass": "^3.1.1", + "npm-package-arg": "^8.0.0", + "npm-registry-fetch": "^9.0.0" } }, - "libnpmhook": { - "version": "5.0.3", + "libnpmdiff": { + "version": "2.0.4", "bundled": true, "dev": true, "requires": { - "aproba": "^2.0.0", - "figgy-pudding": "^3.4.1", - "get-stream": "^4.0.0", - "npm-registry-fetch": "^4.0.0" + "@npmcli/disparity-colors": "^1.0.1", + "@npmcli/installed-package-contents": "^1.0.7", + "binary-extensions": "^2.2.0", + "diff": "^5.0.0", + "minimatch": "^3.0.4", + "npm-package-arg": "^8.1.1", + "pacote": "^11.3.0", + "tar": "^6.1.0" } }, - "libnpmorg": { - "version": "1.0.1", + "libnpmfund": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "aproba": "^2.0.0", - "figgy-pudding": "^3.4.1", - "get-stream": "^4.0.0", - "npm-registry-fetch": "^4.0.0" + "@npmcli/arborist": "^2.0.0" } }, - "libnpmpublish": { - "version": "1.1.2", + "libnpmhook": { + "version": "6.0.1", "bundled": true, "dev": true, "requires": { "aproba": "^2.0.0", - "figgy-pudding": "^3.5.1", - "get-stream": "^4.0.0", - "lodash.clonedeep": "^4.5.0", - "normalize-package-data": "^2.4.0", - "npm-package-arg": "^6.1.0", - "npm-registry-fetch": "^4.0.0", - "semver": "^5.5.1", - "ssri": "^6.0.1" - } - }, - "libnpmsearch": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1", - "get-stream": "^4.0.0", - "npm-registry-fetch": "^4.0.0" + "npm-registry-fetch": "^9.0.0" } }, - "libnpmteam": { - "version": "1.0.2", + "libnpmorg": { + "version": "2.0.1", "bundled": true, "dev": true, "requires": { "aproba": "^2.0.0", - "figgy-pudding": "^3.4.1", - "get-stream": "^4.0.0", - "npm-registry-fetch": "^4.0.0" - } - }, - "libnpx": { - "version": "10.2.2", - "bundled": true, - "dev": true, - "requires": { - "dotenv": "^5.0.1", - "npm-package-arg": "^6.0.0", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.0", - "update-notifier": "^2.3.0", - "which": "^1.3.0", - "y18n": "^4.0.0", - "yargs": "^11.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "lock-verify": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "npm-package-arg": "^6.1.0", - "semver": "^5.4.1" - } - }, - "lockfile": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "requires": { - "signal-exit": "^3.0.2" - } - }, - "lodash._baseindexof": { - "version": "3.1.0", - "bundled": true, - "dev": true - }, - "lodash._baseuniq": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "requires": { - "lodash._createset": "~4.0.0", - "lodash._root": "~3.0.0" - } - }, - "lodash._bindcallback": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "lodash._cacheindexof": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "lodash._createcache": { - "version": "3.1.2", - "bundled": true, - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0" + "npm-registry-fetch": "^9.0.0" } }, - "lodash._createset": { - "version": "4.0.3", - "bundled": true, - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "bundled": true, - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "bundled": true, - "dev": true - }, - "lodash.restparam": { - "version": "3.6.1", - "bundled": true, - "dev": true - }, - "lodash.union": { - "version": "4.6.0", - "bundled": true, - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "bundled": true, - "dev": true - }, - "lodash.without": { - "version": "4.4.0", - "bundled": true, - "dev": true - }, - "lowercase-keys": { - "version": "1.0.1", + "libnpmpack": { + "version": "2.0.1", "bundled": true, - "dev": true + "dev": true, + "requires": { + "@npmcli/run-script": "^1.8.3", + "npm-package-arg": "^8.1.0", + "pacote": "^11.2.6" + } }, - "lru-cache": { - "version": "5.1.1", + "libnpmpublish": { + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "yallist": "^3.0.2" + "normalize-package-data": "^3.0.0", + "npm-package-arg": "^8.1.0", + "npm-registry-fetch": "^9.0.0", + "semver": "^7.1.3", + "ssri": "^8.0.0" } }, - "make-dir": { - "version": "1.3.0", + "libnpmsearch": { + "version": "3.1.0", "bundled": true, "dev": true, "requires": { - "pify": "^3.0.0" + "npm-registry-fetch": "^9.0.0" } }, - "make-fetch-happen": { - "version": "5.0.2", + "libnpmteam": { + "version": "2.0.2", "bundled": true, "dev": true, "requires": { - "agentkeepalive": "^3.4.1", - "cacache": "^12.0.0", - "http-cache-semantics": "^3.8.1", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "node-fetch-npm": "^2.0.2", - "promise-retry": "^1.1.1", - "socks-proxy-agent": "^4.0.0", - "ssri": "^6.0.0" + "aproba": "^2.0.0", + "npm-registry-fetch": "^9.0.0" } }, - "map-age-cleaner": { - "version": "0.1.3", + "libnpmversion": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "p-defer": "^1.0.0" + "@npmcli/git": "^2.0.6", + "@npmcli/run-script": "^1.8.3", + "json-parse-even-better-errors": "^2.3.1", + "semver": "^7.3.4", + "stringify-package": "^1.0.1" } }, - "meant": { - "version": "1.0.1", + "lru-cache": { + "version": "6.0.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "yallist": "^4.0.0" + } }, - "mem": { - "version": "4.3.0", + "make-fetch-happen": { + "version": "8.0.14", "bundled": true, "dev": true, "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "bundled": true, - "dev": true - } + "agentkeepalive": "^4.1.3", + "cacache": "^15.0.5", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^6.0.0", + "minipass": "^3.1.3", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^1.3.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^5.0.0", + "ssri": "^8.0.0" } }, "mime-db": { - "version": "1.35.0", + "version": "1.46.0", "bundled": true, "dev": true }, "mime-types": { - "version": "2.1.19", + "version": "2.1.29", "bundled": true, "dev": true, "requires": { - "mime-db": "~1.35.0" + "mime-db": "1.46.0" } }, "minimatch": { @@ -5081,157 +4418,142 @@ "brace-expansion": "^1.1.7" } }, - "minizlib": { - "version": "1.3.3", + "minipass": { + "version": "3.1.3", "bundled": true, "dev": true, "requires": { - "minipass": "^2.9.0" - }, - "dependencies": { - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - } + "yallist": "^4.0.0" } }, - "mississippi": { - "version": "3.0.0", + "minipass-collect": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "minipass": "^3.0.0" } }, - "mkdirp": { - "version": "0.5.5", + "minipass-fetch": { + "version": "1.3.3", "bundled": true, "dev": true, "requires": { - "minimist": "^1.2.5" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "bundled": true, - "dev": true - } + "encoding": "^0.1.12", + "minipass": "^3.1.0", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" + } + }, + "minipass-flush": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "requires": { + "minipass": "^3.0.0" } }, - "move-concurrently": { + "minipass-json-stream": { "version": "1.0.1", "bundled": true, "dev": true, "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - }, - "dependencies": { - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true - } + "jsonparse": "^1.3.1", + "minipass": "^3.0.0" } }, - "ms": { - "version": "2.1.1", + "minipass-pipeline": { + "version": "1.2.4", "bundled": true, - "dev": true + "dev": true, + "requires": { + "minipass": "^3.0.0" + } }, - "mute-stream": { - "version": "0.0.7", + "minipass-sized": { + "version": "1.0.3", "bundled": true, - "dev": true + "dev": true, + "requires": { + "minipass": "^3.0.0" + } }, - "nice-try": { - "version": "1.0.5", + "minizlib": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", "bundled": true, "dev": true }, - "node-fetch-npm": { - "version": "2.0.2", + "mkdirp-infer-owner": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "encoding": "^0.1.11", - "json-parse-better-errors": "^1.0.0", - "safe-buffer": "^5.1.1" + "chownr": "^2.0.0", + "infer-owner": "^1.0.4", + "mkdirp": "^1.0.3" } }, + "ms": { + "version": "2.1.3", + "bundled": true, + "dev": true + }, + "mute-stream": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, "node-gyp": { - "version": "5.1.0", + "version": "7.1.2", "bundled": true, "dev": true, "requires": { "env-paths": "^2.2.0", "glob": "^7.1.4", - "graceful-fs": "^4.2.2", - "mkdirp": "^0.5.1", - "nopt": "^4.0.1", + "graceful-fs": "^4.2.3", + "nopt": "^5.0.0", "npmlog": "^4.1.2", - "request": "^2.88.0", - "rimraf": "^2.6.3", - "semver": "^5.7.1", - "tar": "^4.4.12", - "which": "^1.3.1" + "request": "^2.88.2", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "tar": "^6.0.2", + "which": "^2.0.2" } }, "nopt": { - "version": "4.0.3", + "version": "5.0.0", "bundled": true, "dev": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1" } }, "normalize-package-data": { - "version": "2.5.0", + "version": "3.0.2", "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", + "hosted-git-info": "^4.0.1", + "resolve": "^1.20.0", + "semver": "^7.3.4", "validate-npm-package-license": "^3.0.1" - }, - "dependencies": { - "resolve": { - "version": "1.10.0", - "bundled": true, - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - } } }, "npm-audit-report": { - "version": "1.3.2", + "version": "2.1.4", "bundled": true, "dev": true, "requires": { - "cli-table3": "^0.5.0", - "console-control-strings": "^1.1.0" + "chalk": "^4.0.0" } }, "npm-bundled": { @@ -5242,116 +4564,76 @@ "npm-normalize-package-bin": "^1.0.1" } }, - "npm-cache-filename": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, "npm-install-checks": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "semver": "^2.3.0 || 3.x || 4 || 5" - } - }, - "npm-lifecycle": { - "version": "3.1.4", + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "byline": "^5.0.0", - "graceful-fs": "^4.1.15", - "node-gyp": "^5.0.2", - "resolve-from": "^4.0.0", - "slide": "^1.1.6", - "uid-number": "0.0.6", - "umask": "^1.1.0", - "which": "^1.3.1" + "semver": "^7.1.1" } }, - "npm-logical-tree": { - "version": "1.2.1", - "bundled": true, - "dev": true - }, "npm-normalize-package-bin": { "version": "1.0.1", "bundled": true, "dev": true }, "npm-package-arg": { - "version": "6.1.1", + "version": "8.1.2", "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.7.1", - "osenv": "^0.1.5", - "semver": "^5.6.0", + "hosted-git-info": "^4.0.1", + "semver": "^7.3.4", "validate-npm-package-name": "^3.0.0" } }, "npm-packlist": { - "version": "1.4.8", + "version": "2.1.5", "bundled": true, "dev": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1", + "glob": "^7.1.6", + "ignore-walk": "^3.0.3", + "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" } }, "npm-pick-manifest": { - "version": "3.0.2", + "version": "6.1.1", "bundled": true, "dev": true, "requires": { - "figgy-pudding": "^3.5.1", - "npm-package-arg": "^6.0.0", - "semver": "^5.4.1" + "npm-install-checks": "^4.0.0", + "npm-normalize-package-bin": "^1.0.1", + "npm-package-arg": "^8.1.2", + "semver": "^7.3.4" } }, "npm-profile": { - "version": "4.0.4", + "version": "5.0.2", "bundled": true, "dev": true, "requires": { - "aproba": "^1.1.2 || 2", - "figgy-pudding": "^3.4.1", - "npm-registry-fetch": "^4.0.0" + "npm-registry-fetch": "^9.0.0" } }, "npm-registry-fetch": { - "version": "4.0.4", - "bundled": true, - "dev": true, - "requires": { - "JSONStream": "^1.3.4", - "bluebird": "^3.5.1", - "figgy-pudding": "^3.4.1", - "lru-cache": "^5.1.1", - "make-fetch-happen": "^5.0.0", - "npm-package-arg": "^6.1.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.0", - "bundled": true, - "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", + "version": "9.0.0", "bundled": true, "dev": true, "requires": { - "path-key": "^2.0.0" + "@npmcli/ci-detect": "^1.0.0", + "lru-cache": "^6.0.0", + "make-fetch-happen": "^8.0.9", + "minipass": "^3.1.3", + "minipass-fetch": "^1.3.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.0.0", + "npm-package-arg": "^8.0.0" } }, "npm-user-validate": { - "version": "1.0.0", + "version": "1.0.1", "bundled": true, "dev": true }, @@ -5381,236 +4663,65 @@ "bundled": true, "dev": true }, - "object-keys": { - "version": "1.0.12", - "bundled": true, - "dev": true - }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" - } - }, "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "opener": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "bundled": true, - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - } - } - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-defer": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-is-promise": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "package-json": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" - } - }, - "pacote": { - "version": "9.5.12", - "bundled": true, - "dev": true, - "requires": { - "bluebird": "^3.5.3", - "cacache": "^12.0.2", - "chownr": "^1.1.2", - "figgy-pudding": "^3.5.1", - "get-stream": "^4.1.0", - "glob": "^7.1.3", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "make-fetch-happen": "^5.0.0", - "minimatch": "^3.0.4", - "minipass": "^2.3.5", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "normalize-package-data": "^2.4.0", - "npm-normalize-package-bin": "^1.0.0", - "npm-package-arg": "^6.1.0", - "npm-packlist": "^1.1.12", - "npm-pick-manifest": "^3.0.0", - "npm-registry-fetch": "^4.0.0", - "osenv": "^0.1.5", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "protoduck": "^5.0.1", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.2", - "semver": "^5.6.0", - "ssri": "^6.0.1", - "tar": "^4.4.10", - "unique-filename": "^1.1.1", - "which": "^1.3.1" - }, - "dependencies": { - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - } - } - }, - "parallel-transform": { - "version": "1.1.0", + "version": "1.4.0", "bundled": true, "dev": true, "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } + "wrappy": "1" } }, - "path-exists": { - "version": "3.0.0", + "opener": { + "version": "1.5.2", "bundled": true, "dev": true }, - "path-is-absolute": { - "version": "1.0.1", + "p-map": { + "version": "4.0.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } }, - "path-is-inside": { - "version": "1.0.2", + "pacote": { + "version": "11.3.1", "bundled": true, - "dev": true + "dev": true, + "requires": { + "@npmcli/git": "^2.0.1", + "@npmcli/installed-package-contents": "^1.0.6", + "@npmcli/promise-spawn": "^1.2.0", + "@npmcli/run-script": "^1.8.2", + "cacache": "^15.0.5", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "infer-owner": "^1.0.4", + "minipass": "^3.1.3", + "mkdirp": "^1.0.3", + "npm-package-arg": "^8.0.1", + "npm-packlist": "^2.1.4", + "npm-pick-manifest": "^6.0.0", + "npm-registry-fetch": "^9.0.0", + "promise-retry": "^2.0.1", + "read-package-json-fast": "^2.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.1.0" + } + }, + "parse-conflict-json": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "requires": { + "json-parse-even-better-errors": "^2.3.0", + "just-diff": "^3.0.1", + "just-diff-apply": "^3.0.0" + } }, - "path-key": { - "version": "2.0.1", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "dev": true }, @@ -5624,18 +4735,18 @@ "bundled": true, "dev": true }, - "pify": { - "version": "3.0.0", + "process-nextick-args": { + "version": "2.0.1", "bundled": true, "dev": true }, - "prepend-http": { - "version": "1.0.4", + "promise-all-reject-late": { + "version": "1.0.1", "bundled": true, "dev": true }, - "process-nextick-args": { - "version": "2.0.0", + "promise-call-limit": { + "version": "1.0.1", "bundled": true, "dev": true }, @@ -5645,19 +4756,12 @@ "dev": true }, "promise-retry": { - "version": "1.1.1", + "version": "2.0.1", "bundled": true, "dev": true, "requires": { - "err-code": "^1.0.0", - "retry": "^0.10.0" - }, - "dependencies": { - "retry": { - "version": "0.10.1", - "bundled": true, - "dev": true - } + "err-code": "^2.0.2", + "retry": "^0.12.0" } }, "promzard": { @@ -5668,66 +4772,13 @@ "read": "1" } }, - "proto-list": { - "version": "1.2.4", - "bundled": true, - "dev": true - }, - "protoduck": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "requires": { - "genfun": "^5.0.0" - } - }, - "prr": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, "psl": { - "version": "1.1.29", + "version": "1.8.0", "bundled": true, "dev": true }, - "pump": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.5.1", - "bundled": true, - "dev": true, - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, "punycode": { - "version": "1.4.1", + "version": "2.1.1", "bundled": true, "dev": true }, @@ -5741,39 +4792,6 @@ "bundled": true, "dev": true }, - "query-string": { - "version": "6.8.2", - "bundled": true, - "dev": true, - "requires": { - "decode-uri-component": "^0.2.0", - "split-on-first": "^1.0.0", - "strict-uri-encode": "^2.0.0" - } - }, - "qw": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "bundled": true, - "dev": true - } - } - }, "read": { "version": "1.0.7", "bundled": true, @@ -5783,57 +4801,42 @@ } }, "read-cmd-shim": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2" - } - }, - "read-installed": { - "version": "4.0.3", + "version": "2.0.0", "bundled": true, - "dev": true, - "requires": { - "debuglog": "^1.0.1", - "graceful-fs": "^4.1.2", - "read-package-json": "^2.0.0", - "readdir-scoped-modules": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "slide": "~1.1.3", - "util-extend": "^1.0.1" - } + "dev": true }, "read-package-json": { - "version": "2.1.1", + "version": "3.0.1", "bundled": true, "dev": true, "requires": { "glob": "^7.1.1", - "graceful-fs": "^4.1.2", - "json-parse-better-errors": "^1.0.1", - "normalize-package-data": "^2.0.0", + "json-parse-even-better-errors": "^2.3.0", + "normalize-package-data": "^3.0.0", "npm-normalize-package-bin": "^1.0.0" } }, - "read-package-tree": { - "version": "5.3.1", + "read-package-json-fast": { + "version": "2.0.2", "bundled": true, "dev": true, "requires": { - "read-package-json": "^2.0.0", - "readdir-scoped-modules": "^1.0.0", - "util-promisify": "^2.1.0" + "json-parse-even-better-errors": "^2.3.0", + "npm-normalize-package-bin": "^1.0.1" } }, "readable-stream": { - "version": "3.6.0", + "version": "2.3.7", "bundled": true, "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "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" } }, "readdir-scoped-modules": { @@ -5847,25 +4850,8 @@ "once": "^1.3.0" } }, - "registry-auth-token": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" - } - }, - "registry-url": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "rc": "^1.0.1" - } - }, "request": { - "version": "2.88.0", + "version": "2.88.2", "bundled": true, "dev": true, "requires": { @@ -5876,7 +4862,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -5886,25 +4872,30 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "bundled": true, + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } } }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "resolve-from": { - "version": "4.0.0", + "resolve": { + "version": "1.20.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } }, "retry": { "version": "0.12.0", @@ -5912,28 +4903,13 @@ "dev": true }, "rimraf": { - "version": "2.7.1", + "version": "3.0.2", "bundled": true, "dev": true, "requires": { "glob": "^7.1.3" } }, - "run-queue": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "aproba": "^1.1.1" - }, - "dependencies": { - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true - } - } - }, "safe-buffer": { "version": "5.1.2", "bundled": true, @@ -5945,16 +4921,11 @@ "dev": true }, "semver": { - "version": "5.7.1", - "bundled": true, - "dev": true - }, - "semver-diff": { - "version": "2.1.0", + "version": "7.3.5", "bundled": true, "dev": true, "requires": { - "semver": "^5.0.3" + "lru-cache": "^6.0.0" } }, "set-blocking": { @@ -5962,34 +4933,8 @@ "bundled": true, "dev": true }, - "sha": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2" - } - }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", + "version": "3.0.3", "bundled": true, "dev": true }, @@ -5999,81 +4944,26 @@ "dev": true }, "socks": { - "version": "2.3.3", + "version": "2.6.0", "bundled": true, "dev": true, "requires": { - "ip": "1.1.5", + "ip": "^1.1.5", "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "agent-base": "~4.2.1", - "socks": "~2.3.2" - }, - "dependencies": { - "agent-base": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - } - } - }, - "sorted-object": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "sorted-union-stream": { - "version": "2.1.3", + "version": "5.0.0", "bundled": true, "dev": true, "requires": { - "from2": "^1.3.0", - "stream-iterate": "^1.1.0" - }, - "dependencies": { - "from2": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "~1.1.10" - } - }, - "isarray": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "bundled": true, - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "bundled": true, - "dev": true - } + "agent-base": "6", + "debug": "4", + "socks": "^2.3.3" } }, "spdx-correct": { - "version": "3.0.0", + "version": "3.1.1", "bundled": true, "dev": true, "requires": { @@ -6082,12 +4972,12 @@ } }, "spdx-exceptions": { - "version": "2.1.0", + "version": "2.3.0", "bundled": true, "dev": true }, "spdx-expression-parse": { - "version": "3.0.0", + "version": "3.0.1", "bundled": true, "dev": true, "requires": { @@ -6096,17 +4986,12 @@ } }, "spdx-license-ids": { - "version": "3.0.3", - "bundled": true, - "dev": true - }, - "split-on-first": { - "version": "1.1.0", + "version": "3.0.7", "bundled": true, "dev": true }, "sshpk": { - "version": "1.14.2", + "version": "1.16.1", "bundled": true, "dev": true, "requires": { @@ -6122,65 +5007,13 @@ } }, "ssri": { - "version": "6.0.1", - "bundled": true, - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "stream-each": { - "version": "1.2.2", - "bundled": true, - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-iterate": { - "version": "1.2.0", + "version": "8.0.1", "bundled": true, "dev": true, "requires": { - "readable-stream": "^2.1.5", - "stream-shift": "^1.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } + "minipass": "^3.1.1" } }, - "stream-shift": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "strict-uri-encode": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "string-width": { "version": "2.1.1", "bundled": true, @@ -6195,11 +5028,6 @@ "bundled": true, "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "strip-ansi": { "version": "4.0.0", "bundled": true, @@ -6211,18 +5039,11 @@ } }, "string_decoder": { - "version": "1.3.0", + "version": "1.1.1", "bundled": true, "dev": true, "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.0", - "bundled": true, - "dev": true - } + "safe-buffer": "~5.1.0" } }, "stringify-package": { @@ -6238,55 +5059,25 @@ "ansi-regex": "^2.0.0" } }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, "supports-color": { - "version": "5.4.0", + "version": "7.2.0", "bundled": true, "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" } }, "tar": { - "version": "4.4.13", - "bundled": true, - "dev": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - }, - "dependencies": { - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - } - } - }, - "term-size": { - "version": "1.2.0", + "version": "6.1.0", "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0" + "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" } }, "text-table": { @@ -6294,62 +5085,15 @@ "bundled": true, "dev": true }, - "through": { - "version": "2.3.8", - "bundled": true, - "dev": true - }, - "through2": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "timed-out": { - "version": "4.0.1", - "bundled": true, - "dev": true - }, "tiny-relative-date": { "version": "1.3.0", "bundled": true, "dev": true }, - "tough-cookie": { - "version": "2.4.3", + "treeverse": { + "version": "1.0.4", "bundled": true, - "dev": true, - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - } + "dev": true }, "tunnel-agent": { "version": "0.6.0", @@ -6362,23 +5106,15 @@ "tweetnacl": { "version": "0.14.5", "bundled": true, - "dev": true, - "optional": true - }, - "typedarray": { - "version": "0.0.6", - "bundled": true, - "dev": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, "dev": true }, - "umask": { - "version": "1.1.0", + "typedarray-to-buffer": { + "version": "3.1.5", "bundled": true, - "dev": true + "dev": true, + "requires": { + "is-typedarray": "^1.0.0" + } }, "unique-filename": { "version": "1.1.1", @@ -6389,54 +5125,19 @@ } }, "unique-slug": { - "version": "2.0.0", + "version": "2.0.2", "bundled": true, "dev": true, "requires": { "imurmurhash": "^0.1.4" } }, - "unique-string": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "crypto-random-string": "^1.0.0" - } - }, - "unpipe": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "unzip-response": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "update-notifier": { - "version": "2.5.0", - "bundled": true, - "dev": true, - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "url-parse-lax": { - "version": "1.0.0", + "uri-js": { + "version": "4.4.1", "bundled": true, "dev": true, "requires": { - "prepend-http": "^1.0.1" + "punycode": "^2.1.0" } }, "util-deprecate": { @@ -6444,21 +5145,8 @@ "bundled": true, "dev": true }, - "util-extend": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "util-promisify": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3" - } - }, "uuid": { - "version": "3.3.3", + "version": "3.4.0", "bundled": true, "dev": true }, @@ -6489,6 +5177,11 @@ "extsprintf": "^1.2.0" } }, + "walk-up-path": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, "wcwidth": { "version": "1.0.1", "bundled": true, @@ -6498,143 +5191,41 @@ } }, "which": { - "version": "1.3.1", + "version": "2.0.2", "bundled": true, "dev": true, "requires": { "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^1.0.2" - }, - "dependencies": { - "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" - } - } - } - }, - "widest-line": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^2.1.1" - } - }, - "worker-farm": { - "version": "1.7.0", - "bundled": true, - "dev": true, - "requires": { - "errno": "~0.1.7" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "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" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "write-file-atomic": { - "version": "2.4.3", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "xdg-basedir": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "xtend": { - "version": "4.0.1", - "bundled": true, - "dev": true - }, - "y18n": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "dev": true - }, - "yargs": { - "version": "11.1.1", - "bundled": true, - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.1.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" - }, - "dependencies": { - "y18n": { - "version": "3.2.1", - "bundled": true, - "dev": true - } + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" } }, - "yargs-parser": { - "version": "9.0.2", + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "write-file-atomic": { + "version": "3.0.3", "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } + }, + "yallist": { + "version": "4.0.0", + "bundled": true, + "dev": true } } }, @@ -6904,16 +5495,6 @@ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, - "os-name": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz", - "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==", - "dev": true, - "requires": { - "macos-release": "^2.2.0", - "windows-release": "^3.1.0" - } - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -6931,9 +5512,9 @@ } }, "p-each-series": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", - "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", + "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==", "dev": true }, "p-filter": { @@ -6953,12 +5534,6 @@ } } }, - "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-is-promise": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", @@ -6999,9 +5574,9 @@ "dev": true }, "p-retry": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz", - "integrity": "sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.5.0.tgz", + "integrity": "sha512-5Hwh4aVQSu6BEP+w2zKlVXtFAaYQe1qWuVADSgoeVlLjwe/Q/AMSoRR4MDeaAfu8llT+YNbEijWu/YF3m6avkg==", "dev": true, "requires": { "@types/retry": "^0.12.0", @@ -7308,6 +5883,12 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "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", @@ -7347,6 +5928,24 @@ "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==", + "dev": true + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, "type-fest": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", @@ -7451,9 +6050,9 @@ } }, "registry-auth-token": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz", - "integrity": "sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", "dev": true, "requires": { "rc": "^1.2.8" @@ -7517,10 +6116,13 @@ } }, "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", - "dev": true + "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": { + "queue-microtask": "^1.2.2" + } }, "safe-buffer": { "version": "5.1.2", @@ -7529,9 +6131,9 @@ "dev": true }, "semantic-release": { - "version": "17.0.8", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.0.8.tgz", - "integrity": "sha512-9KcdidiJ4xchrJXxPdaDQVlybgX0xTeKyVjRySYk5u9GpjibXD7E5F8cB0BvFLMDmMyrkCwcem0kFiaLD2VNPg==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.4.2.tgz", + "integrity": "sha512-TPLWuoe2L2DmgnQEh+OLWW5V1T+ZAa1xWuHXsuPAWEko0BqSdLPl+5+BlQ+D5Bp27S5gDJ1//Y1tgbmvUhnOCw==", "dev": true, "requires": { "@semantic-release/commit-analyzer": "^8.0.0", @@ -7540,19 +6142,19 @@ "@semantic-release/npm": "^7.0.0", "@semantic-release/release-notes-generator": "^9.0.0", "aggregate-error": "^3.0.0", - "cosmiconfig": "^6.0.0", + "cosmiconfig": "^7.0.0", "debug": "^4.0.0", "env-ci": "^5.0.0", - "execa": "^4.0.0", + "execa": "^5.0.0", "figures": "^3.0.0", - "find-versions": "^3.0.0", - "get-stream": "^5.0.0", + "find-versions": "^4.0.0", + "get-stream": "^6.0.0", "git-log-parser": "^1.2.0", "hook-std": "^2.0.0", - "hosted-git-info": "^3.0.0", + "hosted-git-info": "^4.0.0", "lodash": "^4.17.15", - "marked": "^1.0.0", - "marked-terminal": "^4.0.0", + "marked": "^2.0.0", + "marked-terminal": "^4.1.1", "micromatch": "^4.0.2", "p-each-series": "^2.1.0", "p-reduce": "^2.0.0", @@ -7561,7 +6163,7 @@ "semver": "^7.3.2", "semver-diff": "^3.1.1", "signale": "^1.2.1", - "yargs": "^15.0.1" + "yargs": "^16.2.0" }, "dependencies": { "ansi-regex": { @@ -7571,24 +6173,23 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "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, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "wrap-ansi": "^7.0.0" } }, "color-convert": { @@ -7606,13 +6207,24 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "emoji-regex": { @@ -7621,56 +6233,69 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.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" } }, + "get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "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==", + "dev": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "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 + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "mimic-fn": "^2.1.0" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "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": { - "p-limit": "^2.2.0" + "lru-cache": "^6.0.0" } }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "dev": true, "requires": { "emoji-regex": "^8.0.0", @@ -7687,10 +6312,19 @@ "ansi-regex": "^5.0.0" } }, + "which": { + "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" + } + }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "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": { "ansi-styles": "^4.0.0", @@ -7698,34 +6332,32 @@ "strip-ansi": "^6.0.0" } }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "dev": true } } }, @@ -7752,9 +6384,9 @@ } }, "semver-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", - "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz", + "integrity": "sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==", "dev": true }, "set-blocking": { @@ -7898,9 +6530,9 @@ } }, "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", + "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", "dev": true }, "split": { @@ -7913,48 +6545,12 @@ } }, "split2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", "dev": true, "requires": { - "through2": "^2.0.2" - }, - "dependencies": { - "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==", - "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" - } - }, - "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" - } - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - } + "readable-stream": "^3.0.0" } }, "sprintf-js": { @@ -8083,12 +6679,6 @@ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -8120,9 +6710,9 @@ } }, "supports-hyperlinks": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", - "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", + "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", @@ -8136,9 +6726,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -8178,21 +6768,22 @@ "dev": true }, "tempy": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.5.0.tgz", - "integrity": "sha512-VEY96x7gbIRfsxqsafy2l5yVxxp3PhwAGoWMyC2D2Zt5DmEv+2tGiPOrquNRpf21hhGnKLVEsuqleqiZmKG/qw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz", + "integrity": "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==", "dev": true, "requires": { + "del": "^6.0.0", "is-stream": "^2.0.0", "temp-dir": "^2.0.0", - "type-fest": "^0.12.0", + "type-fest": "^0.16.0", "unique-string": "^2.0.0" }, "dependencies": { "type-fest": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz", - "integrity": "sha512-53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", + "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==", "dev": true } } @@ -8221,13 +6812,12 @@ "dev": true }, "through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", "dev": true, "requires": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" + "readable-stream": "3" } }, "tmp": { @@ -8316,9 +6906,9 @@ "dev": true }, "uglify-js": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz", - "integrity": "sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA==", + "version": "3.13.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.4.tgz", + "integrity": "sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw==", "dev": true, "optional": true }, @@ -8348,13 +6938,10 @@ } }, "universal-user-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", - "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", - "dev": true, - "requires": { - "os-name": "^3.1.0" - } + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", + "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", + "dev": true }, "universalify": { "version": "1.0.0", @@ -8492,90 +7079,6 @@ "string-width": "^1.0.2 || 2" } }, - "windows-release": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz", - "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==", - "dev": true, - "requires": { - "execa": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "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=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - } - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -8652,21 +7155,21 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yaml": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", - "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true }, "yargs": { diff --git a/clients/vscode-hlasmplugin/package.json b/clients/vscode-hlasmplugin/package.json index 3d6ad8055..2f250443e 100644 --- a/clients/vscode-hlasmplugin/package.json +++ b/clients/vscode-hlasmplugin/package.json @@ -44,13 +44,13 @@ "@types/glob": "^5.0.35", "@types/mocha": "^7.0.2", "@types/vscode": "^1.32.3", - "conventional-changelog-conventionalcommits": "^4.3.0", + "conventional-changelog-conventionalcommits": "^4.5.0", "decache": "^4.5.1", "glob": "^7.1.6", "mocha": "^7.1.1", "nyc": "^15.0.1", "puppeteer": "^4.0.0", - "semantic-release": "^17.0.7", + "semantic-release": "^17.4.2", "shelljs": "^0.8.2", "shx": "^0.3.2", "typescript": "^3.5.3", From 75eedf2866825a074a2e1d81d4b4a1f86f32c47a Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Wed, 14 Apr 2021 12:21:28 +0200 Subject: [PATCH 5/7] Move rmode_options out of asm_instr_class --- parser_library/src/checking/asm_instr_check.cpp | 4 ++++ parser_library/src/checking/asm_instr_class.h | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/parser_library/src/checking/asm_instr_check.cpp b/parser_library/src/checking/asm_instr_check.cpp index 65936eb3f..7b5d51170 100644 --- a/parser_library/src/checking/asm_instr_check.cpp +++ b/parser_library/src/checking/asm_instr_check.cpp @@ -17,6 +17,10 @@ #include +namespace { +const std::vector rmode_options = { "24", "31", "64", "ANY" }; +} + namespace hlasm_plugin::parser_library::checking { xattr::xattr(const std::vector& allowed_types, const std::string& name_of_instruction) diff --git a/parser_library/src/checking/asm_instr_class.h b/parser_library/src/checking/asm_instr_class.h index 2c2de13c8..71eb43270 100644 --- a/parser_library/src/checking/asm_instr_class.h +++ b/parser_library/src/checking/asm_instr_class.h @@ -67,8 +67,6 @@ class assembler_instruction virtual ~assembler_instruction() {}; protected: - const std::vector rmode_options = { "24", "31", "64", "ANY" }; - bool is_param_in_vector(const std::string& parameter, const std::vector& options) const; bool operands_size_corresponding(const std::vector& to_check, From 74c29707096ccb9ad448f4fc26cc772744954886 Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Wed, 14 Apr 2021 15:17:46 +0200 Subject: [PATCH 6/7] Fix merge error --- parser_library/src/debugging/debugger.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parser_library/src/debugging/debugger.cpp b/parser_library/src/debugging/debugger.cpp index 0e36f2796..e89d7cba2 100644 --- a/parser_library/src/debugging/debugger.cpp +++ b/parser_library/src/debugging/debugger.cpp @@ -140,10 +140,9 @@ class debugger::impl final : public processing::statement_analyzer if (!lib_provider) provider.emplace(workspace); - analyzer a(open_code->get_text(), - open_code->get_file_name(), - lib_provider ? *lib_provider : provider.value(), - this); + analyzer a( + open_code->get_text(), open_code->get_file_name(), lib_provider ? *lib_provider : provider.value()); + a.register_stmt_analyzer(this); ctx_ = a.context().hlasm_ctx.get(); From 388ace595d57f76ec5bc9e771a564a8bad0fd04f Mon Sep 17 00:00:00 2001 From: Slavomir Kucera Date: Thu, 15 Apr 2021 12:43:51 +0200 Subject: [PATCH 7/7] One more bug --- parser_library/src/expressions/data_definition.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser_library/src/expressions/data_definition.cpp b/parser_library/src/expressions/data_definition.cpp index 66897479e..ec2e9f133 100644 --- a/parser_library/src/expressions/data_definition.cpp +++ b/parser_library/src/expressions/data_definition.cpp @@ -195,7 +195,7 @@ bool data_definition::check_single_symbol_ok(const diagnostic_collector& add_dia add_diagnostic( diagnostic_op::error_D030({ std::get(expr_or_addr).base->get_range().start, std::get(expr_or_addr).base->get_range().end }, - &type)); + std::string(1, type))); ret = false; continue; }