mirror of
https://github.com/pjh456/OxideJS.git
synced 2026-10-26 03:31:12 +08:00
fix: @@iterator 解析不到可调用时迭代可选入口回退 array-like
This commit is contained in:
@@ -332,6 +332,13 @@ pub(crate) fn bind_well_known_method(
|
||||
}
|
||||
|
||||
/// 把原型上 `source` 属性已绑定的函数值复制到 well-known symbol 键名下(共享同一函数对象)。
|
||||
///
|
||||
/// # 边界
|
||||
/// `source` 键不在原型上时静默跳过。
|
||||
///
|
||||
/// # 注意
|
||||
/// well-known 键已在位时原位更新值,不追加重复 shape 槽:初始化与重绑可多轮
|
||||
/// 经过同一原型,重复槽会让 delete 只删其一、读仍命中残留槽。
|
||||
pub(crate) fn bind_well_known_method_alias(
|
||||
core: &Arc<KernelCore>, proto: &mut JsObject, source: &str, well_known_id: u32,
|
||||
) {
|
||||
@@ -343,6 +350,12 @@ pub(crate) fn bind_well_known_method_alias(
|
||||
};
|
||||
let value = proto.get_prop_at(pos);
|
||||
let key = oxide_types::private_key::make_well_known_symbol_key(well_known_id);
|
||||
if let Some(existing) = shape_forge.lookup_position(proto.shape_id(), key) {
|
||||
proto.set_prop_at(existing, value);
|
||||
proto.set_data_meta(existing, PropAttributes::new(true, false, true));
|
||||
proto.bump_generation();
|
||||
return;
|
||||
}
|
||||
let new_shape = shape_forge.make_shape(proto.shape_id(), key);
|
||||
proto.set_shape_id(new_shape);
|
||||
let alias_pos = proto.push_prop(value);
|
||||
|
||||
@@ -2171,3 +2171,80 @@ fn for_of_throws_when_array_prototype_iterator_deleted() {
|
||||
.unwrap();
|
||||
assert_eq!(to_str(&vm, r), "TypeError");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn array_from_falls_back_to_array_like_when_iterator_unresolvable() {
|
||||
let mut vm = Vm::new();
|
||||
// 红形钉:真集合的 @@iterator 解析为 null/undefined(原型删除、自身置 null)
|
||||
// 时,Array.from 须经 GetMethod-可选语义落 array-like 索引读臂,红形为误抛
|
||||
// TypeError。
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"(() => {
|
||||
const old = Array.prototype[Symbol.iterator];
|
||||
delete Array.prototype[Symbol.iterator];
|
||||
let deleted;
|
||||
try { deleted = Array.from([1, 2]).join(','); }
|
||||
catch (e) { deleted = e.constructor.name; }
|
||||
finally { Array.prototype[Symbol.iterator] = old; }
|
||||
const own = [1, 2];
|
||||
own[Symbol.iterator] = null;
|
||||
let ownNull;
|
||||
try { ownNull = Array.from(own).join(','); }
|
||||
catch (e) { ownNull = e.constructor.name; }
|
||||
return deleted + '|' + ownNull;
|
||||
})()",
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(to_str(&vm, r), "1,2|1,2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_array_ctor_and_set_fall_back_when_iterator_unresolvable() {
|
||||
let mut vm = Vm::new();
|
||||
// 红形钉:真集合的 @@iterator 被删除时,TA 构造器(GetMethod-可选语义)
|
||||
// 须落 array-like 臂(无 length 得 0 元素),set 恒索引读;红形为误抛
|
||||
// TypeError。真数组经构造器恒走元素区直读(不受 @@iterator 解析影响),
|
||||
// 一并作回归守卫。
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"(() => {
|
||||
const old = Map.prototype[Symbol.iterator];
|
||||
delete Map.prototype[Symbol.iterator];
|
||||
const m = new Map(); m.set(7, 8);
|
||||
let ctor;
|
||||
try { ctor = new Uint8Array(m).length; }
|
||||
catch (e) { ctor = e.constructor.name; }
|
||||
let setResult;
|
||||
const t = new Uint8Array([5, 6]);
|
||||
try { t.set(m); setResult = t.join(','); }
|
||||
catch (e) { setResult = e.constructor.name; }
|
||||
let arrCtor;
|
||||
try { arrCtor = new Uint8Array([1, 2, 3]).join(','); }
|
||||
catch (e) { arrCtor = e.constructor.name; }
|
||||
Map.prototype[Symbol.iterator] = old;
|
||||
return ctor + '|' + setResult + '|' + arrCtor;
|
||||
})()",
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(to_str(&vm, r), "0|5,6|1,2,3");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_array_set_reads_array_like_source_by_index() {
|
||||
let mut vm = Vm::new();
|
||||
// 红形钉:TA.set 对非 TypedArray 源恒按 array-like 索引读,不咨询源的
|
||||
// @@iterator(即便其可调用);红形为走用户迭代器得 99 填充。
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"(() => {
|
||||
const src = { 0: 7, 1: 8, length: 2 };
|
||||
src[Symbol.iterator] = function* () { yield 99; };
|
||||
const t = new Uint8Array(4);
|
||||
t.set(src);
|
||||
return t.join(',');
|
||||
})()",
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(to_str(&vm, r), "7,8,0,0");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user