Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JsValue::to_json fix integer property keys #4011

Merged
merged 2 commits into from
Oct 9, 2024
Merged

JsValue::to_json fix integer property keys #4011

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0800c4
#3923: `to_json` fix integer properties key
Nikita-str Sep 28, 2024
70c7422
some refactoring
Nikita-str Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions core/engine/src/value/conversions/serde_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,33 @@ impl JsValue {
.with_message("cannot convert bigint to JSON")
.into()),
Self::Object(obj) => {
let value_by_prop_key = |property_key, context: &mut Context| {
obj.borrow()
.properties()
.get(&property_key)
.and_then(|x| x.value().map(|val| val.to_json(context)))
.unwrap_or(Ok(Value::Null))
};

if obj.is_array() {
let len = obj.length_of_array_like(context)?;
let mut arr = Vec::with_capacity(len as usize);

let obj = obj.borrow();

for k in 0..len as u32 {
let val = obj.properties().get(&k.into()).map_or(Self::Null, |desc| {
desc.value().cloned().unwrap_or(Self::Null)
});
arr.push(val.to_json(context)?);
let val = value_by_prop_key(k.into(), context)?;
arr.push(val);
}

Ok(Value::Array(arr))
} else {
let mut map = Map::new();

for index in obj.borrow().properties().index_property_keys() {
let key = index.to_string();
let value = value_by_prop_key(index.into(), context)?;
map.insert(key, value);
}

for property_key in obj.borrow().properties().shape.keys() {
let key = match &property_key {
PropertyKey::String(string) => string.to_std_string_escaped(),
Expand All @@ -150,17 +161,7 @@ impl JsValue {
.into())
}
};

let value = match obj
.borrow()
.properties()
.get(&property_key)
.and_then(|x| x.value().cloned())
{
Some(val) => val.to_json(context)?,
None => Value::Null,
};

let value = value_by_prop_key(property_key, context)?;
map.insert(key, value);
}

Expand All @@ -181,7 +182,7 @@ mod tests {
use serde_json::json;

use crate::object::JsArray;
use crate::JsValue;
use crate::{js_string, JsValue};
use crate::{run_test_actions, TestAction};

#[test]
Expand All @@ -200,7 +201,10 @@ mod tests {
-45,
{},
true
]
],
"7.3": "random text",
"100": 1000,
"24": 42
}
"#};

Expand All @@ -217,6 +221,14 @@ mod tests {
assert_eq!(obj.get(js_str!("age"), ctx).unwrap(), 43_i32.into());
assert_eq!(obj.get(js_str!("minor"), ctx).unwrap(), false.into());
assert_eq!(obj.get(js_str!("adult"), ctx).unwrap(), true.into());

assert_eq!(
obj.get(js_str!("7.3"), ctx).unwrap(),
js_string!("random text").into()
);
assert_eq!(obj.get(js_str!("100"), ctx).unwrap(), 1000.into());
assert_eq!(obj.get(js_str!("24"), ctx).unwrap(), 42.into());

{
let extra = obj.get(js_str!("extra"), ctx).unwrap();
let extra = extra.as_object().unwrap();
Expand Down
Loading