AK: JsonParser improvements

- Parsing invalid JSON no longer asserts
    Instead of asserting when coming across malformed JSON,
    JsonParser::parse now returns an Optional<JsonValue>.
- Disallow trailing commas in JSON objects and arrays
- No longer parse 'undefined', as that is a purely JS thing
- No longer allow non-whitespace after anything consumed by the initial
  parse() call. Examples of things that were valid and no longer are:
    - undefineddfz
    - {"foo": 1}abcd
    - [1,2,3]4
- JsonObject.for_each_member now iterates in original insertion order

4 files changed, 14 insertions, 9 deletions

diff --git a/DevTools/FormCompiler/main.cpp b/DevTools/FormCompiler/main.cpp
index 0ccafa31ce..7113f510fc 100644
--- a/DevTools/FormCompiler/main.cpp
+++ b/DevTools/FormCompiler/main.cpp
@@ -46,7 +46,9 @@ int main(int argc, char** argv)
     }
 
     auto file_contents = file->read_all();
-    auto json = JsonValue::from_string(file_contents);
+    auto json_result = JsonValue::from_string(file_contents);
+    ASSERT(json_result.has_value());
+    auto json = json_result.value();
 
     if (!json.is_object()) {
         fprintf(stderr, "Malformed input\n");
diff --git a/DevTools/Inspector/RemoteProcess.cpp b/DevTools/Inspector/RemoteProcess.cpp
index d1ceb61c3d..6e8dce5894 100644
--- a/DevTools/Inspector/RemoteProcess.cpp
+++ b/DevTools/Inspector/RemoteProcess.cpp
@@ -167,11 +167,12 @@ void RemoteProcess::update()
         dbg() << "Got data size " << length << " and read that many bytes";
 
         auto json_value = JsonValue::from_string(data);
-        ASSERT(json_value.is_object());
+        ASSERT(json_value.has_value());
+        ASSERT(json_value.value().is_object());
 
-        dbg() << "Got JSON response " << json_value.to_string();
+        dbg() << "Got JSON response " << json_value.value().to_string();
 
-        auto& response = json_value.as_object();
+        auto& response = json_value.value().as_object();
 
         auto response_type = response.get("type").as_string_or({});
         if (response_type.is_null())
diff --git a/DevTools/ProfileViewer/Profile.cpp b/DevTools/ProfileViewer/Profile.cpp
index 435bfd2810..32c966bbb5 100644
--- a/DevTools/ProfileViewer/Profile.cpp
+++ b/DevTools/ProfileViewer/Profile.cpp
@@ -172,12 +172,13 @@ OwnPtr<Profile> Profile::load_from_perfcore_file(const StringView& path)
     }
 
     auto json = JsonValue::from_string(file->read_all());
-    if (!json.is_object()) {
+    ASSERT(json.has_value());
+    if (!json.value().is_object()) {
         fprintf(stderr, "Invalid perfcore format (not a JSON object)\n");
         return nullptr;
     }
 
-    auto& object = json.as_object();
+    auto& object = json.value().as_object();
     auto executable_path = object.get("executable").to_string();
 
     MappedFile elf_file(executable_path);
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp
index 7bd247c188..6f813a4e55 100644
--- a/DevTools/VisualBuilder/VBForm.cpp
+++ b/DevTools/VisualBuilder/VBForm.cpp
@@ -389,14 +389,15 @@ void VBForm::load_from_file(const String& path)
 
     auto file_contents = file->read_all();
     auto form_json = JsonValue::from_string(file_contents);
+    ASSERT(form_json.has_value());
 
-    if (!form_json.is_object()) {
+    if (!form_json.value().is_object()) {
         GUI::MessageBox::show(String::format("Could not parse '%s'", path.characters()), "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window());
         return;
     }
 
-    m_name = form_json.as_object().get("name").to_string();
-    auto widgets = form_json.as_object().get("widgets").as_array();
+    m_name = form_json.value().as_object().get("name").to_string();
+    auto widgets = form_json.value().as_object().get("widgets").as_array();
 
     widgets.for_each([&](const JsonValue& widget_value) {
         auto& widget_object = widget_value.as_object();