mirror of
https://github.com/pjh456/OxideJS.git
synced 2026-10-23 18:21:13 +08:00
fix: bind_constructor 宏补 length 描述符 meta
This commit is contained in:
@@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||
|
||||
use crate::bindings::{apply_binding_table, bind_global_value, configure_native_constructor};
|
||||
use oxide_kernel::kernel::{KernelCore, KernelSession};
|
||||
use oxide_types::object::JsObject;
|
||||
use oxide_types::object::{JsObject, PropAttributes};
|
||||
use oxide_types::value::JsValue;
|
||||
|
||||
/// 把 Date 构造器与原型方法绑定到 global。
|
||||
@@ -13,6 +13,13 @@ pub fn bind_date(core: &Arc<KernelCore>, session: &KernelSession, global: &mut J
|
||||
let proto = unsafe { &mut *proto_ptr };
|
||||
|
||||
configure_native_constructor(ctor, oxide_builtins::date::date_constructor::<crate::vm::Vm> as *const (), 7);
|
||||
// Date.length = 7,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let length_si = core.perm_interner().intern("length").0;
|
||||
let length_shape = core.shape_forge().make_shape(ctor.shape_id(), length_si);
|
||||
ctor.set_shape_id(length_shape);
|
||||
ctor.ensure_hash_props().push(JsValue::int(7));
|
||||
let length_pos = ctor.hash_props_vec().map_or(0, |v| v.len() as u32).saturating_sub(1);
|
||||
ctor.set_data_meta(length_pos, PropAttributes::new(false, false, true));
|
||||
|
||||
apply_binding_table(
|
||||
session.builtin_world(),
|
||||
|
||||
@@ -59,5 +59,5 @@ pub fn bind_map(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
|
||||
&[("groupBy", oxide_builtins::map::map_group_by::<crate::vm::Vm> as *const (), 2)],
|
||||
);
|
||||
|
||||
bind_constructor!(core, global, "Map", ctor_ptr, oxide_builtins::map::map_constructor::<crate::vm::Vm>, 1, hash: true);
|
||||
bind_constructor!(core, global, "Map", ctor_ptr, oxide_builtins::map::map_constructor::<crate::vm::Vm>, 0, hash: true);
|
||||
}
|
||||
|
||||
@@ -64,5 +64,5 @@ pub fn bind_set(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
|
||||
oxide_builtins::array::array_species_get::<crate::vm::Vm> as *const (),
|
||||
);
|
||||
|
||||
bind_constructor!(core, global, "Set", ctor_ptr, oxide_builtins::set::set_constructor::<crate::vm::Vm>, 1, hash: true);
|
||||
bind_constructor!(core, global, "Set", ctor_ptr, oxide_builtins::set::set_constructor::<crate::vm::Vm>, 0, hash: true);
|
||||
}
|
||||
|
||||
@@ -56,6 +56,13 @@ pub fn bind_string(core: &Arc<KernelCore>, session: &KernelSession, global: &mut
|
||||
let ctor_ptr = session.builtin_world().string_constructor.as_ptr() as *mut JsObject;
|
||||
let ctor = unsafe { &mut *ctor_ptr };
|
||||
configure_native_constructor(ctor, oxide_builtins::string::string_constructor::<crate::vm::Vm> as *const (), 1);
|
||||
// String.length = 1,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let length_si = core.perm_interner().intern("length").0;
|
||||
let length_shape = core.shape_forge().make_shape(ctor.shape_id(), length_si);
|
||||
ctor.set_shape_id(length_shape);
|
||||
ctor.ensure_hash_props().push(JsValue::int(1));
|
||||
let length_pos = ctor.hash_props_vec().map_or(0, |v| v.len() as u32).saturating_sub(1);
|
||||
ctor.set_data_meta(length_pos, PropAttributes::new(false, false, true));
|
||||
|
||||
let proto_ptr = session.builtin_world().string_proto.as_ptr() as *mut JsObject;
|
||||
let proto = unsafe { &mut *proto_ptr };
|
||||
|
||||
@@ -52,7 +52,7 @@ pub fn bind_symbol(core: &Arc<KernelCore>, session: &KernelSession, global: &mut
|
||||
bind_well_known_symbol(core, ctor, name, JsValue::symbol(id as u32));
|
||||
}
|
||||
|
||||
bind_constructor!(core, global, "Symbol", ctor_ptr, oxide_builtins::symbol::symbol_constructor::<crate::vm::Vm>, 1, hash: true);
|
||||
bind_constructor!(core, global, "Symbol", ctor_ptr, oxide_builtins::symbol::symbol_constructor::<crate::vm::Vm>, 0, hash: true);
|
||||
}
|
||||
|
||||
fn bind_well_known_symbol(core: &Arc<KernelCore>, ctor: &mut JsObject, name: &str, val: JsValue) {
|
||||
|
||||
@@ -101,6 +101,10 @@ macro_rules! bind_constructor {
|
||||
let length_shape = $core.shape_forge().make_shape(ctor.shape_id(), length_si);
|
||||
ctor.set_shape_id(length_shape);
|
||||
ctor.ensure_hash_props().push($crate::JsValue::int($nargs as i32));
|
||||
// length 描述符 { writable:false, enumerable:false, configurable:true }
|
||||
// (规范构造器通用面;不写 meta 缺省全枚举会泄漏进 Object.keys)。
|
||||
let length_pos = ctor.hash_props_vec().map_or(0, |v| v.len() as u32).saturating_sub(1);
|
||||
ctor.set_data_meta(length_pos, oxide_types::object::PropAttributes::new(false, false, true));
|
||||
}};
|
||||
}
|
||||
|
||||
|
||||
@@ -458,3 +458,15 @@ fn array_is_array_rejects_prototype_inherited_object() {
|
||||
let (_vm, result) = eval("Array.isArray([])").unwrap();
|
||||
assert_eq!(result, JsValue::bool(true));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn array_length_descriptor() {
|
||||
// Array.length = 1,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let (vm, r) = eval(
|
||||
"var d = Object.getOwnPropertyDescriptor(Array, 'length'); \
|
||||
d.value === 1 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
let _ = vm;
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
@@ -580,3 +580,16 @@ fn date_set_utc_hours_valid_kept() {
|
||||
let r = eval(&mut vm, "var d = new Date(0); d.setUTCHours(13); d.getUTCHours()").unwrap();
|
||||
assert_eq!(r.as_double() as i64, 13);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn date_length_descriptor() {
|
||||
// Date.length = 7,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let mut vm = Vm::new();
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"var d = Object.getOwnPropertyDescriptor(Date, 'length'); \
|
||||
d.value === 7 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
@@ -268,3 +268,16 @@ fn map_get_or_insert_length_and_name() {
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn map_length_descriptor() {
|
||||
// Map.length = 0,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let mut vm = Vm::new();
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"var d = Object.getOwnPropertyDescriptor(Map, 'length'); \
|
||||
d.value === 0 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
@@ -226,3 +226,16 @@ fn set_object_key_identity() {
|
||||
let r = eval(&mut vm, "var o = { a: 1 }; var s = new Set(); s.add(o); s.has(o) && !s.has({ a: 1 })").unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn set_length_descriptor() {
|
||||
// Set.length = 0,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let mut vm = Vm::new();
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"var d = Object.getOwnPropertyDescriptor(Set, 'length'); \
|
||||
d.value === 0 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
@@ -1672,3 +1672,16 @@ fn string_repeat_count_range_error() {
|
||||
let err = eval(&mut vm, "'ab'.repeat(Infinity)").unwrap_err();
|
||||
assert!(err.contains("RangeError"), "got: {}", err);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn string_length_descriptor() {
|
||||
// String.length = 1,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let mut vm = Vm::new();
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"var d = Object.getOwnPropertyDescriptor(String, 'length'); \
|
||||
d.value === 1 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
@@ -356,3 +356,16 @@ fn symbol_proto_direct_description_access_throws_type_error() {
|
||||
.unwrap();
|
||||
assert!(result.as_bool());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symbol_length_descriptor() {
|
||||
// Symbol.length = 0,描述符 { writable:false, enumerable:false, configurable:true }。
|
||||
let mut vm = Vm::new();
|
||||
let r = eval(
|
||||
&mut vm,
|
||||
"var d = Object.getOwnPropertyDescriptor(Symbol, 'length'); \
|
||||
d.value === 0 && d.writable === false && d.enumerable === false && d.configurable === true",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(r.as_bool());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user