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

LibJS: Replace GlobalObject with VM in JSON AOs [Part 13/19]

Browse source
This commit is contained in:
Linus Groh 2022-08-21 17:41:49 +01:00
parent 90bf33241d
commit 9930302efb
3 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Userland/Libraries/LibJS/Runtime/JSONObject.cpp
View file

@ -43,10 +43,10 @@ void JSONObject::initialize(Realm& realm)
} }
// 25.5.2 JSON.stringify ( value [ , replacer [ , space ] ] ), https://tc39.es/ecma262/#sec-json.stringify // 25.5.2 JSON.stringify ( value [ , replacer [ , space ] ] ), https://tc39.es/ecma262/#sec-json.stringify
ThrowCompletionOr<String> JSONObject::stringify_impl(GlobalObject& global_object, Value value, Value replacer, Value space) ThrowCompletionOr<String> JSONObject::stringify_impl(VM& vm, Value value, Value replacer, Value space)
{ {
auto& vm = global_object.vm(); auto& realm = *vm.current_realm();
auto& realm = *global_object.associated_realm(); auto& global_object = realm.global_object();
StringifyState state; StringifyState state;
@ -104,7 +104,7 @@ ThrowCompletionOr<String> JSONObject::stringify_impl(GlobalObject& global_object
auto* wrapper = Object::create(realm, global_object.object_prototype()); auto* wrapper = Object::create(realm, global_object.object_prototype());
MUST(wrapper->create_data_property_or_throw(String::empty(), value)); MUST(wrapper->create_data_property_or_throw(String::empty(), value));
return serialize_json_property(global_object, state, String::empty(), wrapper); return serialize_json_property(vm, state, String::empty(), wrapper);
} }
// 25.5.2 JSON.stringify ( value [ , replacer [ , space ] ] ), https://tc39.es/ecma262/#sec-json.stringify // 25.5.2 JSON.stringify ( value [ , replacer [ , space ] ] ), https://tc39.es/ecma262/#sec-json.stringify
@ -117,7 +117,7 @@ JS_DEFINE_NATIVE_FUNCTION(JSONObject::stringify)
auto replacer = vm.argument(1); auto replacer = vm.argument(1);
auto space = vm.argument(2); auto space = vm.argument(2);
auto string = TRY(stringify_impl(global_object, value, replacer, space)); auto string = TRY(stringify_impl(vm, value, replacer, space));
if (string.is_null()) if (string.is_null())
return js_undefined(); return js_undefined();
@ -125,9 +125,10 @@ JS_DEFINE_NATIVE_FUNCTION(JSONObject::stringify)
} }
// 25.5.2.1 SerializeJSONProperty ( state, key, holder ), https://tc39.es/ecma262/#sec-serializejsonproperty // 25.5.2.1 SerializeJSONProperty ( state, key, holder ), https://tc39.es/ecma262/#sec-serializejsonproperty
ThrowCompletionOr<String> JSONObject::serialize_json_property(GlobalObject& global_object, StringifyState& state, PropertyKey const& key, Object* holder) ThrowCompletionOr<String> JSONObject::serialize_json_property(VM& vm, StringifyState& state, PropertyKey const& key, Object* holder)
{ {
auto& vm = global_object.vm(); auto& realm = *vm.current_realm();
auto& global_object = realm.global_object();
// 1. Let value be ? Get(holder, key). // 1. Let value be ? Get(holder, key).
auto value = TRY(holder->get(key)); auto value = TRY(holder->get(key));
@ -210,10 +211,10 @@ ThrowCompletionOr<String> JSONObject::serialize_json_property(GlobalObject& glob
// b. If isArray is true, return ? SerializeJSONArray(state, value). // b. If isArray is true, return ? SerializeJSONArray(state, value).
if (is_array) if (is_array)
return serialize_json_array(global_object, state, static_cast<Array&>(value.as_object())); return serialize_json_array(vm, state, static_cast<Array&>(value.as_object()));
// c. Return ? SerializeJSONObject(state, value). // c. Return ? SerializeJSONObject(state, value).
return serialize_json_object(global_object, state, value.as_object()); return serialize_json_object(vm, state, value.as_object());
} }
// 12. Return undefined. // 12. Return undefined.
@ -221,9 +222,8 @@ ThrowCompletionOr<String> JSONObject::serialize_json_property(GlobalObject& glob
} }
// 25.5.2.4 SerializeJSONObject ( state, value ), https://tc39.es/ecma262/#sec-serializejsonobject // 25.5.2.4 SerializeJSONObject ( state, value ), https://tc39.es/ecma262/#sec-serializejsonobject
ThrowCompletionOr<String> JSONObject::serialize_json_object(GlobalObject& global_object, StringifyState& state, Object& object) ThrowCompletionOr<String> JSONObject::serialize_json_object(VM& vm, StringifyState& state, Object& object)
{ {
auto& vm = global_object.vm();
if (state.seen_objects.contains(&object)) if (state.seen_objects.contains(&object))
return vm.throw_completion<TypeError>(ErrorType::JsonCircular); return vm.throw_completion<TypeError>(ErrorType::JsonCircular);
@ -235,7 +235,7 @@ ThrowCompletionOr<String> JSONObject::serialize_json_object(GlobalObject& global
auto process_property = [&](PropertyKey const& key) -> ThrowCompletionOr<void> { auto process_property = [&](PropertyKey const& key) -> ThrowCompletionOr<void> {
if (key.is_symbol()) if (key.is_symbol())
return {}; return {};
auto serialized_property_string = TRY(serialize_json_property(global_object, state, key, &object)); auto serialized_property_string = TRY(serialize_json_property(vm, state, key, &object));
if (!serialized_property_string.is_null()) { if (!serialized_property_string.is_null()) {
property_strings.append(String::formatted( property_strings.append(String::formatted(
"{}:{}{}", "{}:{}{}",
@ -290,9 +290,11 @@ ThrowCompletionOr<String> JSONObject::serialize_json_object(GlobalObject& global
} }
// 25.5.2.5 SerializeJSONArray ( state, value ), https://tc39.es/ecma262/#sec-serializejsonarray // 25.5.2.5 SerializeJSONArray ( state, value ), https://tc39.es/ecma262/#sec-serializejsonarray
ThrowCompletionOr<String> JSONObject::serialize_json_array(GlobalObject& global_object, StringifyState& state, Object& object) ThrowCompletionOr<String> JSONObject::serialize_json_array(VM& vm, StringifyState& state, Object& object)
{ {
auto& vm = global_object.vm(); auto& realm = *vm.current_realm();
auto& global_object = realm.global_object();
if (state.seen_objects.contains(&object)) if (state.seen_objects.contains(&object))
return vm.throw_completion<TypeError>(ErrorType::JsonCircular); return vm.throw_completion<TypeError>(ErrorType::JsonCircular);
@ -307,7 +309,7 @@ ThrowCompletionOr<String> JSONObject::serialize_json_array(GlobalObject& global_
property_strings.ensure_capacity(length); property_strings.ensure_capacity(length);
for (size_t i = 0; i < length; ++i) { for (size_t i = 0; i < length; ++i) {
auto serialized_property_string = TRY(serialize_json_property(global_object, state, i, &object)); auto serialized_property_string = TRY(serialize_json_property(vm, state, i, &object));
if (serialized_property_string.is_null()) { if (serialized_property_string.is_null()) {
property_strings.append("null"sv); property_strings.append("null"sv);
} else { } else {
@ -403,22 +405,22 @@ JS_DEFINE_NATIVE_FUNCTION(JSONObject::parse)
auto json = JsonValue::from_string(string); auto json = JsonValue::from_string(string);
if (json.is_error()) if (json.is_error())
return vm.throw_completion<SyntaxError>(ErrorType::JsonMalformed); return vm.throw_completion<SyntaxError>(ErrorType::JsonMalformed);
Value unfiltered = parse_json_value(global_object, json.value()); Value unfiltered = parse_json_value(vm, json.value());
if (reviver.is_function()) { if (reviver.is_function()) {
auto* root = Object::create(realm, global_object.object_prototype()); auto* root = Object::create(realm, global_object.object_prototype());
auto root_name = String::empty(); auto root_name = String::empty();
MUST(root->create_data_property_or_throw(root_name, unfiltered)); MUST(root->create_data_property_or_throw(root_name, unfiltered));
return internalize_json_property(global_object, root, root_name, reviver.as_function()); return internalize_json_property(vm, root, root_name, reviver.as_function());
} }
return unfiltered; return unfiltered;
} }
Value JSONObject::parse_json_value(GlobalObject& global_object, JsonValue const& value) Value JSONObject::parse_json_value(VM& vm, JsonValue const& value)
{ {
if (value.is_object()) if (value.is_object())
return Value(parse_json_object(global_object, value.as_object())); return Value(parse_json_object(vm, value.as_object()));
if (value.is_array()) if (value.is_array())
return Value(parse_json_array(global_object, value.as_array())); return Value(parse_json_array(vm, value.as_array()));
if (value.is_null()) if (value.is_null())
return js_null(); return js_null();
if (value.is_double()) if (value.is_double())
@ -426,44 +428,46 @@ Value JSONObject::parse_json_value(GlobalObject& global_object, JsonValue const&
if (value.is_number()) if (value.is_number())
return Value(value.to_i32(0)); return Value(value.to_i32(0));
if (value.is_string()) if (value.is_string())
return js_string(global_object.heap(), value.to_string()); return js_string(vm, value.to_string());
if (value.is_bool()) if (value.is_bool())
return Value(static_cast<bool>(value.as_bool())); return Value(static_cast<bool>(value.as_bool()));
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
Object* JSONObject::parse_json_object(GlobalObject& global_object, JsonObject const& json_object) Object* JSONObject::parse_json_object(VM& vm, JsonObject const& json_object)
{ {
auto& realm = *global_object.associated_realm(); auto& realm = *vm.current_realm();
auto* object = Object::create(realm, global_object.object_prototype()); auto* object = Object::create(realm, realm.global_object().object_prototype());
json_object.for_each_member([&](auto& key, auto& value) { json_object.for_each_member([&](auto& key, auto& value) {
object->define_direct_property(key, parse_json_value(global_object, value), default_attributes); object->define_direct_property(key, parse_json_value(vm, value), default_attributes);
}); });
return object; return object;
} }
Array* JSONObject::parse_json_array(GlobalObject& global_object, JsonArray const& json_array) Array* JSONObject::parse_json_array(VM& vm, JsonArray const& json_array)
{ {
auto& realm = *global_object.associated_realm(); auto& realm = *vm.current_realm();
auto* array = MUST(Array::create(realm, 0)); auto* array = MUST(Array::create(realm, 0));
size_t index = 0; size_t index = 0;
json_array.for_each([&](auto& value) { json_array.for_each([&](auto& value) {
array->define_direct_property(index++, parse_json_value(global_object, value), default_attributes); array->define_direct_property(index++, parse_json_value(vm, value), default_attributes);
}); });
return array; return array;
} }
// 25.5.1.1 InternalizeJSONProperty ( holder, name, reviver ), https://tc39.es/ecma262/#sec-internalizejsonproperty // 25.5.1.1 InternalizeJSONProperty ( holder, name, reviver ), https://tc39.es/ecma262/#sec-internalizejsonproperty
ThrowCompletionOr<Value> JSONObject::internalize_json_property(GlobalObject& global_object, Object* holder, PropertyKey const& name, FunctionObject& reviver) ThrowCompletionOr<Value> JSONObject::internalize_json_property(VM& vm, Object* holder, PropertyKey const& name, FunctionObject& reviver)
{ {
auto& vm = global_object.vm(); auto& realm = *vm.current_realm();
auto& global_object = realm.global_object();
auto value = TRY(holder->get(name)); auto value = TRY(holder->get(name));
if (value.is_object()) { if (value.is_object()) {
auto is_array = TRY(value.is_array(vm)); auto is_array = TRY(value.is_array(vm));
auto& value_object = value.as_object(); auto& value_object = value.as_object();
auto process_property = [&](PropertyKey const& key) -> ThrowCompletionOr<void> { auto process_property = [&](PropertyKey const& key) -> ThrowCompletionOr<void> {
auto element = TRY(internalize_json_property(global_object, &value_object, key, reviver)); auto element = TRY(internalize_json_property(vm, &value_object, key, reviver));
if (element.is_undefined()) if (element.is_undefined())
TRY(value_object.internal_delete(key)); TRY(value_object.internal_delete(key));
else else

16
Userland/Libraries/LibJS/Runtime/JSONObject.h
View file

@ -20,9 +20,9 @@ public:
// The base implementation of stringify is exposed because it is used by // The base implementation of stringify is exposed because it is used by
// test-js to communicate between the JS tests and the C++ test runner. // test-js to communicate between the JS tests and the C++ test runner.
static ThrowCompletionOr<String> stringify_impl(GlobalObject&, Value value, Value replacer, Value space); static ThrowCompletionOr<String> stringify_impl(VM&, Value value, Value replacer, Value space);
static Value parse_json_value(GlobalObject&, JsonValue const&); static Value parse_json_value(VM&, JsonValue const&);
private: private:
struct StringifyState { struct StringifyState {
@ -34,15 +34,15 @@ private:
}; };
// Stringify helpers // Stringify helpers
static ThrowCompletionOr<String> serialize_json_property(GlobalObject&, StringifyState&, PropertyKey const& key, Object* holder); static ThrowCompletionOr<String> serialize_json_property(VM&, StringifyState&, PropertyKey const& key, Object* holder);
static ThrowCompletionOr<String> serialize_json_object(GlobalObject&, StringifyState&, Object&); static ThrowCompletionOr<String> serialize_json_object(VM&, StringifyState&, Object&);
static ThrowCompletionOr<String> serialize_json_array(GlobalObject&, StringifyState&, Object&); static ThrowCompletionOr<String> serialize_json_array(VM&, StringifyState&, Object&);
static String quote_json_string(String); static String quote_json_string(String);
// Parse helpers // Parse helpers
static Object* parse_json_object(GlobalObject&, JsonObject const&); static Object* parse_json_object(VM&, JsonObject const&);
static Array* parse_json_array(GlobalObject&, JsonArray const&); static Array* parse_json_array(VM&, JsonArray const&);
static ThrowCompletionOr<Value> internalize_json_property(GlobalObject&, Object* holder, PropertyKey const& name, FunctionObject& reviver); static ThrowCompletionOr<Value> internalize_json_property(VM&, Object* holder, PropertyKey const& name, FunctionObject& reviver);
JS_DECLARE_NATIVE_FUNCTION(stringify); JS_DECLARE_NATIVE_FUNCTION(stringify);
JS_DECLARE_NATIVE_FUNCTION(parse); JS_DECLARE_NATIVE_FUNCTION(parse);

2
Userland/Libraries/LibTest/JavaScriptTestRunner.h
View file

@ -260,7 +260,7 @@ inline AK::Result<NonnullRefPtr<JS::SourceTextModule>, ParserError> parse_module
inline ErrorOr<JsonValue> get_test_results(JS::Interpreter& interpreter) inline ErrorOr<JsonValue> get_test_results(JS::Interpreter& interpreter)
{ {
auto results = MUST(interpreter.global_object().get("__TestResults__")); auto results = MUST(interpreter.global_object().get("__TestResults__"));
auto json_string = MUST(JS::JSONObject::stringify_impl(interpreter.global_object(), results, JS::js_undefined(), JS::js_undefined())); auto json_string = MUST(JS::JSONObject::stringify_impl(*g_vm, results, JS::js_undefined(), JS::js_undefined()));
return JsonValue::from_string(json_string); return JsonValue::from_string(json_string);
} }