mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 18:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and test v8::Value::{IsUint32,Uint32Value}

Browse Source
This commit is contained in:
Ben Grant
2024-09-24 15:48:07 -07:00
parent a312af2da6
commit 0fef2bb90c
4 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bun.js/bindings/v8/V8Value.cpp
View File

@@ -23,7 +23,7 @@ bool Value::IsNumber() const
bool Value::IsUint32() const
{
return localToJSValue().isUInt32();
return localToJSValue().isUInt32AsAnyInt();
}
bool Value::IsUndefined() const
@@ -64,11 +64,10 @@ bool Value::IsFunction() const
Maybe<uint32_t> Value::Uint32Value(Local<Context> context) const
{
auto js_value = localToJSValue();
uint32_t value;
if (js_value.getUInt32(value)) {
return Just(value);
}
return Nothing<uint32_t>();
auto scope = DECLARE_THROW_SCOPE(context->vm());
uint32_t num = js_value.toUInt32(context->globalObject());
RETURN_IF_EXCEPTION(scope, Nothing<uint32_t>());
RELEASE_AND_RETURN(scope, Just(num));
}
bool Value::FullIsTrue() const

56
test/v8/v8-module/main.cpp
View File

@@ -13,6 +13,17 @@ using namespace v8;
#define LOG_EXPR(e) std::cout << #e << " = " << (e) << std::endl
#define LOG_MAYBE(m) \
do { \
auto maybe__ = (m); \
std::cout << #m << " = "; \
if (maybe__.IsJust()) { \
std::cout << "Just(" << maybe__.FromJust() << ")" << std::endl; \
} else { \
std::cout << "Nothing" << std::endl; \
} \
} while (0)
#define LOG_VALUE_KIND(v) \
do { \
LOG_EXPR(v->IsUndefined()); \
@@ -24,6 +35,7 @@ using namespace v8;
LOG_EXPR(v->IsString()); \
LOG_EXPR(v->IsObject()); \
LOG_EXPR(v->IsNumber()); \
LOG_EXPR(v->IsUint32()); \
} while (0)
namespace v8tests {
@@ -115,6 +127,7 @@ static void perform_number_test(const FunctionCallbackInfo<Value> &info,
Local<Number> v8_number = Number::New(isolate, number);
LOG_EXPR(v8_number->Value());
LOG_MAYBE(v8_number->Uint32Value(isolate->GetCurrentContext()));
LOG_VALUE_KIND(v8_number);
return ok(info);
@@ -125,7 +138,9 @@ void test_v8_number_int(const FunctionCallbackInfo<Value> &info) {
}
void test_v8_number_large_int(const FunctionCallbackInfo<Value> &info) {
// 2^33
// 2^31 (should fit as uint32 but not as int32)
perform_number_test(info, 2147483648.0);
// 2^33 (should not fit as any 32-bit integer)
perform_number_test(info, 8589934592.0);
}
@@ -133,6 +148,28 @@ void test_v8_number_fraction(const FunctionCallbackInfo<Value> &info) {
perform_number_test(info, 2.5);
}
void test_v8_value_uint32value(const FunctionCallbackInfo<Value> &info) {
Isolate *isolate = info.GetIsolate();
Local<Context> context = isolate->GetCurrentContext();
Local<Value> vals[] = {
String::NewFromUtf8(isolate, "53").ToLocalChecked(),
Boolean::New(isolate, true),
Number::New(isolate, -1.5),
Number::New(isolate, 8589934593.9),
};
for (int i = 0; i < 4; i++) {
Maybe<uint32_t> maybe_u32 = vals[i]->Uint32Value(context);
LOG_MAYBE(maybe_u32);
}
}
void call_uint32value_on_arg_from_js(const FunctionCallbackInfo<Value> &info) {
Isolate *isolate = info.GetIsolate();
Local<Context> context = isolate->GetCurrentContext();
LOG_MAYBE(info[0]->Uint32Value(context));
}
static void perform_string_test(const FunctionCallbackInfo<Value> &info,
Local<String> v8_string) {
Isolate *isolate = info.GetIsolate();
@@ -271,12 +308,7 @@ void test_v8_object(const FunctionCallbackInfo<Value> &info) {
Local<Object> obj = Object::New(isolate);
auto key = String::NewFromUtf8(isolate, "key").ToLocalChecked();
auto val = Number::New(isolate, 5.0);
Maybe<bool> set_status = obj->Set(context, key, val);
LOG_EXPR(set_status.IsJust());
LOG_EXPR(set_status.FromJust());
// Local<Value> retval = obj->Get(context, key).ToLocalChecked();
// LOG_EXPR(describe(isolate, retval));
LOG_MAYBE(obj->Set(context, key, val));
return ok(info);
}
@@ -288,11 +320,7 @@ void set_field_from_js(const FunctionCallbackInfo<Value> &info) {
Local<Object> obj = info[0].As<Object>();
Local<Value> key = info[1];
Local<Number> value = Number::New(isolate, 321.0);
Maybe<bool> ret = obj->Set(context, key, value);
LOG_EXPR(ret.IsJust());
if (ret.IsJust()) {
LOG_EXPR(ret.ToChecked());
}
LOG_MAYBE(obj->Set(context, key, value));
return ok(info);
}
@@ -702,6 +730,10 @@ void initialize(Local<Object> exports, Local<Value> module,
NODE_SET_METHOD(exports, "test_v8_number_large_int",
test_v8_number_large_int);
NODE_SET_METHOD(exports, "test_v8_number_fraction", test_v8_number_fraction);
NODE_SET_METHOD(exports, "test_v8_value_uint32value",
test_v8_value_uint32value);
NODE_SET_METHOD(exports, "call_uint32value_on_arg_from_js",
call_uint32value_on_arg_from_js);
NODE_SET_METHOD(exports, "test_v8_string_ascii", test_v8_string_ascii);
NODE_SET_METHOD(exports, "test_v8_string_utf8", test_v8_string_utf8);
NODE_SET_METHOD(exports, "test_v8_string_invalid_utf8",

28
test/v8/v8-module/module.js
View File

@@ -26,6 +26,34 @@ module.exports = debugMode => {
return {
...nativeModule,
test_v8_value_uint32value_throw() {
// TODO(@190n) once Symbol and BigInt are supported in the V8 API, do this test in C++
try {
nativeModule.call_uint32value_on_arg_from_js(Symbol("20"));
console.log("Uint32Value() on Symbol did not throw");
} catch (e) {
console.log("threw", e.name);
}
try {
nativeModule.call_uint32value_on_arg_from_js(190n);
console.log("Uint32Value() on BigInt did not throw");
} catch (e) {
console.log("threw", e.name);
}
try {
nativeModule.call_uint32value_on_arg_from_js({
[Symbol.toPrimitive]() {
throw new RangeError("oops");
},
});
console.log("Uint32Value() on object with [Symbol.toPrimitive] that throws did not throw");
} catch (e) {
console.log("threw", e.toString());
}
},
test_v8_global() {
console.log("global initial value =", nativeModule.global_get());

11
test/v8/v8.test.ts
View File

@@ -135,6 +135,17 @@ describe("Number", () => {
});
});
describe("Value", () => {
describe("Uint32Value", () => {
it("coerces correctly", () => {
checkSameOutput("test_v8_value_uint32value", []);
});
it("throws in the right cases", () => {
checkSameOutput("test_v8_value_uint32value_throw", []);
});
});
});
describe("String", () => {
it("can create and read back strings with only ASCII characters", () => {
checkSameOutput("test_v8_string_ascii", []);