Skip to content

Commit

Permalink
forgot one comment, adding type for log level filter
Browse files Browse the repository at this point in the history
  • Loading branch information
davemarco committed Nov 5, 2024
1 parent fb2b290 commit 464cf31
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/clp_ffi_js/ir/IrStreamReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ auto IrStreamReader::get_filtered_log_event_map() const -> FilteredLogEventMapTs
return FilteredLogEventMapTsType{emscripten::val::array(m_filtered_log_event_map.value())};
}

void IrStreamReader::filter_log_events(emscripten::val const& log_level_filter) {
void IrStreamReader::filter_log_events(LogLevelFilterTsType const& log_level_filter) {
if (log_level_filter.isNull()) {
m_filtered_log_event_map.reset();
return;
Expand Down
2 changes: 1 addition & 1 deletion src/clp_ffi_js/ir/IrStreamReader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class IrStreamReader : public StreamReader {
*
* @param log_level_filter Array of selected log levels
*/
void filter_log_events(emscripten::val const& log_level_filter) override;
void filter_log_events(LogLevelFilterTsType const& log_level_filter) override;

/**
* Deserializes all log events in the stream. After the stream has been exhausted, it will be
Expand Down
3 changes: 3 additions & 0 deletions src/clp_ffi_js/ir/StreamReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,14 @@ auto StreamReader::create(DataArrayTsType const& data_array) -> std::unique_ptr<

namespace {
EMSCRIPTEN_BINDINGS(ClpStreamReader) {
// Output to JS types
emscripten::register_type<clp_ffi_js::ir::DataArrayTsType>("Uint8Array");
emscripten::register_type<clp_ffi_js::ir::DecodedResultsTsType>(
"Array<[string, number, number, number]>"
);
emscripten::register_type<clp_ffi_js::ir::FilteredLogEventMapTsType>("number[] | null");
// Input from JS types
emscripten::register_type<clp_ffi_js::ir::LogLevelFilterTsType>("number[] | null");
emscripten::class_<clp_ffi_js::ir::StreamReader>("ClpStreamReader")
.constructor(
&clp_ffi_js::ir::StreamReader::create,
Expand Down
3 changes: 2 additions & 1 deletion src/clp_ffi_js/ir/StreamReader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace clp_ffi_js::ir {
EMSCRIPTEN_DECLARE_VAL_TYPE(DataArrayTsType);
EMSCRIPTEN_DECLARE_VAL_TYPE(DecodedResultsTsType);
EMSCRIPTEN_DECLARE_VAL_TYPE(FilteredLogEventMapTsType);
EMSCRIPTEN_DECLARE_VAL_TYPE(LogLevelFilterTsType);

constexpr std::array<std::string_view, 4> cIrV1Versions = {"v0.0.1", "v0.0.0", "0.0.1", "0.0.0"};

Expand Down Expand Up @@ -60,7 +61,7 @@ class StreamReader {
*
* @param log_level_filter Array of selected log levels
*/
virtual void filter_log_events(emscripten::val const& log_level_filter) = 0;
virtual void filter_log_events(LogLevelFilterTsType const& log_level_filter) = 0;

/**
* Deserializes all log events in the stream. After the stream has been exhausted, it will be
Expand Down

0 comments on commit 464cf31

Please sign in to comment.