ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-26 11:41:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 补全 Object.prototype 方法族与 toString 标签

Browse Source
This commit is contained in:
彭俊皓
2026-09-21 03:30:25 +00:00
parent 7481ceb798
commit d93215c83b
8 changed files with 397 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/async_func.rs
+3 -2
View File
@@ -437,8 +437,9 @@ pub(crate) fn init_async_intrinsics(vm: &mut Vm) {
let cpos = af_proto.push_prop(JsValue::from_js_object(af_ctor_ptr));
af_proto.set_data_meta(cpos, PropAttributes::new(false, false, true));
// af_proto[Symbol.toStringTag] = "AsyncFunction"（数据属性，w/e/c = false/false/true）。
let tag_si = sf.intern("@@toStringTag").0;
let tag_shape = sh.make_shape(af_proto.shape_id(), tag_si);
let tag_key =
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG);
let tag_shape = sh.make_shape(af_proto.shape_id(), tag_key);
af_proto.set_shape_id(tag_shape);
let tag_pos = af_proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("AsyncFunction").0)));
af_proto.set_data_meta(tag_pos, PropAttributes::new(false, false, true));
crates/oxide_vm/src/async_generator.rs
+6 -4
View File
@@ -748,9 +748,10 @@ pub(crate) fn init_async_generator_intrinsics(vm: &mut Vm) {
("return", async_generator_return as *const (), 1),
("throw", async_generator_throw as *const (), 1),
);
// @@toStringTag（Object.prototype.toString → "[object AsyncGenerator]"）。
let tag_si = sf.intern("@@toStringTag").0;
let tag_shape = sh.make_shape(ag_proto.shape_id(), tag_si);
// Symbol.toStringTag（Object.prototype.toString → "[object AsyncGenerator]"）。
let tag_key =
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG);
let tag_shape = sh.make_shape(ag_proto.shape_id(), tag_key);
ag_proto.set_shape_id(tag_shape);
let tag_pos = ag_proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("AsyncGenerator").0)));
ag_proto.set_data_meta(tag_pos, PropAttributes::new(false, false, true));
@@ -811,7 +812,8 @@ pub(crate) fn init_async_generator_intrinsics(vm: &mut Vm) {
let ppos2 = agf_proto.push_prop(JsValue::from_js_object(vm.async_generator_proto.as_ptr() as *mut JsObject));
agf_proto.set_data_meta(ppos2, PropAttributes::new(false, false, false));
// agf_proto[Symbol.toStringTag] = "AsyncGeneratorFunction"（数据属性，w/e/c = false/false/true）。
let tag2_key = oxide_types::private_key::make_well_known_symbol_key(0);
let tag2_key =
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG);
let tag2_shape = sh.make_shape(agf_proto.shape_id(), tag2_key);
agf_proto.set_shape_id(tag2_shape);
let tag2_pos = agf_proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("AsyncGeneratorFunction").0)));
crates/oxide_vm/src/bindings/bind_object.rs
+35 -1
View File
@@ -56,15 +56,49 @@ pub fn bind_object(core: &Arc<KernelCore>, session: &KernelSession, global: &mut
0,
),
("valueOf", oxide_builtins::object::object_proto_value_of::<crate::vm::Vm> as *const (), 0),
(
"isPrototypeOf",
oxide_builtins::object::object_proto_is_prototype_of::<crate::vm::Vm> as *const (),
1,
),
(
"toLocaleString",
oxide_builtins::object::object_proto_to_locale_string::<crate::vm::Vm> as *const (),
0,
),
(
"__defineGetter__",
oxide_builtins::object::object_proto_define_getter::<crate::vm::Vm> as *const (),
2,
),
(
"__defineSetter__",
oxide_builtins::object::object_proto_define_setter::<crate::vm::Vm> as *const (),
2,
),
(
"__lookupGetter__",
oxide_builtins::object::object_proto_lookup_getter::<crate::vm::Vm> as *const (),
1,
),
(
"__lookupSetter__",
oxide_builtins::object::object_proto_lookup_setter::<crate::vm::Vm> as *const (),
1,
),
],
);
// 内置原型方法不可枚举（否则会泄漏进 for-in）。
for name in ["toString", "valueOf", "__defineGetter__"] {
for name in [
"toString",
"valueOf",
"isPrototypeOf",
"toLocaleString",
"__defineGetter__",
"__defineSetter__",
"__lookupGetter__",
"__lookupSetter__",
] {
let si = core.perm_interner().intern(name).0;
if let Some(pos) = core.shape_forge().lookup_position(object_proto.shape_id(), si) {
object_proto.set_data_meta(pos, PropAttributes::new(true, false, true));
crates/oxide_vm/src/bindings/bind_typed_array.rs
+5 -4
View File
@@ -2,8 +2,8 @@ use std::sync::Arc;
use crate::bind_constructor;
use crate::bindings::{
apply_binding_table, bind_accessor_getter, bind_global_value, bind_method_alias, bind_well_known_method_alias,
configure_native_constructor,
apply_binding_table, bind_accessor_getter, bind_accessor_getter_key, bind_global_value, bind_method_alias,
bind_well_known_method_alias, configure_native_constructor,
};
use oxide_kernel::kernel::{KernelCore, KernelSession};
use oxide_types::object::{JsObject, PropAttributes};
@@ -229,11 +229,12 @@ pub fn bind_typed_array(core: &Arc<KernelCore>, session: &KernelSession, global:
"length",
oxide_builtins::typed_array::typed_array_length_getter::<crate::vm::Vm> as *const (),
);
bind_accessor_getter(
bind_accessor_getter_key(
core,
session,
shared_proto,
"@@toStringTag",
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG),
"get @@toStringTag",
oxide_builtins::typed_array::typed_array_to_string_tag_getter::<crate::vm::Vm> as *const (),
);
crates/oxide_vm/src/bindings/mod.rs
+38
View File
@@ -617,6 +617,41 @@ fn bind_iterator_protos(core: &Arc<KernelCore>, session: &KernelSession) {
);
}
/// 给标准内置原型补装缺失的 `@@toStringTag` 数据属性
/// （`{ writable:false, enumerable:false, configurable:true }`）。
///
/// 幂等：目标已有 tag 键槽位时跳过（dirty reset 重复经过不追加重复属性槽）。
/// `%IteratorPrototype%` / BigInt 原型的 tag 已由各家族绑定点安装，不在此列。
fn install_to_string_tags(core: &Arc<KernelCore>, session: &KernelSession) {
let world = session.builtin_world();
let sf = core.perm_interner().as_ref();
let sh = core.shape_forge().as_ref();
let tag_id = oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG;
let tag_key = oxide_types::private_key::make_well_known_symbol_key(tag_id);
let cases: [(*mut JsObject, &str); 11] = [
(world.map_proto.as_ptr() as *mut JsObject, "Map"),
(world.set_proto.as_ptr() as *mut JsObject, "Set"),
(world.data_view_proto.as_ptr() as *mut JsObject, "DataView"),
(world.array_iterator_proto.as_ptr() as *mut JsObject, "Array Iterator"),
(world.map_iterator_proto.as_ptr() as *mut JsObject, "Map Iterator"),
(world.set_iterator_proto.as_ptr() as *mut JsObject, "Set Iterator"),
(world.string_iterator_proto.as_ptr() as *mut JsObject, "String Iterator"),
(world.regexp_string_iterator_proto.as_ptr() as *mut JsObject, "String Iterator"),
(world.math_object.as_ptr() as *mut JsObject, "Math"),
(world.json_object.as_ptr() as *mut JsObject, "JSON"),
(world.symbol_proto.as_ptr() as *mut JsObject, "Symbol"),
];
for (ptr, tag) in cases {
// SAFETY: ptr 为当前 builtin world 的内置原型，session 独占期间始终有效。
let proto = unsafe { &mut *ptr };
if sh.lookup_position(proto.shape_id(), tag_key).is_some() {
continue;
}
let tag_val = JsValue::perm_string(sf.string_ptr(sf.intern(tag).0));
bind_well_known_data_property(core, proto, tag_id, tag_val, PropAttributes::new(false, false, true));
}
}
/// 对齐保留 global 上 `Iterator` 函数对象的 `prototype` 属性：object 家族重建会
/// 产生新的 `%IteratorPrototype%`，保留的 Iterator 函数对象须指向新原型。
///
@@ -1174,6 +1209,9 @@ pub fn rebind_dirty_builtins(core: &Arc<KernelCore>, session: &mut KernelSession
if dirty.map_or(true, |d| d.console) {
bind_console::bind_console(core, session, global);
}
// tag 目标横跨多个脏分组（Map/Set/DataView/Math/JSON/迭代器原型），
// 各组各自重绑后统一补装；安装点自带幂等检查。
install_to_string_tags(core, session);
}
/// 完整初始化一个 session 的内置对象（全量绑定 + `globalThis` + 快照记录）。
crates/oxide_vm/src/generator.rs
+6 -4
View File
@@ -742,9 +742,10 @@ pub(crate) fn init_generator_intrinsics(vm: &mut Vm) {
("return", generator_return as *const (), 1),
("throw", generator_throw as *const (), 1),
);
// @@toStringTag（Object.prototype.toString → "[object Generator]"）。
let tag_si = sf.intern("@@toStringTag").0;
let tag_shape = sh.make_shape(gen_proto.shape_id(), tag_si);
// Symbol.toStringTag（Object.prototype.toString → "[object Generator]"）。
let tag_key =
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG);
let tag_shape = sh.make_shape(gen_proto.shape_id(), tag_key);
gen_proto.set_shape_id(tag_shape);
let tag_pos = gen_proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("Generator").0)));
gen_proto.set_data_meta(tag_pos, oxide_types::object::PropAttributes::new(false, false, true));
@@ -805,7 +806,8 @@ pub(crate) fn init_generator_intrinsics(vm: &mut Vm) {
let ppos2 = gf_proto.push_prop(JsValue::from_js_object(vm.generator_proto.as_ptr() as *mut JsObject));
gf_proto.set_data_meta(ppos2, oxide_types::object::PropAttributes::new(false, false, false));
// gf_proto[Symbol.toStringTag] = "GeneratorFunction"（数据属性，w/e/c = false/false/true）。
let tag2_key = oxide_types::private_key::make_well_known_symbol_key(0);
let tag2_key =
oxide_types::private_key::make_well_known_symbol_key(oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG);
let tag2_shape = sh.make_shape(gf_proto.shape_id(), tag2_key);
gf_proto.set_shape_id(tag2_shape);
let tag2_pos = gf_proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("GeneratorFunction").0)));
crates/oxide_vm/src/promise/constructor.rs
+4 -2
View File
@@ -186,8 +186,10 @@ impl Vm {
("catch", promise_catch as *const (), 1),
("finally", promise_finally as *const (), 1),
);
let tag_si = sf.intern("@@toStringTag").0;
let tag_shape = sh.make_shape(proto.shape_id(), tag_si);
let tag_key = oxide_types::private_key::make_well_known_symbol_key(
oxide_types::private_key::WELL_KNOWN_SYMBOL_TO_STRING_TAG,
);
let tag_shape = sh.make_shape(proto.shape_id(), tag_key);
proto.set_shape_id(tag_shape);
let tag_pos = proto.push_prop(JsValue::perm_string(sf.string_ptr(sf.intern("Promise").0)));
proto.set_data_meta(tag_pos, PropAttributes::new(false, false, true));