feat: Object keys 系列合并数组元素区,assign 按规范过滤枚举/触发 getter

walk_own_keys 返回值语义改为绝对存储索引:数组对象先枚举元素区
(跳过 hole),命名属性偏移到元素区之后;shape 槽位计数含 symbol 键
与物理存储对齐(修 symbol 键错位读值)。delete_own_property /
REST / SPREAD 四连锁点同步去偏移,REST/SPREAD 删除独立元素区循环
(由 walk_own_keys 统一覆盖,防重复键)。

Object.assign 增补:源只取可枚举自身属性;取值改 ordinary_get
(accessor 触发 getter,receiver=源);提交写 receiver 修正为 target
(目标同名 setter 的 this 指向 target)。
This commit is contained in:
2026-08-15 21:04:24 +08:00
parent a1c86a9335
commit 540ccc4a61
3 changed files with 168 additions and 77 deletions
+6 -48
View File
@@ -766,36 +766,12 @@ impl Vm {
}
}
// 数组元素区:整数下标可枚举元素(hole 跳过),排除 pattern 已绑定的键。
if src_obj.is_array() {
for i in 0..src_obj.array_prop_count {
if src_obj.prop_meta_at(i).is_some_and(|m| m.is_hole()) {
continue;
}
let enumerable = src_obj
.prop_meta_at(i)
.map(|m| m.attributes.enumerable())
.unwrap_or(PropAttributes::DEFAULT_DATA.enumerable());
if enumerable {
let si = make_int_key(i);
if excluded.contains(&si) {
continue;
}
let val = match self.ordinary_get(src_obj, si, src) {
Ok(v) => v,
Err(e) => return self.raise_call_error(&e).map(|_| ()),
};
assignments.push((si, val));
}
}
}
// 命名属性:shape 链(walk_own_keys 规范顺序),仅可枚举,跳过 pattern 已绑定的键。
// 自身属性:walk_own_keys 已合并数组元素区(hole 跳过)并返回绝对存储索引,
// 仅可枚举,跳过 pattern 已绑定的键。
let keys = oxide_builtins::object::walk_own_keys(self, src_obj);
for (si, pos) in keys {
let store = if src_obj.is_array() { src_obj.array_prop_count + pos } else { pos };
let enumerable = src_obj
.prop_meta_at(store)
.prop_meta_at(pos)
.map(|m| m.attributes.enumerable())
.unwrap_or(PropAttributes::DEFAULT_DATA.enumerable());
if !enumerable {
@@ -882,30 +858,12 @@ impl Vm {
// 再统一写目标,避免提交写与取值互相交错。
let mut assignments: Vec<(u32, JsValue)> = Vec::new();
// 数组元素区:整数下标可枚举元素(hole 跳过)。
if src_obj.is_array() {
for i in 0..src_obj.array_prop_count {
if src_obj.prop_meta_at(i).is_some_and(|m| m.is_hole()) {
continue;
}
let enumerable = src_obj
.prop_meta_at(i)
.map(|m| m.attributes.enumerable())
.unwrap_or(PropAttributes::DEFAULT_DATA.enumerable());
if enumerable {
let si = make_int_key(i);
let val = self.ordinary_get(src_obj, si, src)?;
assignments.push((si, val));
}
}
}
// 命名属性:shape 链(walk_own_keys 规范顺序),仅可枚举。
// 自身属性:walk_own_keys 已合并数组元素区(hole 跳过)并返回绝对存储索引,
// 仅可枚举;取值经 ordinary_get 触发访问器 getter。
let keys = oxide_builtins::object::walk_own_keys(self, src_obj);
for (si, pos) in keys {
let store = if src_obj.is_array() { src_obj.array_prop_count + pos } else { pos };
let enumerable = src_obj
.prop_meta_at(store)
.prop_meta_at(pos)
.map(|m| m.attributes.enumerable())
.unwrap_or(PropAttributes::DEFAULT_DATA.enumerable());
if !enumerable {
@@ -215,3 +215,114 @@ fn from_entries_multiple_pairs_roundtrip() {
let (_vm, result) = eval("var o = Object.fromEntries([[1,'a'],[2,'b']]); o[1] + o[2]").unwrap();
assert!(result.is_string() && unsafe { &*result.as_string_ptr() }.as_str() == "ab");
}
// -- Object.keys/values/entries 数组元素区 --
#[test]
fn keys_array_includes_integer_elements() {
let (_vm, result) = eval("Object.keys([1,2]).join(',')").unwrap();
let s = unsafe { &*result.as_string_ptr() }.to_owned_string();
assert_eq!(s, "0,1");
}
#[test]
fn keys_array_skips_holes() {
let (_vm, result) = eval("Object.keys([1,,3]).join(',')").unwrap();
let s = unsafe { &*result.as_string_ptr() }.to_owned_string();
assert_eq!(s, "0,2");
}
#[test]
fn entries_array_reads_element_values() {
let (_vm, result) = eval("var e = Object.entries([1,2]); e[1][1]").unwrap();
assert!(
result.is_int() && result.as_int() == 2,
"second entry value should be 2, got {:?}",
result
);
}
#[test]
fn keys_array_mixed_named_prop_order() {
// 整数下标升序在前,命名属性按插入序随后(无重复键)。
let (_vm, result) = eval("var a = [10]; a.foo = 1; Object.keys(a).join(',')").unwrap();
let s = unsafe { &*result.as_string_ptr() }.to_owned_string();
assert_eq!(s, "0,foo");
}
#[test]
fn keys_array_non_enumerable_element_filtered() {
// defineProperty 把元素改为不可枚举后 keys 应省略(values/entries 同理)。
let (_vm, result) =
eval("var a = [1, 2]; Object.defineProperty(a, '1', {enumerable: false}); Object.keys(a).join(',')").unwrap();
let s = unsafe { &*result.as_string_ptr() }.to_owned_string();
assert_eq!(s, "0");
}
// -- Object.assign --
#[test]
fn assign_filters_non_enumerable_source() {
let (_vm, result) = eval(
"var src = Object.defineProperty({}, 'x', {value: 1, enumerable: false}); JSON.stringify(Object.assign({}, src))",
)
.unwrap();
let s = unsafe { &*result.as_string_ptr() }.to_owned_string();
assert_eq!(s, "{}");
}
#[test]
fn assign_triggers_source_getter() {
let (_vm, result) = eval("var n = 0; var t = Object.assign({}, {get b(){ n++; return 2 }}); [t.b, n]").unwrap();
let obj = unsafe { &*result.as_js_object_ptr() };
assert!(
obj.get_prop_at(0).is_int() && obj.get_prop_at(0).as_int() == 2,
"getter value should be copied"
);
assert!(
obj.get_prop_at(1).is_int() && obj.get_prop_at(1).as_int() == 1,
"getter should run exactly once"
);
}
#[test]
fn assign_from_array_source() {
let (_vm, result) = eval("var t = Object.assign({}, [1, 2]); [t['0'], t['1']]").unwrap();
let obj = unsafe { &*result.as_js_object_ptr() };
assert!(obj.get_prop_at(0).is_int() && obj.get_prop_at(0).as_int() == 1);
assert!(obj.get_prop_at(1).is_int() && obj.get_prop_at(1).as_int() == 2);
}
#[test]
fn assign_target_setter_receives_target() {
// 规范 Set(to, key, value, true):target 同名 setter 的 this 是 target。
let (_vm, result) = eval(
"var recv = null; var t = {}; Object.defineProperty(t, 'x', {set: function(v){ recv = this; }, configurable: true}); Object.assign(t, {x: 1}); recv === t",
)
.unwrap();
assert!(result.is_bool() && result.as_bool(), "target setter should receive target as this");
}
#[test]
fn assign_to_frozen_target_throws() {
let err = match eval("var t = Object.freeze({a: 1}); Object.assign(t, {b: 2});") {
Ok(_) => panic!("assign to frozen target should fail"),
Err(err) => err,
};
assert!(err.contains("extensible"), "unexpected error: {err}");
}
// -- Symbol 键错位回归(shape 槽位计数含 symbol 键) --
#[test]
fn entries_values_with_interleaved_symbol_key() {
let (_vm, result) = eval(
"var s = Symbol(); var o = {a: 1, [s]: 2, b: 3}; [JSON.stringify(Object.entries(o)), JSON.stringify(Object.values(o))]",
)
.unwrap();
let obj = unsafe { &*result.as_js_object_ptr() };
let s0 = unsafe { &*obj.get_prop_at(0).as_string_ptr() }.to_owned_string();
let s1 = unsafe { &*obj.get_prop_at(1).as_string_ptr() }.to_owned_string();
assert_eq!(s0, "[[\"a\",1],[\"b\",3]]");
assert_eq!(s1, "[1,3]");
}