From 208ffdfd7f0b9c2d6eb98f2cd6df18e7c4f623f0 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Mon, 16 Sep 2024 20:42:08 -0700 Subject: [PATCH] remove ERR_INVALID_ARG_TYPE_static --- src/bun.js/api/js_brotli.zig | 6 +----- src/bun.js/bindings/ErrorCode.cpp | 10 ---------- src/bun.js/bindings/bindings.zig | 12 +----------- src/bun.js/javascript.zig | 6 +----- src/bun.js/node/node_cluster_binding.zig | 18 +++--------------- src/bun.js/node/node_fs.zig | 12 ++---------- 6 files changed, 8 insertions(+), 56 deletions(-) diff --git a/src/bun.js/api/js_brotli.zig b/src/bun.js/api/js_brotli.zig index 07bee73bda..20f7b7c7ad 100644 --- a/src/bun.js/api/js_brotli.zig +++ b/src/bun.js/api/js_brotli.zig @@ -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; } diff --git a/src/bun.js/bindings/ErrorCode.cpp b/src/bun.js/bindings/ErrorCode.cpp index a962c516df..1ef9c6b596 100644 --- a/src/bun.js/bindings/ErrorCode.cpp +++ b/src/bun.js/bindings/ErrorCode.cpp @@ -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)) { diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig index bbdc4a4fbc..0c3648b134 100644 --- a/src/bun.js/bindings/bindings.zig +++ b/src/bun.js/bindings/bindings.zig @@ -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. diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index 94c07d4d24..18013f2b97 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -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); diff --git a/src/bun.js/node/node_cluster_binding.zig b/src/bun.js/node/node_cluster_binding.zig index 61644da41d..c023847fef 100644 --- a/src/bun.js/node/node_cluster_binding.zig +++ b/src/bun.js/node/node_cluster_binding.zig @@ -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(); diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index c8468290fb..074eb23f98 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -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()));