RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:37:43 +00:00
Code Issues Activity Actions

Spreadsheet: Replace uses of JsonObject::get_deprecated()/get_ptr()

Browse source
This commit is contained in:
Sam Atkins 2022-12-21 19:56:21 +00:00 • committed by Tim Flynn
parent c84e11c154
commit 4b17cba074
2 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Applications/Spreadsheet/HelpWindow.cpp
View file

@ -85,26 +85,26 @@ HelpWindow::HelpWindow(GUI::Window* parent)
VERIFY(url.scheme() == "spreadsheet"); VERIFY(url.scheme() == "spreadsheet");
if (url.host() == "example") { if (url.host() == "example") {
auto entry = LexicalPath::basename(url.path()); auto entry = LexicalPath::basename(url.path());
auto doc_option = m_docs.get_deprecated(entry); auto doc_option = m_docs.get_object(entry);
if (!doc_option.is_object()) { if (!doc_option.has_value()) {
GUI::MessageBox::show_error(this, DeprecatedString::formatted("No documentation entry found for '{}'", url.path())); GUI::MessageBox::show_error(this, DeprecatedString::formatted("No documentation entry found for '{}'", url.path()));
return; return;
} }
auto& doc = doc_option.as_object(); auto& doc = doc_option.value();
const auto& name = url.fragment(); const auto& name = url.fragment();
auto* example_data_ptr = doc.get_ptr("example_data"sv); auto maybe_example_data = doc.get_object("example_data"sv);
if (!example_data_ptr || !example_data_ptr->is_object()) { if (!maybe_example_data.has_value()) {
GUI::MessageBox::show_error(this, DeprecatedString::formatted("No example data found for '{}'", url.path())); GUI::MessageBox::show_error(this, DeprecatedString::formatted("No example data found for '{}'", url.path()));
return; return;
} }
auto& example_data = example_data_ptr->as_object(); auto& example_data = maybe_example_data.value();
if (!example_data.has_object(name)) { if (!example_data.has_object(name)) {
GUI::MessageBox::show_error(this, DeprecatedString::formatted("Example '{}' not found for '{}'", name, url.path())); GUI::MessageBox::show_error(this, DeprecatedString::formatted("Example '{}' not found for '{}'", name, url.path()));
return; return;
} }
auto& value = example_data.get_deprecated(name); auto& value = example_data.get_object(name).value();
auto window = GUI::Window::construct(this); auto window = GUI::Window::construct(this);
window->resize(size()); window->resize(size());
@ -113,7 +113,7 @@ HelpWindow::HelpWindow(GUI::Window* parent)
window->on_close = [window = window.ptr()] { window->remove_from_parent(); }; window->on_close = [window = window.ptr()] { window->remove_from_parent(); };
auto widget = window->set_main_widget<SpreadsheetWidget>(window, NonnullRefPtrVector<Sheet> {}, false).release_value_but_fixme_should_propagate_errors(); auto widget = window->set_main_widget<SpreadsheetWidget>(window, NonnullRefPtrVector<Sheet> {}, false).release_value_but_fixme_should_propagate_errors();
auto sheet = Sheet::from_json(value.as_object(), widget->workbook()); auto sheet = Sheet::from_json(value, widget->workbook());
if (!sheet) { if (!sheet) {
GUI::MessageBox::show_error(this, DeprecatedString::formatted("Corrupted example '{}' in '{}'", name, url.path())); GUI::MessageBox::show_error(this, DeprecatedString::formatted("Corrupted example '{}' in '{}'", name, url.path()));
return; return;
@ -141,14 +141,14 @@ HelpWindow::HelpWindow(GUI::Window* parent)
DeprecatedString HelpWindow::render(StringView key) DeprecatedString HelpWindow::render(StringView key)
{ {
VERIFY(m_docs.has_object(key)); VERIFY(m_docs.has_object(key));
auto& doc = m_docs.get_deprecated(key).as_object(); auto& doc = m_docs.get_object(key).value();
auto name = doc.get_deprecated("name"sv).to_deprecated_string(); auto name = doc.get_deprecated_string("name"sv).value_or({});
auto argc = doc.get_deprecated("argc"sv).to_u32(0); auto argc = doc.get_u32("argc"sv).value_or(0);
VERIFY(doc.has_array("argnames"sv)); VERIFY(doc.has_array("argnames"sv));
auto& argnames = doc.get_deprecated("argnames"sv).as_array(); auto& argnames = doc.get_array("argnames"sv).value();
auto docstring = doc.get_deprecated("doc"sv).to_deprecated_string(); auto docstring = doc.get_deprecated_string("doc"sv).value_or({});
StringBuilder markdown_builder; StringBuilder markdown_builder;
@ -181,10 +181,10 @@ DeprecatedString HelpWindow::render(StringView key)
markdown_builder.append("\n\n"sv); markdown_builder.append("\n\n"sv);
if (doc.has("examples"sv)) { if (doc.has("examples"sv)) {
auto& examples = doc.get_deprecated("examples"sv); auto examples = doc.get_object("examples"sv);
VERIFY(examples.is_object()); VERIFY(examples.has_value());
markdown_builder.append("# EXAMPLES\n"sv); markdown_builder.append("# EXAMPLES\n"sv);
examples.as_object().for_each_member([&](auto& text, auto& description_value) { examples->for_each_member([&](auto& text, auto& description_value) {
dbgln("```js\n{}\n```\n\n- {}\n", text, description_value.to_deprecated_string()); dbgln("```js\n{}\n```\n\n- {}\n", text, description_value.to_deprecated_string());
markdown_builder.appendff("```js\n{}\n```\n\n- {}\n", text, description_value.to_deprecated_string()); markdown_builder.appendff("```js\n{}\n```\n\n- {}\n", text, description_value.to_deprecated_string());
}); });

78
Userland/Applications/Spreadsheet/Spreadsheet.cpp
View file

@ -375,9 +375,9 @@ Vector<CellChange> Sheet::copy_cells(Vector<Position> from, Vector<Position> to,
RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook) RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook)
{ {
auto sheet = adopt_ref(*new Sheet(workbook)); auto sheet = adopt_ref(*new Sheet(workbook));
auto rows = object.get_deprecated("rows"sv).to_u32(default_row_count); auto rows = object.get_u32("rows"sv).value_or(default_row_count);
auto columns = object.get_deprecated("columns"sv); auto columns = object.get_array("columns"sv);
auto name = object.get_deprecated("name"sv).as_string_or("Sheet"); auto name = object.get_deprecated_string("name"sv).value_or("Sheet");
if (object.has("cells"sv) && !object.has_object("cells"sv)) if (object.has("cells"sv) && !object.has_object("cells"sv))
return {}; return {};
@ -387,8 +387,8 @@ RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook)
sheet->add_row(); sheet->add_row();
// FIXME: Better error checking. // FIXME: Better error checking.
if (columns.is_array()) { if (columns.has_value()) {
columns.as_array().for_each([&](auto& value) { columns->for_each([&](auto& value) {
sheet->m_columns.append(value.as_string()); sheet->m_columns.append(value.as_string());
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
@ -403,52 +403,52 @@ RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook)
auto& parse_function = json.as_object().get_without_side_effects("parse").as_function(); auto& parse_function = json.as_object().get_without_side_effects("parse").as_function();
auto read_format = [](auto& format, auto const& obj) { auto read_format = [](auto& format, auto const& obj) {
if (auto value = obj.get_deprecated("foreground_color"sv); value.is_string()) if (auto value = obj.get_deprecated_string("foreground_color"sv); value.has_value())
format.foreground_color = Color::from_string(value.as_string()); format.foreground_color = Color::from_string(*value);
if (auto value = obj.get_deprecated("background_color"sv); value.is_string()) if (auto value = obj.get_deprecated_string("background_color"sv); value.has_value())
format.background_color = Color::from_string(value.as_string()); format.background_color = Color::from_string(*value);
}; };
if (object.has_object("cells"sv)) { if (auto cells = object.get_object("cells"sv); cells.has_value()) {
object.get_deprecated("cells"sv).as_object().for_each_member([&](auto& name, JsonValue const& value) { cells->for_each_member([&](auto& name, JsonValue const& value) {
auto position_option = sheet->parse_cell_name(name); auto position_option = sheet->parse_cell_name(name);
if (!position_option.has_value()) if (!position_option.has_value())
return IterationDecision::Continue; return IterationDecision::Continue;
auto position = position_option.value(); auto position = position_option.value();
auto& obj = value.as_object(); auto& obj = value.as_object();
auto kind = obj.get_deprecated("kind"sv).as_string_or("LiteralString") == "LiteralString" ? Cell::LiteralString : Cell::Formula; auto kind = obj.get_deprecated_string("kind"sv).value_or("LiteralString") == "LiteralString" ? Cell::LiteralString : Cell::Formula;
OwnPtr<Cell> cell; OwnPtr<Cell> cell;
switch (kind) { switch (kind) {
case Cell::LiteralString: case Cell::LiteralString:
cell = make<Cell>(obj.get_deprecated("value"sv).to_deprecated_string(), position, *sheet); cell = make<Cell>(obj.get_deprecated_string("value"sv).value_or({}), position, *sheet);
break; break;
case Cell::Formula: { case Cell::Formula: {
auto& vm = sheet->interpreter().vm(); auto& vm = sheet->interpreter().vm();
auto value_or_error = JS::call(vm, parse_function, json, JS::PrimitiveString::create(vm, obj.get_deprecated("value"sv).as_string())); auto value_or_error = JS::call(vm, parse_function, json, JS::PrimitiveString::create(vm, obj.get_deprecated_string("value"sv).value_or({})));
if (value_or_error.is_error()) { if (value_or_error.is_error()) {
warnln("Failed to load previous value for cell {}, leaving as undefined", position.to_cell_identifier(sheet)); warnln("Failed to load previous value for cell {}, leaving as undefined", position.to_cell_identifier(sheet));
value_or_error = JS::js_undefined(); value_or_error = JS::js_undefined();
} }
cell = make<Cell>(obj.get_deprecated("source"sv).to_deprecated_string(), value_or_error.release_value(), position, *sheet); cell = make<Cell>(obj.get_deprecated_string("source"sv).value_or({}), value_or_error.release_value(), position, *sheet);
break; break;
} }
} }
auto type_name = obj.has("type"sv) ? obj.get_deprecated("type"sv).to_deprecated_string() : "Numeric"; auto type_name = obj.has("type"sv) ? obj.get_deprecated_string("type"sv).value_or({}) : "Numeric";
cell->set_type(type_name); cell->set_type(type_name);
auto type_meta = obj.get_deprecated("type_metadata"sv); auto type_meta = obj.get_object("type_metadata"sv);
if (type_meta.is_object()) { if (type_meta.has_value()) {
auto& meta_obj = type_meta.as_object(); auto& meta_obj = type_meta.value();
auto meta = cell->type_metadata(); auto meta = cell->type_metadata();
if (auto value = meta_obj.get_deprecated("length"sv); value.is_number()) if (auto value = meta_obj.get_i32("length"sv); value.has_value())
meta.length = value.to_i32(); meta.length = value.value();
if (auto value = meta_obj.get_deprecated("format"sv); value.is_string()) if (auto value = meta_obj.get_deprecated_string("format"sv); value.has_value())
meta.format = value.as_string(); meta.format = value.value();
if (auto value = meta_obj.get_deprecated("alignment"sv); value.is_string()) { if (auto value = meta_obj.get_deprecated_string("alignment"sv); value.has_value()) {
auto alignment = Gfx::text_alignment_from_string(value.as_string()); auto alignment = Gfx::text_alignment_from_string(*value);
if (alignment.has_value()) if (alignment.has_value())
meta.alignment = alignment.value(); meta.alignment = alignment.value();
} }
@ -457,15 +457,15 @@ RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook)
cell->set_type_metadata(move(meta)); cell->set_type_metadata(move(meta));
} }
auto conditional_formats = obj.get_deprecated("conditional_formats"sv); auto conditional_formats = obj.get_array("conditional_formats"sv);
auto cformats = cell->conditional_formats(); auto cformats = cell->conditional_formats();
if (conditional_formats.is_array()) { if (conditional_formats.has_value()) {
conditional_formats.as_array().for_each([&](const auto& fmt_val) { conditional_formats->for_each([&](const auto& fmt_val) {
if (!fmt_val.is_object()) if (!fmt_val.is_object())
return IterationDecision::Continue; return IterationDecision::Continue;
auto& fmt_obj = fmt_val.as_object(); auto& fmt_obj = fmt_val.as_object();
auto fmt_cond = fmt_obj.get_deprecated("condition"sv).to_deprecated_string(); auto fmt_cond = fmt_obj.get_deprecated_string("condition"sv).value_or({});
if (fmt_cond.is_empty()) if (fmt_cond.is_empty())
return IterationDecision::Continue; return IterationDecision::Continue;
@ -479,9 +479,9 @@ RefPtr<Sheet> Sheet::from_json(JsonObject const& object, Workbook& workbook)
cell->set_conditional_formats(move(cformats)); cell->set_conditional_formats(move(cformats));
} }
auto evaluated_format = obj.get_deprecated("evaluated_formats"sv); auto evaluated_format = obj.get_object("evaluated_formats"sv);
if (evaluated_format.is_object()) { if (evaluated_format.has_value()) {
auto& evaluated_format_obj = evaluated_format.as_object(); auto& evaluated_format_obj = evaluated_format.value();
auto& evaluated_fmts = cell->evaluated_formats(); auto& evaluated_fmts = cell->evaluated_formats();
read_format(evaluated_fmts, evaluated_format_obj); read_format(evaluated_fmts, evaluated_format_obj);
@ -718,16 +718,16 @@ DeprecatedString Sheet::generate_inline_documentation_for(StringView function, s
gather_documentation(); gather_documentation();
auto& docs = m_cached_documentation.value(); auto& docs = m_cached_documentation.value();
auto entry = docs.get_deprecated(function); auto entry = docs.get_object(function);
if (entry.is_null() || !entry.is_object()) if (!entry.has_value())
return DeprecatedString::formatted("{}(...???{})", function, argument_index); return DeprecatedString::formatted("{}(...???{})", function, argument_index);
auto& entry_object = entry.as_object(); auto& entry_object = entry.value();
size_t argc = entry_object.get_deprecated("argc"sv).to_int(0); size_t argc = entry_object.get_integer<int>("argc"sv).value_or(0);
auto argnames_value = entry_object.get_deprecated("argnames"sv); auto argnames_value = entry_object.get_array("argnames"sv);
if (!argnames_value.is_array()) if (!argnames_value.has_value())
return DeprecatedString::formatted("{}(...{}???{})", function, argc, argument_index); return DeprecatedString::formatted("{}(...{}???{})", function, argc, argument_index);
auto& argnames = argnames_value.as_array(); auto& argnames = argnames_value.value();
StringBuilder builder; StringBuilder builder;
builder.appendff("{}(", function); builder.appendff("{}(", function);
for (size_t i = 0; i < (size_t)argnames.size(); ++i) { for (size_t i = 0; i < (size_t)argnames.size(); ++i) {