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

remove ERR_INVALID_ARG_TYPE_static

Browse Source
This commit is contained in:
Meghan Denny
2024-09-16 20:42:08 -07:00
parent 3d68a9483f
commit 208ffdfd7f
6 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bun.js/api/js_brotli.zig
View File

@@ -105,11 +105,7 @@ pub const BrotliEncoder = struct {
if (params.hasOwnPropertyValue(globalThis, JSC.ZigString.static(std.fmt.comptimePrint("{d}", .{f.value})).toJS(globalThis))) {
const idx = params.getIndex(globalThis, f.value);
if (!idx.isNumber()) {
globalThis.throwValue(globalThis.ERR_INVALID_ARG_TYPE_static(
JSC.ZigString.static("options.params[key]"),
JSC.ZigString.static("number"),
idx,
));
_ = globalThis.throwInvalidPropertyTypeValue("options.params[key]", "number", idx);
this.deinit();
return .zero;
}

10
src/bun.js/bindings/ErrorCode.cpp
View File

@@ -62,7 +62,6 @@ static JSC::JSObject* createErrorPrototype(JSC::VM& vm, JSC::JSGlobalObject* glo
}
extern "C" JSC::EncodedJSValue Bun__ERR_INVALID_ARG_TYPE(JSC::JSGlobalObject* globalObject, JSC::EncodedJSValue val_arg_name, JSC::EncodedJSValue val_expected_type, JSC::EncodedJSValue val_actual_value);
extern "C" JSC::EncodedJSValue Bun__ERR_INVALID_ARG_TYPE_static(JSC::JSGlobalObject* globalObject, const ZigString* val_arg_name, const ZigString* val_expected_type, JSC::EncodedJSValue val_actual_value);
extern "C" JSC::EncodedJSValue Bun__ERR_MISSING_ARGS(JSC::JSGlobalObject* globalObject, JSC::EncodedJSValue arg1, JSC::EncodedJSValue arg2, JSC::EncodedJSValue arg3);
extern "C" JSC::EncodedJSValue Bun__ERR_MISSING_ARGS_static(JSC::JSGlobalObject* globalObject, const ZigString* arg1, const ZigString* arg2, const ZigString* arg3);
extern "C" JSC::EncodedJSValue Bun__ERR_IPC_CHANNEL_CLOSED(JSC::JSGlobalObject* globalObject);
@@ -335,15 +334,6 @@ extern "C" JSC::EncodedJSValue Bun__ERR_INVALID_ARG_TYPE(JSC::JSGlobalObject* gl
RETURN_IF_EXCEPTION(scope, {});
return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_INVALID_ARG_TYPE, message));
}
extern "C" JSC::EncodedJSValue Bun__ERR_INVALID_ARG_TYPE_static(JSC::JSGlobalObject* globalObject, const ZigString* val_arg_name, const ZigString* val_expected_type, JSC::EncodedJSValue val_actual_value)
{
JSC::VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
WTF::String message = Message::ERR_INVALID_ARG_TYPE(scope, globalObject, val_arg_name, val_expected_type, JSValue::decode(val_actual_value));
RETURN_IF_EXCEPTION(scope, {});
return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_INVALID_ARG_TYPE, message));
}
JSC_DEFINE_HOST_FUNCTION(jsFunction_ERR_OUT_OF_RANGE, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
{

12
src/bun.js/bindings/bindings.zig
View File

@@ -3367,22 +3367,12 @@ pub const JSGlobalObject = opaque {
(!opts.allowArray and value.isArray()) or
(!value.isObject() and (!opts.allowFunction or !value.isFunction())))
{
this.throwValue(this.ERR_INVALID_ARG_TYPE_static(
ZigString.static(arg_name),
ZigString.static("object"),
value,
));
_ = this.throwInvalidArgumentTypeValue(arg_name, "object", value);
return false;
}
return true;
}
extern fn Bun__ERR_INVALID_ARG_TYPE_static(*JSGlobalObject, *const ZigString, *const ZigString, JSValue) JSValue;
/// Caller asserts 'arg_name' and 'etype' are utf-8 literals.
pub fn ERR_INVALID_ARG_TYPE_static(this: *JSGlobalObject, arg_name: *const ZigString, etype: *const ZigString, atype: JSValue) JSValue {
return Bun__ERR_INVALID_ARG_TYPE_static(this, arg_name, etype, atype);
}
pub fn throwRangeError(this: *JSGlobalObject, value: anytype, options: bun.fmt.OutOfRangeOptions) void {
// This works around a Zig compiler bug
// when using this.ERR_OUT_OF_RANGE.

6
src/bun.js/javascript.zig
View File

@@ -477,11 +477,7 @@ pub export fn Bun__Process__send(
return globalObject.throwValueRet(globalObject.ERR_MISSING_ARGS_static(ZigString.static("message"), null, null));
}
if (!message.isString() and !message.isObject() and !message.isNumber() and !message.isBoolean()) {
return globalObject.throwValueRet(globalObject.ERR_INVALID_ARG_TYPE_static(
ZigString.static("message"),
ZigString.static("string, object, number, or boolean"),
message,
));
return globalObject.throwInvalidArgumentTypeValue("message", "string, object, number, or boolean", message);
}
const good = ipc_instance.data.serializeAndSend(globalObject, message);

18
src/bun.js/node/node_cluster_binding.zig
View File

@@ -33,11 +33,7 @@ pub fn sendHelperChild(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFram
return .zero;
}
if (!message.isObject()) {
return globalThis.throwValueRet(globalThis.ERR_INVALID_ARG_TYPE_static(
ZigString.static("message"),
ZigString.static("object"),
message,
));
return globalThis.throwInvalidArgumentTypeValue("message", "object", message);
}
if (callback.isFunction()) {
child_singleton.callbacks.put(bun.default_allocator, child_singleton.seq, JSC.Strong.create(callback, globalThis)) catch bun.outOfMemory();
@@ -191,11 +187,7 @@ pub fn sendHelperPrimary(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFr
return globalThis.throwValueRet(globalThis.ERR_MISSING_ARGS_static(ZigString.static("message"), null, null));
}
if (!message.isObject()) {
return globalThis.throwValueRet(globalThis.ERR_INVALID_ARG_TYPE_static(
ZigString.static("message"),
ZigString.static("object"),
message,
));
return globalThis.throwInvalidArgumentTypeValue("message", "object", message);
}
if (callback.isFunction()) {
ipc_data.internal_msg_queue.callbacks.put(bun.default_allocator, ipc_data.internal_msg_queue.seq, JSC.Strong.create(callback, globalThis)) catch bun.outOfMemory();
@@ -267,11 +259,7 @@ pub fn setRef(globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSC.
return globalObject.throwValueRet(globalObject.ERR_MISSING_ARGS_1(ZigString.static("enabled").toJS(globalObject)));
}
if (!arguments[0].isBoolean()) {
return globalObject.throwValueRet(globalObject.ERR_INVALID_ARG_TYPE_static(
ZigString.static("enabled"),
ZigString.static("boolean"),
arguments[0],
));
return globalObject.throwInvalidArgumentTypeValue("enabled", "boolean", arguments[0]);
}
const enabled = arguments[0].toBoolean();

12
src/bun.js/node/node_fs.zig
View File

@@ -1638,11 +1638,7 @@ pub const Arguments = struct {
arguments.eat();
if (!uid_value.isNumber()) {
ctx.throwValue(ctx.ERR_INVALID_ARG_TYPE_static(
JSC.ZigString.static("uid"),
JSC.ZigString.static("number"),
uid_value,
));
_ = ctx.throwInvalidArgumentTypeValue("uid", "number", uid_value);
return null;
}
break :brk @as(uid_t, @intCast(uid_value.toInt32()));
@@ -1663,11 +1659,7 @@ pub const Arguments = struct {
arguments.eat();
if (!gid_value.isNumber()) {
ctx.throwValue(ctx.ERR_INVALID_ARG_TYPE_static(
JSC.ZigString.static("gid"),
JSC.ZigString.static("number"),
gid_value,
));
_ = ctx.throwInvalidArgumentTypeValue("gid", "number", gid_value);
return null;
}
break :brk @as(gid_t, @intCast(gid_value.toInt32()));