diff --git a/src/bake/BakeSourceProvider.cpp b/src/bake/BakeSourceProvider.cpp index 10e2175887..2722c22452 100644 --- a/src/bake/BakeSourceProvider.cpp +++ b/src/bake/BakeSourceProvider.cpp @@ -31,7 +31,7 @@ extern "C" JSC::EncodedJSValue BakeLoadInitialServerCode(GlobalObject* global, B )); JSC::JSValue fnValue = vm.interpreter.executeProgram(sourceCode, global, global); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); RELEASE_ASSERT(fnValue); @@ -64,7 +64,7 @@ extern "C" JSC::EncodedJSValue BakeLoadServerHmrPatch(GlobalObject* global, BunS )); JSC::JSValue result = vm.interpreter.executeProgram(sourceCode, global, global); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); RELEASE_ASSERT(result); return JSC::JSValue::encode(result); @@ -127,7 +127,7 @@ extern "C" JSC::EncodedJSValue BakeRegisterProductionChunk(JSC::JSGlobalObject* )); global->moduleLoader()->provideFetch(global, key, sourceCode); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return JSC::JSValue::encode(key); } diff --git a/src/bun.js/bindings/BunObject.cpp b/src/bun.js/bindings/BunObject.cpp index 85a3b2ad2a..9c52c9537b 100644 --- a/src/bun.js/bindings/BunObject.cpp +++ b/src/bun.js/bindings/BunObject.cpp @@ -571,7 +571,7 @@ JSC_DEFINE_HOST_FUNCTION(functionPathToFileURL, (JSC::JSGlobalObject * lexicalGl { WTF::String pathString = pathValue.toWTFString(lexicalGlobalObject); - RETURN_IF_EXCEPTION(throwScope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(throwScope, {}); pathString = pathResolveWTFString(lexicalGlobalObject, pathString); auto fileURL = WTF::URL::fileURLWithFileSystemPath(pathString); diff --git a/src/bun.js/bindings/BunPlugin.cpp b/src/bun.js/bindings/BunPlugin.cpp index de64d26307..34fdbdad12 100644 --- a/src/bun.js/bindings/BunPlugin.cpp +++ b/src/bun.js/bindings/BunPlugin.cpp @@ -735,7 +735,7 @@ EncodedJSValue BunPlugin::OnLoad::run(JSC::JSGlobalObject* globalObject, BunStri if (!result.isObject()) { JSC::throwTypeError(globalObject, scope, "onLoad() expects an object returned"_s); - return JSValue::encode({}); + return {}; } RELEASE_AND_RETURN(scope, JSValue::encode(result)); @@ -810,7 +810,7 @@ EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, BunS switch (promise->status(vm)) { case JSPromise::Status::Pending: { JSC::throwTypeError(globalObject, scope, "onResolve() doesn't support pending promises yet"_s); - return JSValue::encode({}); + return {}; } case JSPromise::Status::Rejected: { promise->internalField(JSC::JSPromise::Field::Flags).set(vm, promise, jsNumber(static_cast(JSC::JSPromise::Status::Fulfilled))); @@ -826,7 +826,7 @@ EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, BunS if (!result.isObject()) { JSC::throwTypeError(globalObject, scope, "onResolve() expects an object returned"_s); - return JSValue::encode({}); + return {}; } RELEASE_AND_RETURN(scope, JSValue::encode(result)); diff --git a/src/bun.js/bindings/BunProcess.cpp b/src/bun.js/bindings/BunProcess.cpp index 5e4214207e..2d815ac1a3 100644 --- a/src/bun.js/bindings/BunProcess.cpp +++ b/src/bun.js/bindings/BunProcess.cpp @@ -186,45 +186,26 @@ static JSValue constructVersions(VM& vm, JSObject* processObject) JSC::JSObject* object = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 24); RETURN_IF_EXCEPTION(scope, {}); - object->putDirect(vm, JSC::Identifier::fromString(vm, "node"_s), - JSC::JSValue(JSC::jsOwnedString(vm, makeAtomString(ASCIILiteral::fromLiteralUnsafe(REPORTED_NODEJS_VERSION))))); - object->putDirect( - vm, JSC::Identifier::fromString(vm, "bun"_s), - JSC::JSValue(JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(Bun__version)).substring(1)))); - object->putDirect(vm, JSC::Identifier::fromString(vm, "boringssl"_s), - JSC::JSValue(JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(Bun__versions_boringssl)))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "openssl"_s), - // https://github.com/oven-sh/bun/issues/7921 - // BoringSSL is a fork of OpenSSL 1.1.0, so we can report OpenSSL 1.1.0 - JSC::JSValue(JSC::jsOwnedString(vm, String("1.1.0"_s)))); - object->putDirect(vm, JSC::Identifier::fromString(vm, "libarchive"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_libarchive))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "mimalloc"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_mimalloc))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "picohttpparser"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_picohttpparser))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "uwebsockets"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_uws))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "webkit"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(BUN_WEBKIT_VERSION))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "zig"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zig))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "zlib"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zlib))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "tinycc"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_tinycc))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "lolhtml"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_lolhtml))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "ares"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_c_ares))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "libdeflate"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_libdeflate))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "usockets"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_usockets))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "lshpack"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_lshpack))), 0); - object->putDirect(vm, JSC::Identifier::fromString(vm, "zstd"_s), - JSC::JSValue(JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zstd))), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "node"_s), JSC::jsOwnedString(vm, makeAtomString(ASCIILiteral::fromLiteralUnsafe(REPORTED_NODEJS_VERSION)))); + object->putDirect(vm, JSC::Identifier::fromString(vm, "bun"_s), JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(Bun__version)).substring(1))); + object->putDirect(vm, JSC::Identifier::fromString(vm, "boringssl"_s), JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(Bun__versions_boringssl))), 0); + // https://github.com/oven-sh/bun/issues/7921 + // BoringSSL is a fork of OpenSSL 1.1.0, so we can report OpenSSL 1.1.0 + object->putDirect(vm, JSC::Identifier::fromString(vm, "openssl"_s), JSC::jsOwnedString(vm, String("1.1.0"_s))); + object->putDirect(vm, JSC::Identifier::fromString(vm, "libarchive"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_libarchive)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "mimalloc"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_mimalloc)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "picohttpparser"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_picohttpparser)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "uwebsockets"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_uws)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "webkit"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(BUN_WEBKIT_VERSION)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "zig"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zig)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "zlib"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zlib)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "tinycc"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_tinycc)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "lolhtml"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_lolhtml)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "ares"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_c_ares)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "libdeflate"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_libdeflate)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "usockets"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_usockets)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "lshpack"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_lshpack)), 0); + object->putDirect(vm, JSC::Identifier::fromString(vm, "zstd"_s), JSC::jsOwnedString(vm, ASCIILiteral::fromLiteralUnsafe(Bun__versions_zstd)), 0); object->putDirect(vm, JSC::Identifier::fromString(vm, "v8"_s), JSValue(JSC::jsOwnedString(vm, String("12.4.254.14-node.12"_s))), 0); #if OS(WINDOWS) object->putDirect(vm, JSC::Identifier::fromString(vm, "uv"_s), JSValue(JSC::jsOwnedString(vm, String::fromLatin1(uv_version_string()))), 0); @@ -238,8 +219,7 @@ static JSValue constructVersions(VM& vm, JSObject* processObject) #define STRINGIFY_IMPL(x) #x #define STRINGIFY(x) STRINGIFY_IMPL(x) - object->putDirect(vm, JSC::Identifier::fromString(vm, "modules"_s), - JSC::JSValue(JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(STRINGIFY(REPORTED_NODEJS_ABI_VERSION)))))); + object->putDirect(vm, JSC::Identifier::fromString(vm, "modules"_s), JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(STRINGIFY(REPORTED_NODEJS_ABI_VERSION))))); #undef STRINGIFY #undef STRINGIFY_IMPL diff --git a/src/bun.js/bindings/CallSitePrototype.cpp b/src/bun.js/bindings/CallSitePrototype.cpp index b94b106043..a12be1bcae 100644 --- a/src/bun.js/bindings/CallSitePrototype.cpp +++ b/src/bun.js/bindings/CallSitePrototype.cpp @@ -251,7 +251,7 @@ JSC_DEFINE_HOST_FUNCTION(callSiteProtoFuncToString, (JSGlobalObject * globalObje ENTER_PROTO_FUNC(); WTF::StringBuilder sb; callSite->formatAsString(vm, globalObject, sb); - return JSC::JSValue::encode(JSC::JSValue(jsString(vm, sb.toString()))); + return JSC::JSValue::encode(jsString(vm, sb.toString())); } JSC_DEFINE_HOST_FUNCTION(callSiteProtoFuncToJSON, (JSGlobalObject * globalObject, JSC::CallFrame* callFrame)) diff --git a/src/bun.js/bindings/ErrorCode.cpp b/src/bun.js/bindings/ErrorCode.cpp index 8ff06a5e73..423929922a 100644 --- a/src/bun.js/bindings/ErrorCode.cpp +++ b/src/bun.js/bindings/ErrorCode.cpp @@ -1519,7 +1519,7 @@ extern "C" JSC::EncodedJSValue Bun__wrapAbortError(JSC::JSGlobalObject* lexicalG auto cause = JSC::JSValue::decode(causeParam); if (cause.isUndefined()) { - return JSC::JSValue::encode(Bun::createError(vm, globalObject, Bun::ErrorCode::ABORT_ERR, JSC::JSValue(globalObject->commonStrings().OperationWasAbortedString(globalObject)))); + return JSC::JSValue::encode(Bun::createError(vm, globalObject, Bun::ErrorCode::ABORT_ERR, globalObject->commonStrings().OperationWasAbortedString(globalObject))); } auto message = globalObject->commonStrings().OperationWasAbortedString(globalObject); diff --git a/src/bun.js/bindings/JSBuffer.cpp b/src/bun.js/bindings/JSBuffer.cpp index b50ec9e2f5..4d0fd7e6b1 100644 --- a/src/bun.js/bindings/JSBuffer.cpp +++ b/src/bun.js/bindings/JSBuffer.cpp @@ -913,7 +913,7 @@ static JSC::EncodedJSValue jsBufferConstructorFunction_concatBody(JSC::JSGlobalO head += length; } - RELEASE_AND_RETURN(throwScope, JSC::JSValue::encode(JSC::JSValue(outBuffer))); + RELEASE_AND_RETURN(throwScope, JSC::JSValue::encode(outBuffer)); } // https://github.com/nodejs/node/blob/v22.9.0/lib/buffer.js#L337 @@ -1747,7 +1747,7 @@ JSC::EncodedJSValue jsBufferToStringFromBytes(JSGlobalObject* lexicalGlobalObjec RETURN_IF_EXCEPTION(scope, {}); if (!buffer) [[unlikely]] { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } memcpy(buffer->vector(), bytes.data(), bytes.size()); return JSC::JSValue::encode(buffer); @@ -1757,7 +1757,7 @@ JSC::EncodedJSValue jsBufferToStringFromBytes(JSGlobalObject* lexicalGlobalObjec auto str = String::tryCreateUninitialized(bytes.size(), data); if (str.isNull()) [[unlikely]] { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } memcpy(data.data(), bytes.data(), bytes.size()); @@ -1773,7 +1773,7 @@ JSC::EncodedJSValue jsBufferToStringFromBytes(JSGlobalObject* lexicalGlobalObjec auto str = String::tryCreateUninitialized(u16length, data); if (str.isNull()) [[unlikely]] { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } memcpy(reinterpret_cast(data.data()), bytes.data(), u16length * 2); return JSValue::encode(jsString(vm, WTFMove(str))); @@ -1783,7 +1783,7 @@ JSC::EncodedJSValue jsBufferToStringFromBytes(JSGlobalObject* lexicalGlobalObjec auto str = String::tryCreateUninitialized(bytes.size(), data); if (str.isNull()) [[unlikely]] { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } Bun__encoding__writeLatin1(bytes.data(), bytes.size(), data.data(), data.size(), static_cast(encoding)); return JSValue::encode(jsString(vm, WTFMove(str))); @@ -1794,12 +1794,12 @@ JSC::EncodedJSValue jsBufferToStringFromBytes(JSGlobalObject* lexicalGlobalObjec case WebCore::BufferEncodingType::base64url: case WebCore::BufferEncodingType::hex: { EncodedJSValue res = Bun__encoding__toString(bytes.data(), bytes.size(), lexicalGlobalObject, static_cast(encoding)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue stringValue = JSValue::decode(res); if (!stringValue.isString()) [[unlikely]] { scope.throwException(lexicalGlobalObject, stringValue); - return JSValue::encode({}); + return {}; } RELEASE_AND_RETURN(scope, JSValue::encode(stringValue)); diff --git a/src/bun.js/bindings/JSBufferList.h b/src/bun.js/bindings/JSBufferList.h index b9a0d63377..635312f270 100644 --- a/src/bun.js/bindings/JSBufferList.h +++ b/src/bun.js/bindings/JSBufferList.h @@ -92,7 +92,7 @@ public: { if (length() == 0) [[unlikely]] return JSC::jsUndefined(); - return JSC::JSValue(m_deque.first().get()); + return m_deque.first().get(); } JSC::JSValue concat(JSC::VM&, JSC::JSGlobalObject*, size_t); diff --git a/src/bun.js/bindings/JSBunRequest.cpp b/src/bun.js/bindings/JSBunRequest.cpp index 5209f1a953..2cefe94f33 100644 --- a/src/bun.js/bindings/JSBunRequest.cpp +++ b/src/bun.js/bindings/JSBunRequest.cpp @@ -278,7 +278,7 @@ extern "C" EncodedJSValue Bun__getParamsIfBunRequest(JSC::EncodedJSValue thisVal return JSValue::encode(params); } - return JSValue::encode({}); + return {}; } } // namespace Bun diff --git a/src/bun.js/bindings/JSCommonJSExtensions.cpp b/src/bun.js/bindings/JSCommonJSExtensions.cpp index 34b0056ac4..4999c8bb8a 100644 --- a/src/bun.js/bindings/JSCommonJSExtensions.cpp +++ b/src/bun.js/bindings/JSCommonJSExtensions.cpp @@ -241,12 +241,12 @@ JSC::EncodedJSValue builtinLoader(JSC::JSGlobalObject* globalObject, JSC::CallFr JSC::JSObject* modValue = callFrame->argument(0).getObject(); if (!modValue) { throwTypeError(globalObject, scope, "Module._extensions['.js'] must be called with a CommonJS module object"_s); - return JSC::JSValue::encode({}); + return {}; } Bun::JSCommonJSModule* mod = jsDynamicCast(modValue); if (!mod) { throwTypeError(globalObject, scope, "Module._extensions['.js'] must be called with a CommonJS module object"_s); - return JSC::JSValue::encode({}); + return {}; } JSC::JSValue specifier = callFrame->argument(1); WTF::String specifierWtfString = specifier.toWTFString(globalObject); @@ -283,7 +283,7 @@ JSC::EncodedJSValue builtinLoader(JSC::JSGlobalObject* globalObject, JSC::CallFr JSC::profiledCall(global, JSC::ProfilingReason::API, requireESM, callData, mod, args, returnedException); if (returnedException) [[unlikely]] { throwException(globalObject, scope, returnedException->value()); - return JSC::JSValue::encode({}); + return {}; } } diff --git a/src/bun.js/bindings/JSMockFunction.cpp b/src/bun.js/bindings/JSMockFunction.cpp index d10befc1ba..08ef2a604b 100644 --- a/src/bun.js/bindings/JSMockFunction.cpp +++ b/src/bun.js/bindings/JSMockFunction.cpp @@ -1016,7 +1016,7 @@ extern "C" JSC::EncodedJSValue JSMockFunction__getCalls(EncodedJSValue encodedVa return JSValue::encode(mock->getCalls()); } - return JSValue::encode({}); + return {}; } extern "C" JSC::EncodedJSValue JSMockFunction__getReturns(EncodedJSValue encodedValue) { @@ -1025,7 +1025,7 @@ extern "C" JSC::EncodedJSValue JSMockFunction__getReturns(EncodedJSValue encoded return JSValue::encode(mock->getReturnValues()); } - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(jsMockFunctionGetMockName, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callframe)) diff --git a/src/bun.js/bindings/JSStringDecoder.cpp b/src/bun.js/bindings/JSStringDecoder.cpp index cbf4a712ec..0212dd4a32 100644 --- a/src/bun.js/bindings/JSStringDecoder.cpp +++ b/src/bun.js/bindings/JSStringDecoder.cpp @@ -457,7 +457,7 @@ JSC_DEFINE_HOST_FUNCTION(jsStringDecoderPrototypeFunction_write, { auto scope = DECLARE_THROW_SCOPE(globalObject->vm()); JSStringDecoder* castedThis = jsStringDecoderCast(globalObject, callFrame->thisValue(), "write"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return jsStringDecoderPrototypeFunction_writeBody(globalObject, callFrame, castedThis); } JSC_DEFINE_HOST_FUNCTION(jsStringDecoderPrototypeFunction_end, @@ -465,7 +465,7 @@ JSC_DEFINE_HOST_FUNCTION(jsStringDecoderPrototypeFunction_end, { auto scope = DECLARE_THROW_SCOPE(globalObject->vm()); JSStringDecoder* castedThis = jsStringDecoderCast(globalObject, callFrame->thisValue(), "end"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return jsStringDecoderPrototypeFunction_endBody(globalObject, callFrame, castedThis); } JSC_DEFINE_HOST_FUNCTION(jsStringDecoderPrototypeFunction_text, @@ -473,7 +473,7 @@ JSC_DEFINE_HOST_FUNCTION(jsStringDecoderPrototypeFunction_text, { auto scope = DECLARE_THROW_SCOPE(globalObject->vm()); JSStringDecoder* castedThis = jsStringDecoderCast(globalObject, callFrame->thisValue(), "text"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return jsStringDecoderPrototypeFunction_textBody(globalObject, callFrame, castedThis); } @@ -482,7 +482,7 @@ static JSC_DEFINE_CUSTOM_GETTER(jsStringDecoder_lastChar, (JSGlobalObject * lexi auto& vm = JSC::getVM(lexicalGlobalObject); auto scope = DECLARE_THROW_SCOPE(vm); JSStringDecoder* castedThis = jsStringDecoderCast(lexicalGlobalObject, JSC::JSValue::decode(thisValue), "lastChar"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto buffer = ArrayBuffer::create({ castedThis->m_lastChar, 4 }); auto* globalObject = reinterpret_cast(lexicalGlobalObject); JSC::JSUint8Array* uint8Array = JSC::JSUint8Array::create(lexicalGlobalObject, globalObject->JSBufferSubclassStructure(), WTFMove(buffer), 0, 4); @@ -493,7 +493,7 @@ static JSC_DEFINE_CUSTOM_GETTER(jsStringDecoder_lastNeed, (JSGlobalObject * lexi auto& vm = JSC::getVM(lexicalGlobalObject); auto scope = DECLARE_THROW_SCOPE(vm); JSStringDecoder* castedThis = jsStringDecoderCast(lexicalGlobalObject, JSC::JSValue::decode(thisValue), "lastNeed"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); RELEASE_AND_RETURN(scope, JSC::JSValue::encode(JSC::jsNumber(castedThis->m_lastNeed))); } static JSC_DEFINE_CUSTOM_GETTER(jsStringDecoder_lastTotal, (JSGlobalObject * lexicalGlobalObject, JSC::EncodedJSValue thisValue, PropertyName attributeName)) @@ -501,7 +501,7 @@ static JSC_DEFINE_CUSTOM_GETTER(jsStringDecoder_lastTotal, (JSGlobalObject * lex auto& vm = JSC::getVM(lexicalGlobalObject); auto scope = DECLARE_THROW_SCOPE(vm); JSStringDecoder* castedThis = jsStringDecoderCast(lexicalGlobalObject, JSC::JSValue::decode(thisValue), "lastTotal"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); RELEASE_AND_RETURN(scope, JSC::JSValue::encode(JSC::jsNumber(castedThis->m_lastTotal))); } @@ -510,7 +510,7 @@ static JSC_DEFINE_CUSTOM_GETTER(jsStringDecoder_encoding, (JSGlobalObject * lexi auto& vm = JSC::getVM(lexicalGlobalObject); auto scope = DECLARE_THROW_SCOPE(vm); JSStringDecoder* castedThis = jsStringDecoderCast(lexicalGlobalObject, JSC::JSValue::decode(thisValue), "encoding"_s); - RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return JSC::JSValue::encode(WebCore::convertEnumerationToJS(*lexicalGlobalObject, castedThis->m_encoding)); } diff --git a/src/bun.js/bindings/JSWrappingFunction.cpp b/src/bun.js/bindings/JSWrappingFunction.cpp index 9e33f11c35..d86804128f 100644 --- a/src/bun.js/bindings/JSWrappingFunction.cpp +++ b/src/bun.js/bindings/JSWrappingFunction.cpp @@ -82,7 +82,7 @@ extern "C" JSC::EncodedJSValue Bun__JSWrappingFunction__getWrappedFunction( JSC::JSFunction* wrappedFn = thisObject->m_wrappedFn.get(); return JSC::JSValue::encode(wrappedFn); } - return JSC::JSValue::encode({}); + return {}; } } diff --git a/src/bun.js/bindings/ModuleLoader.cpp b/src/bun.js/bindings/ModuleLoader.cpp index b3a71c7a6a..e383c4327b 100644 --- a/src/bun.js/bindings/ModuleLoader.cpp +++ b/src/bun.js/bindings/ModuleLoader.cpp @@ -1029,7 +1029,7 @@ static JSValue fetchESMSourceCode( else if (res->result.value.tag == SyntheticModuleType::ExportsObject) { JSC::JSValue value = JSC::JSValue::decode(res->result.value.jsvalue_for_export); if (!value) { - return reject(JSC::JSValue(JSC::createSyntaxError(globalObject, "Failed to parse Object"_s))); + return reject(JSC::createSyntaxError(globalObject, "Failed to parse Object"_s)); } // JSON can become strings, null, numbers, booleans so we must handle "export default 123" @@ -1044,7 +1044,7 @@ static JSValue fetchESMSourceCode( } else if (res->result.value.tag == SyntheticModuleType::ExportDefaultObject) { JSC::JSValue value = JSC::JSValue::decode(res->result.value.jsvalue_for_export); if (!value) { - return reject(JSC::JSValue(JSC::createSyntaxError(globalObject, "Failed to parse Object"_s))); + return reject(JSC::createSyntaxError(globalObject, "Failed to parse Object"_s)); } // JSON can become strings, null, numbers, booleans so we must handle "export default 123" diff --git a/src/bun.js/bindings/NodeHTTP.cpp b/src/bun.js/bindings/NodeHTTP.cpp index 7e0108f168..d2a57e19cf 100644 --- a/src/bun.js/bindings/NodeHTTP.cpp +++ b/src/bun.js/bindings/NodeHTTP.cpp @@ -826,7 +826,7 @@ static EncodedJSValue assignHeadersFromUWebSockets(uWS::HttpRequest* request, JS auto value = String::tryCreateUninitialized(pair.second.length(), data); if (value.isNull()) [[unlikely]] { throwOutOfMemoryError(globalObject, scope); - return JSValue::encode({}); + return {}; } if (pair.second.length() > 0) memcpy(data.data(), pair.second.data(), pair.second.length()); diff --git a/src/bun.js/bindings/NodeValidator.cpp b/src/bun.js/bindings/NodeValidator.cpp index 701d647d30..46bde7b9ca 100644 --- a/src/bun.js/bindings/NodeValidator.cpp +++ b/src/bun.js/bindings/NodeValidator.cpp @@ -640,7 +640,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunction_validateOneOf, (JSC::JSGlobalObject * global unsigned length = array->length(); for (size_t i = 0; i < length; i++) { JSValue element = array->getIndex(globalObject, i); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (JSC::sameValue(globalObject, value, element)) { return JSValue::encode(jsUndefined()); } @@ -661,7 +661,7 @@ JSC::EncodedJSValue V::validateOneOf(JSC::ThrowScope& scope, JSC::JSGlobalObject } JSC::JSString* valueStr = value.toString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto valueView = valueStr->view(globalObject); for (ASCIILiteral oneOfStr : oneOf) { diff --git a/src/bun.js/bindings/S3Error.cpp b/src/bun.js/bindings/S3Error.cpp index 0ce4d9d093..52d35f2511 100644 --- a/src/bun.js/bindings/S3Error.cpp +++ b/src/bun.js/bindings/S3Error.cpp @@ -38,10 +38,7 @@ SYSV_ABI JSC::EncodedJSValue S3Error__toErrorInstance(const S3Error* arg0, JSC::JSValue options = JSC::jsUndefined(); auto prototype = defaultGlobalObject(globalObject)->m_S3ErrorStructure.getInitializedOnMainThread(globalObject); JSC::JSObject* result = JSC::ErrorInstance::create(globalObject, prototype, message, options); - result->putDirect( - vm, vm.propertyNames->name, - JSC::JSValue(defaultGlobalObject(globalObject)->commonStrings().s3ErrorString(globalObject)), - JSC::PropertyAttribute::DontEnum | 0); + result->putDirect(vm, vm.propertyNames->name, defaultGlobalObject(globalObject)->commonStrings().s3ErrorString(globalObject), JSC::PropertyAttribute::DontEnum | 0); if (err.code.tag != BunStringTag::Empty) { JSC::JSValue code = Bun::toJS(globalObject, err.code); result->putDirect(vm, names.codePublicName(), code, @@ -57,7 +54,7 @@ SYSV_ABI JSC::EncodedJSValue S3Error__toErrorInstance(const S3Error* arg0, RETURN_IF_EXCEPTION(scope, {}); scope.release(); - return JSC::JSValue::encode(JSC::JSValue(result)); + return JSC::JSValue::encode(result); } } } diff --git a/src/bun.js/bindings/Strong.cpp b/src/bun.js/bindings/Strong.cpp index d60f52eb7c..d4ce228f4a 100644 --- a/src/bun.js/bindings/Strong.cpp +++ b/src/bun.js/bindings/Strong.cpp @@ -48,6 +48,6 @@ extern "C" void Bun__StrongRef__clear(JSC::JSValue* _Nonnull handleSlot) { // The write barrier must be called *before* the value is cleared // to correctly remove the handle from the strong list if it held a cell. - JSC::HandleSet::heapFor(handleSlot)->writeBarrier(handleSlot, JSC::JSValue()); - *handleSlot = JSC::JSValue(); + JSC::HandleSet::heapFor(handleSlot)->writeBarrier(handleSlot, {}); + *handleSlot = {}; } diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 615d9486de..38ea21cf49 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -3481,8 +3481,7 @@ JSC_DEFINE_CUSTOM_GETTER(getConsoleStdout, (JSGlobalObject * globalObject, Encod // instead of calling the constructor builtin, go through the process.stdout getter to ensure it's only created once. auto stdoutValue = global->processObject()->get(globalObject, Identifier::fromString(vm, "stdout"_s)); - if (!stdoutValue) - return JSValue::encode({}); + if (!stdoutValue) return {}; console->putDirect(vm, property, stdoutValue, PropertyAttribute::DontEnum | 0); return JSValue::encode(stdoutValue); @@ -3497,8 +3496,7 @@ JSC_DEFINE_CUSTOM_GETTER(getConsoleStderr, (JSGlobalObject * globalObject, Encod // instead of calling the constructor builtin, go through the process.stdout getter to ensure it's only created once. auto stderrValue = global->processObject()->get(globalObject, Identifier::fromString(vm, "stderr"_s)); - if (!stderrValue) - return JSValue::encode({}); + if (!stderrValue) return {}; console->putDirect(vm, property, stderrValue, PropertyAttribute::DontEnum | 0); return JSValue::encode(stderrValue); diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index 540c82d348..aa44127ddb 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -2187,7 +2187,7 @@ JSC::EncodedJSValue SystemError__toErrorInstance(const SystemError* arg0, JSC::J } if (err.fd >= 0) { - JSC::JSValue fd = JSC::JSValue(jsNumber(err.fd)); + JSC::JSValue fd = jsNumber(err.fd); result->putDirect(vm, names.fdPublicName(), fd, JSC::PropertyAttribute::DontDelete | 0); } @@ -2201,12 +2201,12 @@ JSC::EncodedJSValue SystemError__toErrorInstance(const SystemError* arg0, JSC::J result->putDirect(vm, names.hostnamePublicName(), hostname, JSC::PropertyAttribute::DontDelete | 0); } - result->putDirect(vm, names.errnoPublicName(), JSC::JSValue(err.errno_), JSC::PropertyAttribute::DontDelete | 0); + result->putDirect(vm, names.errnoPublicName(), jsNumber(err.errno_), JSC::PropertyAttribute::DontDelete | 0); RETURN_IF_EXCEPTION(scope, {}); scope.release(); - return JSC::JSValue::encode(JSC::JSValue(result)); + return JSC::JSValue::encode(result); } JSC::EncodedJSValue SystemError__toErrorInstanceWithInfoObject(const SystemError* arg0, JSC::JSGlobalObject* globalObject) @@ -2230,8 +2230,8 @@ JSC::EncodedJSValue SystemError__toErrorInstanceWithInfoObject(const SystemError auto clientData = WebCore::clientData(vm); - result->putDirect(vm, vm.propertyNames->name, JSC::JSValue(jsString(vm, String("SystemError"_s))), JSC::PropertyAttribute::DontEnum | 0); - result->putDirect(vm, clientData->builtinNames().codePublicName(), JSC::JSValue(jsString(vm, String("ERR_SYSTEM_ERROR"_s))), JSC::PropertyAttribute::DontEnum | 0); + result->putDirect(vm, vm.propertyNames->name, jsString(vm, String("SystemError"_s)), JSC::PropertyAttribute::DontEnum | 0); + result->putDirect(vm, clientData->builtinNames().codePublicName(), jsString(vm, String("ERR_SYSTEM_ERROR"_s)), JSC::PropertyAttribute::DontEnum | 0); info->putDirect(vm, clientData->builtinNames().codePublicName(), jsString(vm, codeString), JSC::PropertyAttribute::DontDelete | 0); @@ -2245,9 +2245,9 @@ JSC::EncodedJSValue SystemError__toErrorInstanceWithInfoObject(const SystemError info->putDirect(vm, vm.propertyNames->message, jsString(vm, messageString), JSC::PropertyAttribute::DontDelete | 0); info->putDirect(vm, clientData->builtinNames().errnoPublicName(), jsNumber(err.errno_), JSC::PropertyAttribute::DontDelete | 0); - result->putDirect(vm, clientData->builtinNames().errnoPublicName(), JSC::JSValue(err.errno_), JSC::PropertyAttribute::DontDelete | 0); + result->putDirect(vm, clientData->builtinNames().errnoPublicName(), jsNumber(err.errno_), JSC::PropertyAttribute::DontDelete | 0); - RELEASE_AND_RETURN(scope, JSC::JSValue::encode(JSC::JSValue(result))); + RELEASE_AND_RETURN(scope, JSC::JSValue::encode(result)); } JSC::EncodedJSValue @@ -2464,8 +2464,7 @@ JSC::JSPromise* JSC__JSValue__asPromise(JSC::EncodedJSValue JSValue0) JSC::EncodedJSValue JSC__JSValue__createInternalPromise(JSC::JSGlobalObject* globalObject) { auto& vm = JSC::getVM(globalObject); - return JSC::JSValue::encode( - JSC::JSValue(JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure()))); + return JSC::JSValue::encode(JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure())); } void JSC__JSFunction__optimizeSoon(JSC::EncodedJSValue JSValue0) @@ -2517,7 +2516,7 @@ CPP_DECL JSC::JSString* JSC__jsTypeStringForValue(JSC::JSGlobalObject* globalObj JSC::EncodedJSValue JSC__JSPromise__asValue(JSC::JSPromise* arg0, JSC::JSGlobalObject* arg1) { - JSValue value = JSC::JSValue(arg0); + JSValue value = arg0; ASSERT_WITH_MESSAGE(!value.isEmpty(), "JSPromise.asValue() called on a empty JSValue"); ASSERT_WITH_MESSAGE(value.inherits(), "JSPromise::asValue() called on a non-promise object"); return JSC::JSValue::encode(value); @@ -2678,7 +2677,7 @@ extern "C" JSC::EncodedJSValue Bun__JSValue__call(JSContextRef ctx, JSC::Encoded ASSERT(jsObject.isCallable()); ASSERT(callData.type != JSC::CallData::Type::None); if (callData.type == JSC::CallData::Type::None) - return JSC::JSValue::encode(JSC::JSValue()); + return {}; auto result = JSC::profiledCall(globalObject, ProfilingReason::API, jsObject, callData, jsThisObject, argList); @@ -2706,7 +2705,7 @@ JSC::EncodedJSValue JSObjectCallAsFunctionReturnValueHoldingAPILock(JSContextRef #endif if (!object) - return JSC::JSValue::encode(JSC::JSValue()); + return {}; JSC::JSObject* jsObject = toJS(object); JSC::JSObject* jsThisObject = toJS(thisObject); @@ -2720,13 +2719,13 @@ JSC::EncodedJSValue JSObjectCallAsFunctionReturnValueHoldingAPILock(JSContextRef auto callData = getCallData(jsObject); if (callData.type == JSC::CallData::Type::None) - return JSC::JSValue::encode(JSC::JSValue()); + return {}; NakedPtr returnedException = nullptr; auto result = call(globalObject, jsObject, callData, jsThisObject, argList, returnedException); if (returnedException.get()) { - return JSC::JSValue::encode(JSC::JSValue(returnedException.get())); + return JSC::JSValue::encode(returnedException.get()); } return JSC::JSValue::encode(result); @@ -3064,7 +3063,7 @@ JSC::EncodedJSValue JSC__JSGlobalObject__createAggregateError(JSC::JSGlobalObjec auto& vm = JSC::getVM(globalObject); auto scope = DECLARE_THROW_SCOPE(vm); - JSC::JSValue message = JSC::JSValue(JSC::jsOwnedString(vm, Zig::toString(*arg3))); + JSC::JSValue message = JSC::jsOwnedString(vm, Zig::toString(*arg3)); JSC::JSValue options = JSC::jsUndefined(); JSC::JSArray* array = nullptr; { @@ -3112,13 +3111,13 @@ JSC::EncodedJSValue ZigString__toAtomicValue(const ZigString* arg0, JSC::JSGloba } } - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString(arg1->vm(), makeAtomString(Zig::toStringCopy(*arg0))))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), makeAtomString(Zig::toStringCopy(*arg0)))); } JSC::EncodedJSValue ZigString__to16BitValue(const ZigString* arg0, JSC::JSGlobalObject* arg1) { auto str = WTF::String::fromUTF8(std::span { arg0->ptr, arg0->len }); - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString(arg1->vm(), str))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), str)); } JSC::EncodedJSValue ZigString__toExternalU16(const uint16_t* arg0, size_t len, JSC::JSGlobalObject* global) @@ -3129,8 +3128,7 @@ JSC::EncodedJSValue ZigString__toExternalU16(const uint16_t* arg0, size_t len, J auto ref = String(ExternalStringImpl::create({ reinterpret_cast(arg0), len }, reinterpret_cast(const_cast(arg0)), free_global_string)); - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString( - global->vm(), WTFMove(ref)))); + return JSC::JSValue::encode(JSC::jsString(global->vm(), WTFMove(ref))); } // This must be a globally allocated string JSC::EncodedJSValue ZigString__toExternalValue(const ZigString* arg0, JSC::JSGlobalObject* arg1) @@ -3144,13 +3142,10 @@ JSC::EncodedJSValue ZigString__toExternalValue(const ZigString* arg0, JSC::JSGlo if (Zig::isTaggedUTF16Ptr(str.ptr)) { auto ref = String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, Zig::untagVoid(str.ptr), free_global_string)); - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString( - arg1->vm(), WTFMove(ref)))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), WTFMove(ref))); } else { auto ref = String(ExternalStringImpl::create({ Zig::untag(str.ptr), str.len }, Zig::untagVoid(str.ptr), free_global_string)); - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString( - arg1->vm(), - WTFMove(ref)))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), WTFMove(ref))); } } @@ -3161,7 +3156,7 @@ VirtualMachine* JSC__JSGlobalObject__bunVM(JSC::JSGlobalObject* arg0) JSC::EncodedJSValue ZigString__toValueGC(const ZigString* arg0, JSC::JSGlobalObject* arg1) { - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString(arg1->vm(), Zig::toStringCopy(*arg0)))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), Zig::toStringCopy(*arg0))); } void JSC__JSValue__toZigString(JSC::EncodedJSValue JSValue0, ZigString* arg1, JSC::JSGlobalObject* arg2) @@ -3198,13 +3193,9 @@ JSC::EncodedJSValue ZigString__external(const ZigString* arg0, JSC::JSGlobalObje ZigString str = *arg0; if (Zig::isTaggedUTF16Ptr(str.ptr)) { - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString( - arg1->vm(), - WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, arg2, ArgFn3))))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, arg2, ArgFn3)))); } else { - return JSC::JSValue::encode(JSC::JSValue(JSC::jsString( - arg1->vm(), - WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, arg2, ArgFn3))))); + return JSC::JSValue::encode(JSC::jsString(arg1->vm(), WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, arg2, ArgFn3)))); } } @@ -3214,13 +3205,9 @@ JSC::EncodedJSValue ZigString__toExternalValueWithCallback(const ZigString* arg0 ZigString str = *arg0; if (Zig::isTaggedUTF16Ptr(str.ptr)) { - return JSC::JSValue::encode(JSC::JSValue(JSC::jsOwnedString( - arg1->vm(), - WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, nullptr, ArgFn2))))); + return JSC::JSValue::encode(JSC::jsOwnedString(arg1->vm(), WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, nullptr, ArgFn2)))); } else { - return JSC::JSValue::encode(JSC::JSValue(JSC::jsOwnedString( - arg1->vm(), - WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, nullptr, ArgFn2))))); + return JSC::JSValue::encode(JSC::jsOwnedString(arg1->vm(), WTF::String(ExternalStringImpl::create({ reinterpret_cast(Zig::untag(str.ptr)), str.len }, nullptr, ArgFn2)))); } } @@ -3897,7 +3884,7 @@ uint8_t JSC__JSValue__asBigIntCompare(JSC::EncodedJSValue JSValue0, JSC::JSGloba JSC::EncodedJSValue JSC__JSValue__fromInt64NoTruncate(JSC::JSGlobalObject* globalObject, int64_t val) { - return JSC::JSValue::encode(JSC::JSValue(JSC::JSBigInt::createFrom(globalObject, val))); + return JSC::JSValue::encode(JSC::JSBigInt::createFrom(globalObject, val)); } JSC::EncodedJSValue JSC__JSValue__fromTimevalNoTruncate(JSC::JSGlobalObject* globalObject, int64_t nsec, int64_t sec) @@ -3929,7 +3916,7 @@ JSC::EncodedJSValue JSC__JSValue__bigIntSum(JSC::JSGlobalObject* globalObject, J JSC::EncodedJSValue JSC__JSValue__fromUInt64NoTruncate(JSC::JSGlobalObject* globalObject, uint64_t val) { - return JSC::JSValue::encode(JSC::JSValue(JSC::JSBigInt::createFrom(globalObject, val))); + return JSC::JSValue::encode(JSC::JSBigInt::createFrom(globalObject, val)); } uint64_t JSC__JSValue__toUInt64NoTruncate(JSC::EncodedJSValue val) @@ -4063,7 +4050,7 @@ extern "C" JSC::EncodedJSValue JSC__JSValue__getOwn(JSC::EncodedJSValue JSValue0 if (value.getOwnPropertySlot(globalObject, property, slot)) { RELEASE_AND_RETURN(scope, JSValue::encode(slot.getValue(globalObject, property))); } - RELEASE_AND_RETURN(scope, JSValue::encode({})); + RELEASE_AND_RETURN(scope, {}); } JSC::EncodedJSValue JSC__JSValue__getIfPropertyExistsFromPath(JSC::EncodedJSValue JSValue0, JSC::JSGlobalObject* globalObject, JSC::EncodedJSValue arg1) @@ -4122,7 +4109,7 @@ JSC::EncodedJSValue JSC__JSValue__getIfPropertyExistsFromPath(JSC::EncodedJSValu // nothing found. if (j == 0) { - return JSValue::encode({}); + return {}; } return JSValue::encode(currProp); @@ -4200,7 +4187,7 @@ JSC::EncodedJSValue JSC__JSValue__getIfPropertyExistsFromPath(JSC::EncodedJSValu return JSValue::encode(currProp); } - return JSValue::encode({}); + return {}; } void JSC__JSValue__getSymbolDescription(JSC::EncodedJSValue symbolValue_, JSC::JSGlobalObject* arg1, ZigString* arg2) @@ -5175,7 +5162,7 @@ JSC::EncodedJSValue JSC__JSValue__toError_(JSC::EncodedJSValue JSValue0) { JSC::JSValue value = JSC::JSValue::decode(JSValue0); if (value.isEmpty() || !value.isCell()) - return JSC::JSValue::encode({}); + return {}; JSC::JSCell* cell = value.asCell(); @@ -5192,7 +5179,7 @@ JSC::EncodedJSValue JSC__JSValue__toError_(JSC::EncodedJSValue JSValue0) } } - return JSC::JSValue::encode({}); + return {}; } void JSC__JSValue__toZigException(JSC::EncodedJSValue jsException, JSC::JSGlobalObject* global, ZigException* exception) @@ -5597,7 +5584,7 @@ extern "C" JSC::EncodedJSValue JSC__JSValue__fastGetOwn(JSC::EncodedJSValue JSVa return JSValue::encode(slot.getValue(globalObject, name)); } - return JSValue::encode({}); + return {}; } bool JSC__JSValue__toBoolean(JSC::EncodedJSValue JSValue0) @@ -6092,7 +6079,7 @@ extern "C" JSC::EncodedJSValue WebCore__AbortSignal__reasonIfAborted(WebCore::Ab return JSValue::encode(signal->jsReason(*globalObject)); } - return JSValue::encode({}); + return {}; } extern "C" bool WebCore__AbortSignal__aborted(WebCore::AbortSignal* arg0) @@ -6167,7 +6154,7 @@ extern "C" JSC::EncodedJSValue JSC__JSValue__getOwnByValue(JSC::EncodedJSValue v PropertySlot slot(object, PropertySlot::InternalMethodType::GetOwnProperty); if (property.getUInt32(index)) { if (!object->getOwnPropertySlotByIndex(object, globalObject, index, slot)) - return JSC::JSValue::encode({}); + return {}; RETURN_IF_EXCEPTION(scope, {}); @@ -6176,7 +6163,7 @@ extern "C" JSC::EncodedJSValue JSC__JSValue__getOwnByValue(JSC::EncodedJSValue v auto propertyName = property.toPropertyKey(globalObject); RETURN_IF_EXCEPTION(scope, {}); if (!object->getOwnNonIndexPropertySlot(vm, object->structure(), propertyName, slot)) - return JSC::JSValue::encode({}); + return {}; RETURN_IF_EXCEPTION(scope, {}); diff --git a/src/bun.js/bindings/helpers.h b/src/bun.js/bindings/helpers.h index b905bf0aa5..1e402c3123 100644 --- a/src/bun.js/bindings/helpers.h +++ b/src/bun.js/bindings/helpers.h @@ -321,13 +321,13 @@ static JSC::JSValue getErrorInstance(const ZigString* str, JSC::JSGlobalObject* WTF::String message = toString(*str); if (message.isNull() && str->len > 0) [[unlikely]] { // pending exception while creating an error. - return JSC::JSValue(); + return {}; } JSC::JSObject* result = JSC::createError(globalObject, message); JSC::EnsureStillAliveScope ensureAlive(result); - return JSC::JSValue(result); + return result; } static JSC::JSValue getTypeErrorInstance(const ZigString* str, JSC::JSGlobalObject* globalObject) @@ -335,7 +335,7 @@ static JSC::JSValue getTypeErrorInstance(const ZigString* str, JSC::JSGlobalObje JSC::JSObject* result = JSC::createTypeError(globalObject, toStringCopy(*str)); JSC::EnsureStillAliveScope ensureAlive(result); - return JSC::JSValue(result); + return result; } static JSC::JSValue getSyntaxErrorInstance(const ZigString* str, JSC::JSGlobalObject* globalObject) @@ -343,7 +343,7 @@ static JSC::JSValue getSyntaxErrorInstance(const ZigString* str, JSC::JSGlobalOb JSC::JSObject* result = JSC::createSyntaxError(globalObject, toStringCopy(*str)); JSC::EnsureStillAliveScope ensureAlive(result); - return JSC::JSValue(result); + return result; } static JSC::JSValue getRangeErrorInstance(const ZigString* str, JSC::JSGlobalObject* globalObject) @@ -351,7 +351,7 @@ static JSC::JSValue getRangeErrorInstance(const ZigString* str, JSC::JSGlobalObj JSC::JSObject* result = JSC::createRangeError(globalObject, toStringCopy(*str)); JSC::EnsureStillAliveScope ensureAlive(result); - return JSC::JSValue(result); + return result; } static const JSC::Identifier toIdentifier(ZigString str, JSC::JSGlobalObject* global) diff --git a/src/bun.js/bindings/napi.h b/src/bun.js/bindings/napi.h index 038e16ccc5..16a3a715c8 100644 --- a/src/bun.js/bindings/napi.h +++ b/src/bun.js/bindings/napi.h @@ -392,11 +392,11 @@ public: case WeakTypeTag::Primitive: return m_value.primitive; case WeakTypeTag::Cell: - return JSC::JSValue(m_value.cell.get()); + return m_value.cell.get(); case WeakTypeTag::String: - return JSC::JSValue(m_value.string.get()); + return m_value.string.get(); default: - return JSC::JSValue(); + return {}; } } diff --git a/src/bun.js/bindings/node/crypto/CryptoDhJob.cpp b/src/bun.js/bindings/node/crypto/CryptoDhJob.cpp index bf529e76d5..11ea6c6ce5 100644 --- a/src/bun.js/bindings/node/crypto/CryptoDhJob.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoDhJob.cpp @@ -138,18 +138,18 @@ JSC_DEFINE_HOST_FUNCTION(jsDiffieHellman, (JSGlobalObject * lexicalGlobalObject, JSValue optionsValue = callFrame->argument(0); V::validateObject(scope, lexicalGlobalObject, optionsValue, "options"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSObject* options = optionsValue.getObject(); JSValue callbackValue = callFrame->argument(1); if (!callbackValue.isUndefined()) { V::validateFunction(scope, lexicalGlobalObject, callbackValue, "callback"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } std::optional ctx = DhJobCtx::fromJS(lexicalGlobalObject, scope, options); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!callbackValue.isUndefined()) { DhJob::createAndSchedule(lexicalGlobalObject, WTFMove(*ctx), callbackValue); diff --git a/src/bun.js/bindings/node/crypto/CryptoGenKeyPair.cpp b/src/bun.js/bindings/node/crypto/CryptoGenKeyPair.cpp index f681752337..95dea54c75 100644 --- a/src/bun.js/bindings/node/crypto/CryptoGenKeyPair.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoGenKeyPair.cpp @@ -128,42 +128,42 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKeyPair, (JSC::JSGlobalObject * globalObject, } V::validateFunction(scope, globalObject, callbackValue, "callback"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); V::validateString(scope, globalObject, typeValue, "type"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); KeyEncodingConfig config = parseKeyEncodingConfig(globalObject, scope, typeValue, optionsValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!optionsValue.isUndefined()) { V::validateObject(scope, globalObject, optionsValue, "options"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } JSString* typeString = typeValue.toString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); GCOwnedDataScope typeView = typeString->view(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (typeView == "rsa"_s || typeView == "rsa-pss"_s) { std::optional ctx = RsaKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); RsaKeyPairJob::createAndSchedule(globalObject, WTFMove(*ctx), callbackValue); return JSValue::encode(jsUndefined()); } if (typeView == "dsa"_s) { std::optional ctx = DsaKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); DsaKeyPairJob::createAndSchedule(globalObject, WTFMove(*ctx), callbackValue); return JSValue::encode(jsUndefined()); } if (typeView == "ec"_s) { std::optional ctx = EcKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); EcKeyPairJob::createAndSchedule(globalObject, WTFMove(*ctx), callbackValue); return JSValue::encode(jsUndefined()); } @@ -171,14 +171,14 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKeyPair, (JSC::JSGlobalObject * globalObject, if (typeView == "ed25519"_s || typeView == "ed448"_s || typeView == "x25519"_s || typeView == "x448"_s) { std::optional ctx = NidKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); NidKeyPairJob::createAndSchedule(globalObject, WTFMove(*ctx), callbackValue); return JSValue::encode(jsUndefined()); } if (typeView == "dh"_s) { std::optional ctx = DhKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); DhKeyPairJob::createAndSchedule(globalObject, WTFMove(*ctx), callbackValue); return JSValue::encode(jsUndefined()); } @@ -195,20 +195,20 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKeyPairSync, (JSGlobalObject * globalObject, JSValue optionsValue = callFrame->argument(1); V::validateString(scope, globalObject, typeValue, "type"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); KeyEncodingConfig config = parseKeyEncodingConfig(globalObject, scope, typeValue, optionsValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!optionsValue.isUndefined()) { V::validateObject(scope, globalObject, optionsValue, "options"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } JSString* typeString = typeValue.toString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); GCOwnedDataScope typeView = typeString->view(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSObject* result = JSC::constructEmptyObject(globalObject); JSValue publicKeyValue = jsUndefined(); @@ -217,99 +217,99 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKeyPairSync, (JSGlobalObject * globalObject, if (typeView == "rsa"_s || typeView == "rsa-pss"_s) { std::optional ctx = RsaKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ncrypto::EVPKeyCtxPointer keyCtx = ctx->setup(); if (!keyCtx) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } ctx->runTask(globalObject, keyCtx); if (!ctx->m_keyObj.data()) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } publicKeyValue = ctx->m_keyObj.exportPublic(globalObject, scope, ctx->m_publicKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); privateKeyValue = ctx->m_keyObj.exportPrivate(globalObject, scope, ctx->m_privateKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } else if (typeView == "dsa"_s) { auto ctx = DsaKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ncrypto::EVPKeyCtxPointer keyCtx = ctx->setup(); if (!keyCtx) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } ctx->runTask(globalObject, keyCtx); if (!ctx->m_keyObj.data()) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } publicKeyValue = ctx->m_keyObj.exportPublic(globalObject, scope, ctx->m_publicKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); privateKeyValue = ctx->m_keyObj.exportPrivate(globalObject, scope, ctx->m_privateKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } else if (typeView == "ec"_s) { auto ctx = EcKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ncrypto::EVPKeyCtxPointer keyCtx = ctx->setup(); if (!keyCtx) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } ctx->runTask(globalObject, keyCtx); if (!ctx->m_keyObj.data()) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } publicKeyValue = ctx->m_keyObj.exportPublic(globalObject, scope, ctx->m_publicKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); privateKeyValue = ctx->m_keyObj.exportPrivate(globalObject, scope, ctx->m_privateKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } else if (typeView == "ed25519"_s || typeView == "ed448"_s || typeView == "x25519"_s || typeView == "x448"_s) { auto ctx = NidKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ncrypto::EVPKeyCtxPointer keyCtx = ctx->setup(); if (!keyCtx) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } ctx->runTask(globalObject, keyCtx); if (!ctx->m_keyObj.data()) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } publicKeyValue = ctx->m_keyObj.exportPublic(globalObject, scope, ctx->m_publicKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); privateKeyValue = ctx->m_keyObj.exportPrivate(globalObject, scope, ctx->m_privateKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } else if (typeView == "dh"_s) { auto ctx = DhKeyPairJobCtx::fromJS(globalObject, scope, typeView, optionsValue, config); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ncrypto::EVPKeyCtxPointer keyCtx = ctx->setup(); if (!keyCtx) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } ctx->runTask(globalObject, keyCtx); if (!ctx->m_keyObj.data()) { throwCryptoError(globalObject, scope, ctx->err()); - return JSValue::encode({}); + return {}; } publicKeyValue = ctx->m_keyObj.exportPublic(globalObject, scope, ctx->m_publicKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); privateKeyValue = ctx->m_keyObj.exportPrivate(globalObject, scope, ctx->m_privateKeyEncoding); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } else { return ERR::INVALID_ARG_VALUE(scope, globalObject, "type"_s, typeValue, "must be a supported key type"_s); } result->putDirect(vm, Identifier::fromString(vm, "publicKey"_s), publicKeyValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); result->putDirect(vm, Identifier::fromString(vm, "privateKey"_s), privateKeyValue); return JSValue::encode(result); } diff --git a/src/bun.js/bindings/node/crypto/CryptoHkdf.cpp b/src/bun.js/bindings/node/crypto/CryptoHkdf.cpp index c65aabcb9d..267eee4a17 100644 --- a/src/bun.js/bindings/node/crypto/CryptoHkdf.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoHkdf.cpp @@ -245,11 +245,11 @@ JSC_DEFINE_HOST_FUNCTION(jsHkdf, (JSGlobalObject * lexicalGlobalObject, JSC::Cal auto scope = DECLARE_THROW_SCOPE(vm); std::optional ctx = HkdfJobCtx::fromJS(lexicalGlobalObject, callFrame, scope, HkdfJobCtx::Mode::Async); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue callback = callFrame->argument(5); V::validateFunction(scope, lexicalGlobalObject, callback, "callback"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); HkdfJob::createAndSchedule(lexicalGlobalObject, WTFMove(ctx.value()), callback); @@ -262,7 +262,7 @@ JSC_DEFINE_HOST_FUNCTION(jsHkdfSync, (JSGlobalObject * lexicalGlobalObject, JSC: auto scope = DECLARE_THROW_SCOPE(vm); std::optional ctx = HkdfJobCtx::fromJS(lexicalGlobalObject, callFrame, scope, HkdfJobCtx::Mode::Sync); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ctx->runTask(lexicalGlobalObject); @@ -276,7 +276,7 @@ JSC_DEFINE_HOST_FUNCTION(jsHkdfSync, (JSGlobalObject * lexicalGlobalObject, JSC: RefPtr buf = JSC::ArrayBuffer::tryCreateUninitialized(result.size(), 1); if (!buf) { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } memcpy(buf->data(), result.data(), result.size()); diff --git a/src/bun.js/bindings/node/crypto/CryptoKeygen.cpp b/src/bun.js/bindings/node/crypto/CryptoKeygen.cpp index 3836f9141e..87b6243e13 100644 --- a/src/bun.js/bindings/node/crypto/CryptoKeygen.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoKeygen.cpp @@ -144,11 +144,11 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKey, (JSC::JSGlobalObject * lexicalGlobalObje } V::validateFunction(scope, lexicalGlobalObject, callbackValue, "callback"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); std::optional ctx = SecretKeyJobCtx::fromJS(lexicalGlobalObject, scope, typeValue, optionsValue); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); SecretKeyJob::createAndSchedule(lexicalGlobalObject, WTFMove(ctx.value()), callbackValue); @@ -165,7 +165,7 @@ JSC_DEFINE_HOST_FUNCTION(jsGenerateKeySync, (JSC::JSGlobalObject * lexicalGlobal std::optional ctx = SecretKeyJobCtx::fromJS(lexicalGlobalObject, scope, typeValue, optionsValue); ASSERT(ctx.has_value() == !scope.exception()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ctx->runTask(lexicalGlobalObject); diff --git a/src/bun.js/bindings/node/crypto/CryptoKeys.cpp b/src/bun.js/bindings/node/crypto/CryptoKeys.cpp index 8b90e6b89e..799954e7c7 100644 --- a/src/bun.js/bindings/node/crypto/CryptoKeys.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoKeys.cpp @@ -20,7 +20,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCreateSecretKey, (JSC::JSGlobalObject * lexicalGlobal JSValue encodingValue = callFrame->argument(1); KeyObject keyObject = KeyObject::prepareSecretKey(lexicalGlobalObject, scope, keyValue, encodingValue, true); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); Structure* structure = globalObject->m_JSSecretKeyObjectClassStructure.get(lexicalGlobalObject); JSSecretKeyObject* secretKey = JSSecretKeyObject::create(vm, structure, lexicalGlobalObject, WTFMove(keyObject)); @@ -37,7 +37,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCreatePublicKey, (JSC::JSGlobalObject * lexicalGlobal JSValue keyValue = callFrame->argument(0); auto prepareResult = KeyObject::prepareAsymmetricKey(lexicalGlobalObject, scope, keyValue, KeyObject::PrepareAsymmetricKeyMode::CreatePublic); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); KeyObject keyObject; diff --git a/src/bun.js/bindings/node/crypto/CryptoPrimes.cpp b/src/bun.js/bindings/node/crypto/CryptoPrimes.cpp index 7422f6eea7..3d226f8887 100644 --- a/src/bun.js/bindings/node/crypto/CryptoPrimes.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoPrimes.cpp @@ -107,7 +107,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCheckPrimeSync, (JSC::JSGlobalObject * lexicalGlobalO ncrypto::BignumPointer candidate = ncrypto::BignumPointer(candidateView->data(), candidateView->size()); if (!candidate) { throwCryptoError(lexicalGlobalObject, scope, ERR_get_error(), "BignumPointer"_s); - return JSValue::encode({}); + return {}; } auto res = candidate.isPrime(checks, [](int32_t a, int32_t b) -> bool { @@ -126,11 +126,11 @@ JSC_DEFINE_HOST_FUNCTION(jsCheckPrime, (JSC::JSGlobalObject * lexicalGlobalObjec JSValue candidateValue = callFrame->argument(0); if (candidateValue.isBigInt()) { candidateValue = unsignedBigIntToBuffer(lexicalGlobalObject, scope, candidateValue, "candidate"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } auto candidateView = getArrayBufferOrView2(lexicalGlobalObject, scope, candidateValue, "candidate"_s, jsUndefined()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue optionsValue = callFrame->argument(1); JSValue callback = callFrame->argument(2); @@ -140,29 +140,29 @@ JSC_DEFINE_HOST_FUNCTION(jsCheckPrime, (JSC::JSGlobalObject * lexicalGlobalObjec } V::validateFunction(scope, lexicalGlobalObject, callback, "callback"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!optionsValue.isUndefined()) { V::validateObject(scope, lexicalGlobalObject, optionsValue, "options"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } int32_t checks = 0; if (optionsValue.isObject()) { JSObject* options = optionsValue.getObject(); JSValue checksValue = options->get(lexicalGlobalObject, Identifier::fromString(vm, "checks"_s)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!checksValue.isUndefined()) { V::validateInt32(scope, lexicalGlobalObject, checksValue, "options.checks"_s, jsNumber(0), jsUndefined(), &checks); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } } ncrypto::BignumPointer candidate = ncrypto::BignumPointer(candidateView->data(), candidateView->size()); if (!candidate) { throwCryptoError(lexicalGlobalObject, scope, ERR_get_error(), "BignumPointer"_s); - return JSValue::encode({}); + return {}; } CheckPrimeJob::createAndSchedule(lexicalGlobalObject, WTFMove(candidate), checks, callback); @@ -379,12 +379,12 @@ JSC_DEFINE_HOST_FUNCTION(jsGeneratePrime, (JSC::JSGlobalObject * lexicalGlobalOb if (add) { if (ncrypto::BignumPointer::GetBitCount(add.get()) > size) [[unlikely]] { throwError(lexicalGlobalObject, scope, ErrorCode::ERR_OUT_OF_RANGE, "invalid options.add"_s); - return JSValue::encode({}); + return {}; } if (rem && add <= rem) [[unlikely]] { throwError(lexicalGlobalObject, scope, ErrorCode::ERR_OUT_OF_RANGE, "invalid options.rem"_s); - return JSValue::encode({}); + return {}; } } @@ -480,12 +480,12 @@ JSC_DEFINE_HOST_FUNCTION(jsGeneratePrimeSync, (JSC::JSGlobalObject * lexicalGlob if (add) { if (ncrypto::BignumPointer::GetBitCount(add.get()) > size) [[unlikely]] { throwError(lexicalGlobalObject, scope, ErrorCode::ERR_OUT_OF_RANGE, "invalid options.add"_s); - return JSValue::encode({}); + return {}; } if (rem && add <= rem) [[unlikely]] { throwError(lexicalGlobalObject, scope, ErrorCode::ERR_OUT_OF_RANGE, "invalid options.rem"_s); - return JSValue::encode({}); + return {}; } } diff --git a/src/bun.js/bindings/node/crypto/CryptoSignJob.cpp b/src/bun.js/bindings/node/crypto/CryptoSignJob.cpp index 0cce1bb73e..d614116f7e 100644 --- a/src/bun.js/bindings/node/crypto/CryptoSignJob.cpp +++ b/src/bun.js/bindings/node/crypto/CryptoSignJob.cpp @@ -32,7 +32,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyOneShot, (JSGlobalObject * lexicalGlobalObject, if (!ctx->m_verifyResult) { throwCryptoError(lexicalGlobalObject, scope, ctx->m_opensslError, "verify operation failed"_s); - return JSValue::encode({}); + return {}; } return JSValue::encode(jsBoolean(*ctx->m_verifyResult)); @@ -60,7 +60,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignOneShot, (JSGlobalObject * lexicalGlobalObject, C if (!ctx->m_signResult) { throwCryptoError(lexicalGlobalObject, scope, ctx->m_opensslError, "sign operation failed"_s); - return JSValue::encode({}); + return {}; } auto& result = ctx->m_signResult.value(); diff --git a/src/bun.js/bindings/node/crypto/JSCipherConstructor.cpp b/src/bun.js/bindings/node/crypto/JSCipherConstructor.cpp index d9a60647b1..9c8fe5d21c 100644 --- a/src/bun.js/bindings/node/crypto/JSCipherConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSCipherConstructor.cpp @@ -98,7 +98,7 @@ JSC_DEFINE_HOST_FUNCTION(constructCipher, (JSC::JSGlobalObject * globalObject, J JSValue isDecipherValue = callFrame->argument(0); ASSERT(isDecipherValue.isBoolean()); CipherKind cipherKind = isDecipherValue.toBoolean(globalObject) ? CipherKind::Decipher : CipherKind::Cipher; - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue cipherValue = callFrame->argument(1); JSValue keyValue = callFrame->argument(2); @@ -106,37 +106,37 @@ JSC_DEFINE_HOST_FUNCTION(constructCipher, (JSC::JSGlobalObject * globalObject, J JSValue optionsValue = callFrame->argument(4); V::validateString(scope, globalObject, cipherValue, "cipher"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue encodingValue = jsUndefined(); if (optionsValue.pureToBoolean() != TriState::False) { encodingValue = optionsValue.get(globalObject, Identifier::fromString(vm, "encoding"_s)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (encodingValue.isUndefinedOrNull()) { encodingValue = jsUndefined(); } else { V::validateString(scope, globalObject, encodingValue, "options.encoding"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } } KeyObject keyObject = KeyObject::prepareSecretKey(globalObject, scope, keyValue, encodingValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto keyData = keyObject.symmetricKey().span(); JSArrayBufferView* ivView = nullptr; if (!ivValue.isNull()) { ivView = getArrayBufferOrView(globalObject, scope, ivValue, "iv"_s, jsUndefined()); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } std::optional authTagLength = std::nullopt; if (optionsValue.pureToBoolean() != TriState::False) { JSValue authTagLengthValue = optionsValue.get(globalObject, Identifier::fromString(vm, "authTagLength"_s)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!authTagLengthValue.isUndefinedOrNull()) { std::optional maybeAuthTagLength = authTagLengthValue.tryGetAsInt32(); @@ -149,7 +149,7 @@ JSC_DEFINE_HOST_FUNCTION(constructCipher, (JSC::JSGlobalObject * globalObject, J } WTF::String cipherString = cipherValue.toWTFString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (keyData.size() > INT_MAX) [[unlikely]] { return ERR::OUT_OF_RANGE(scope, globalObject, "key is too big"_s, 0, INT_MAX, jsNumber(keyData.size())); @@ -197,13 +197,13 @@ JSC_DEFINE_HOST_FUNCTION(constructCipher, (JSC::JSGlobalObject * globalObject, J const bool encrypt = cipherKind == CipherKind::Cipher; if (!ctx.init(cipher, encrypt)) { throwCryptoError(globalObject, scope, ERR_get_error(), "Failed to initialize cipher"_s); - return JSValue::encode({}); + return {}; } int32_t maxMessageSize = 0; if (cipher.isSupportedAuthenticatedMode()) { initAuthenticated(globalObject, scope, ctx, cipherString, cipherKind, ivLen, authTagLength, maxMessageSize); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } if (!ctx.setKeyLength(keyData.size())) { diff --git a/src/bun.js/bindings/node/crypto/JSCipherPrototype.cpp b/src/bun.js/bindings/node/crypto/JSCipherPrototype.cpp index 9ce33a4847..1fbf84289c 100644 --- a/src/bun.js/bindings/node/crypto/JSCipherPrototype.cpp +++ b/src/bun.js/bindings/node/crypto/JSCipherPrototype.cpp @@ -50,7 +50,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*lexicalGlobalObject, scope, "Cipher"_s, "update"_s); - return JSValue::encode({}); + return {}; } JSValue dataValue = callFrame->argument(0); @@ -60,7 +60,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj WTF::String encodingString = WTF::nullString(); JSArrayBufferView* dataView = getArrayBufferOrView(lexicalGlobalObject, scope, dataValue, "data"_s, encodingValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); MarkPopErrorOnReturn popError; @@ -70,7 +70,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj if (!cipher->m_ctx) { throwCryptoError(lexicalGlobalObject, scope, popError.peekError(), "Trying to add data in unsupported state"); - return JSValue::encode({}); + return {}; } if (cipher->m_ctx.isCcmMode() && !cipher->checkCCMMessageLength(dataView->byteLength())) { @@ -86,7 +86,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj const int32_t blockSize = cipher->m_ctx.getBlockSize(); if (dataView->byteLength() + blockSize > INT_MAX) { throwCryptoError(lexicalGlobalObject, scope, popError.peekError(), "Trying to add data in unsupported state"); - return JSValue::encode({}); + return {}; } int32_t bufLen = dataView->byteLength() + blockSize; @@ -97,13 +97,13 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj if (cipher->m_kind == CipherKind::Cipher && cipher->m_ctx.isWrapMode() && !cipher->m_ctx.update(buf, nullptr, &bufLen)) { throwCryptoError(lexicalGlobalObject, scope, popError.peekError(), "Trying to add data in unsupported state"); - return JSValue::encode({}); + return {}; } RefPtr outBuf = JSC::ArrayBuffer::tryCreateUninitialized(bufLen, 1); if (!outBuf) { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } buf = { @@ -121,7 +121,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherUpdate, (JSC::JSGlobalObject * lexicalGlobalObj if (res != 1) { throwCryptoError(lexicalGlobalObject, scope, popError.peekError(), "Trying to add data in unsupported state"); - return JSValue::encode({}); + return {}; } return JSValue::encode(JSUint8Array::create(lexicalGlobalObject, globalObject->JSBufferSubclassStructure(), WTFMove(outBuf), 0, bufLen)); @@ -138,7 +138,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherFinal, (JSC::JSGlobalObject * lexicalGlobalObje JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*lexicalGlobalObject, scope, "Cipher"_s, "final"_s); - return JSValue::encode({}); + return {}; } if (!cipher->m_ctx) { @@ -155,7 +155,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherFinal, (JSC::JSGlobalObject * lexicalGlobalObje RefPtr outBuf = ArrayBuffer::tryCreateUninitialized(outLen, 1); if (!outBuf) { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } if (cipher->m_kind == CipherKind::Decipher && Cipher::FromCtx(cipher->m_ctx).isSupportedAuthenticatedMode()) { @@ -164,7 +164,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherFinal, (JSC::JSGlobalObject * lexicalGlobalObje if (cipher->m_kind == CipherKind::Decipher && cipher->m_ctx.isChaCha20Poly1305() && cipher->m_authTagState != AuthTagState::AuthTagPassedToOpenSSL) { throwCryptoErrorWithAuth(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } bool ok; @@ -189,7 +189,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherFinal, (JSC::JSGlobalObject * lexicalGlobalObje if (!ok) { throwCryptoErrorWithAuth(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } return JSValue::encode(JSUint8Array::create(lexicalGlobalObject, globalObject->JSBufferSubclassStructure(), WTFMove(outBuf), 0, outLen)); @@ -203,13 +203,13 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherSetAutoPadding, (JSC::JSGlobalObject * globalOb JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*globalObject, scope, "Cipher"_s, "setAutoPadding"_s); - return JSValue::encode({}); + return {}; } JSValue paddingValue = callFrame->argument(0); bool padding = paddingValue.toBoolean(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); MarkPopErrorOnReturn popError; if (!cipher->m_ctx.setPadding(padding)) { @@ -227,7 +227,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherGetAuthTag, (JSC::JSGlobalObject * lexicalGloba JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*lexicalGlobalObject, scope, "Cipher"_s, "getAuthTag"_s); - return JSValue::encode({}); + return {}; } if (cipher->m_ctx || cipher->m_kind != CipherKind::Cipher || !cipher->m_authTagLen) { @@ -239,7 +239,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherGetAuthTag, (JSC::JSGlobalObject * lexicalGloba JSC::JSUint8Array* buf = JSC::JSUint8Array::createUninitialized(lexicalGlobalObject, globalObject->JSBufferSubclassStructure(), *cipher->m_authTagLen); if (!buf) { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } memcpy(buf->vector(), cipher->m_authTag, *cipher->m_authTagLen); @@ -255,13 +255,13 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherSetAuthTag, (JSC::JSGlobalObject * globalObject JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*globalObject, scope, "Cipher"_s, "setAuthTag"_s); - return JSValue::encode({}); + return {}; } JSValue authTagValue = callFrame->argument(0); JSValue encodingValue = callFrame->argument(1); JSArrayBufferView* authTag = getArrayBufferOrView(globalObject, scope, authTagValue, "buffer"_s, encodingValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ASSERT(authTag); if (!cipher->m_ctx || !cipher->isAuthenticatedMode() || cipher->m_kind != CipherKind::Decipher || cipher->m_authTagState != AuthTagState::AuthTagUnknown) { @@ -311,7 +311,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherSetAAD, (JSC::JSGlobalObject * globalObject, JS JSCipher* cipher = jsDynamicCast(callFrame->thisValue()); if (!cipher) { throwThisTypeError(*globalObject, scope, "Cipher"_s, "setAAD"_s); - return JSValue::encode({}); + return {}; } JSValue aadbufValue = callFrame->argument(0); @@ -321,15 +321,15 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherSetAAD, (JSC::JSGlobalObject * globalObject, JS std::optional plaintextLength = std::nullopt; if (optionsValue.pureToBoolean() != TriState::False) { encodingValue = optionsValue.get(globalObject, Identifier::fromString(vm, "encoding"_s)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!encodingValue.isUndefinedOrNull()) { V::validateString(scope, globalObject, encodingValue, "options.encoding"_s); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); } JSValue plaintextLengthValue = optionsValue.get(globalObject, Identifier::fromString(vm, "plaintextLength"_s)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (!plaintextLengthValue.isUndefinedOrNull()) { std::optional maybePlaintextLength = plaintextLengthValue.tryGetAsInt32(); if (!maybePlaintextLength || *maybePlaintextLength < 0) { @@ -341,7 +341,7 @@ JSC_DEFINE_HOST_FUNCTION(jsCipherSetAAD, (JSC::JSGlobalObject * globalObject, JS } JSArrayBufferView* aadbuf = getArrayBufferOrView(globalObject, scope, aadbufValue, "aadbuf"_s, encodingValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); ASSERT(aadbuf); if (aadbuf->byteLength() > std::numeric_limits::max()) { diff --git a/src/bun.js/bindings/node/crypto/JSDiffieHellmanConstructor.cpp b/src/bun.js/bindings/node/crypto/JSDiffieHellmanConstructor.cpp index f388977278..7aef773fc4 100644 --- a/src/bun.js/bindings/node/crypto/JSDiffieHellmanConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSDiffieHellmanConstructor.cpp @@ -88,7 +88,7 @@ JSC_DEFINE_HOST_FUNCTION(constructDiffieHellman, (JSC::JSGlobalObject * globalOb if (bits < 2) { ERR_put_error(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_LARGE, __FILE__, __LINE__); throwCryptoError(globalObject, scope, ERR_get_error(), "Invalid prime length"_s); - return JSValue::encode({}); + return {}; } if (!generatorValue.isNumber()) { @@ -102,7 +102,7 @@ JSC_DEFINE_HOST_FUNCTION(constructDiffieHellman, (JSC::JSGlobalObject * globalOb if (generator < 2) { ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__); throwCryptoError(globalObject, scope, ERR_get_error(), "Invalid generator"_s); - return JSValue::encode({}); + return {}; } dh = ncrypto::DHPointer::New(bits, generator); @@ -132,7 +132,7 @@ JSC_DEFINE_HOST_FUNCTION(constructDiffieHellman, (JSC::JSGlobalObject * globalOb if (generator < 2) { ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__); throwCryptoError(globalObject, scope, ERR_get_error(), "Invalid generator"_s); - return JSValue::encode({}); + return {}; } bn_g = ncrypto::BignumPointer::New(); if (!bn_g.setWord(generator)) { @@ -155,7 +155,7 @@ JSC_DEFINE_HOST_FUNCTION(constructDiffieHellman, (JSC::JSGlobalObject * globalOb if (bn_g.getWord() < 2) { ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__); throwCryptoError(globalObject, scope, ERR_get_error(), "Invalid generator"_s); - return JSValue::encode({}); + return {}; } } diff --git a/src/bun.js/bindings/node/crypto/JSECDHConstructor.cpp b/src/bun.js/bindings/node/crypto/JSECDHConstructor.cpp index 45f835411a..3d2a8be7af 100644 --- a/src/bun.js/bindings/node/crypto/JSECDHConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSECDHConstructor.cpp @@ -125,7 +125,7 @@ JSC_DEFINE_HOST_FUNCTION(jsECDHConvertKey, (JSC::JSGlobalObject * lexicalGlobalO WTF::Vector buf; if (!buf.tryGrow(size)) { throwOutOfMemoryError(lexicalGlobalObject, scope); - return JSValue::encode({}); + return {}; } if (!EC_POINT_point2oct(group, point, form, buf.begin(), buf.size(), nullptr)) { diff --git a/src/bun.js/bindings/node/crypto/JSHash.cpp b/src/bun.js/bindings/node/crypto/JSHash.cpp index 98fc4f4542..b122398c0d 100644 --- a/src/bun.js/bindings/node/crypto/JSHash.cpp +++ b/src/bun.js/bindings/node/crypto/JSHash.cpp @@ -244,7 +244,7 @@ JSC_DEFINE_HOST_FUNCTION(jsHashProtoFuncDigest, (JSC::JSGlobalObject * lexicalGl auto totalDigestLen = ExternZigHash::digest(hash->m_zigHasher, globalObject, hash->m_digestBuffer.mutableSpan()); if (!totalDigestLen) { throwCryptoError(lexicalGlobalObject, scope, ERR_get_error(), "Failed to finalize digest"_s); - return JSValue::encode({}); + return {}; } hash->m_finalized = finalized; @@ -272,7 +272,7 @@ JSC_DEFINE_HOST_FUNCTION(jsHashProtoFuncDigest, (JSC::JSGlobalObject * lexicalGl auto data = hash->m_ctx.digestFinal(bufLen); if (!data) { throwCryptoError(lexicalGlobalObject, scope, ERR_get_error(), "Failed to finalize digest"_s); - return JSValue::encode({}); + return {}; } // Some hash algorithms don't support calling EVP_DigestFinal_ex more than once @@ -365,19 +365,19 @@ JSC_DEFINE_HOST_FUNCTION(constructHash, (JSC::JSGlobalObject * globalObject, JSC if (zigHasher) { if (!hash->initZig(globalObject, scope, zigHasher, xofLen)) { throwCryptoError(globalObject, scope, 0, "Digest method not supported"_s); - return JSValue::encode({}); + return {}; } return JSValue::encode(hash); } if (md == nullptr || !hash->init(globalObject, scope, md, xofLen)) { throwCryptoError(globalObject, scope, ERR_get_error(), "Digest method not supported"_s); - return JSValue::encode({}); + return {}; } if (original != nullptr && !original->m_ctx.copyTo(hash->m_ctx)) { throwCryptoError(globalObject, scope, ERR_get_error(), "Digest copy error"_s); - return JSValue::encode({}); + return {}; } return JSC::JSValue::encode(hash); diff --git a/src/bun.js/bindings/node/crypto/JSKeyObjectConstructor.cpp b/src/bun.js/bindings/node/crypto/JSKeyObjectConstructor.cpp index 47370b03ed..8f40f24945 100644 --- a/src/bun.js/bindings/node/crypto/JSKeyObjectConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSKeyObjectConstructor.cpp @@ -46,7 +46,7 @@ JSC_DEFINE_HOST_FUNCTION(callKeyObject, (JSC::JSGlobalObject * lexicalGlobalObje VM& vm = lexicalGlobalObject->vm(); ThrowScope scope = DECLARE_THROW_SCOPE(vm); throwTypeError(lexicalGlobalObject, scope, "Cannot call KeyObject class constructor without |new|"_s); - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(constructKeyObject, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::CallFrame* callFrame)) @@ -63,9 +63,9 @@ JSC_DEFINE_HOST_FUNCTION(constructKeyObject, (JSC::JSGlobalObject * lexicalGloba } JSString* typeString = typeValue.toString(lexicalGlobalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); GCOwnedDataScope typeView = typeString->view(lexicalGlobalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); if (typeView != "secret"_s && typeView != "public"_s && typeView != "private"_s) { return ERR::INVALID_ARG_VALUE(scope, lexicalGlobalObject, "type"_s, typeValue); @@ -95,7 +95,7 @@ JSC_DEFINE_HOST_FUNCTION(jsKeyObjectConstructor_from, (JSGlobalObject * lexicalG auto keyObjectResult = KeyObject::create(wrappedKey); if (keyObjectResult.hasException()) [[unlikely]] { WebCore::propagateException(*lexicalGlobalObject, scope, keyObjectResult.releaseException()); - return JSValue::encode({}); + return {}; } // 2. Determine Key Type and Extract Material diff --git a/src/bun.js/bindings/node/crypto/JSKeyObjectPrototype.cpp b/src/bun.js/bindings/node/crypto/JSKeyObjectPrototype.cpp index 79fa4aee24..e6b7140258 100644 --- a/src/bun.js/bindings/node/crypto/JSKeyObjectPrototype.cpp +++ b/src/bun.js/bindings/node/crypto/JSKeyObjectPrototype.cpp @@ -38,7 +38,7 @@ JSC_DEFINE_HOST_FUNCTION(jsKeyObjectPrototype_equals, (JSGlobalObject * globalOb JSKeyObject* thisObject = jsDynamicCast(callFrame->thisValue()); if (!thisObject) { throwThisTypeError(*globalObject, scope, "KeyObject"_s, "equals"_s); - return JSValue::encode({}); + return {}; } JSValue otherKeyObjectValue = callFrame->argument(0); diff --git a/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectConstructor.cpp b/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectConstructor.cpp index 820409fd8f..a0d69f850b 100644 --- a/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectConstructor.cpp @@ -24,7 +24,7 @@ JSC_DEFINE_HOST_FUNCTION(callPrivateKeyObject, (JSC::JSGlobalObject * lexicalGlo VM& vm = lexicalGlobalObject->vm(); ThrowScope scope = DECLARE_THROW_SCOPE(vm); throwConstructorCannotBeCalledAsFunctionTypeError(lexicalGlobalObject, scope, "PrivateKeyObject"_s); - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(constructPrivateKeyObject, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::CallFrame* callFrame)) diff --git a/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectPrototype.cpp b/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectPrototype.cpp index 412e4d7ec5..753bc6fc93 100644 --- a/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectPrototype.cpp +++ b/src/bun.js/bindings/node/crypto/JSPrivateKeyObjectPrototype.cpp @@ -96,7 +96,7 @@ JSC_DEFINE_HOST_FUNCTION(jsPrivateKeyObjectPrototype_asymmetricKeyDetails, (JSGl // JSPrivateKeyObject* privateKeyObject = jsDynamicCast(callFrame->thisValue()); // if (!privateKeyObject) { // throwThisTypeError(*globalObject, scope, "PrivateKeyObject"_s, "toCryptoKey"_s); -// return JSValue::encode({}); +// return {}; // } // KeyObject& handle = privateKeyObject->handle(); diff --git a/src/bun.js/bindings/node/crypto/JSPublicKeyObjectConstructor.cpp b/src/bun.js/bindings/node/crypto/JSPublicKeyObjectConstructor.cpp index fd9f52b531..161717efdf 100644 --- a/src/bun.js/bindings/node/crypto/JSPublicKeyObjectConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSPublicKeyObjectConstructor.cpp @@ -24,7 +24,7 @@ JSC_DEFINE_HOST_FUNCTION(callPublicKeyObject, (JSC::JSGlobalObject * lexicalGlob VM& vm = lexicalGlobalObject->vm(); ThrowScope scope = DECLARE_THROW_SCOPE(vm); throwConstructorCannotBeCalledAsFunctionTypeError(lexicalGlobalObject, scope, "PublicKeyObject"_s); - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(constructPublicKeyObject, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::CallFrame* callFrame)) diff --git a/src/bun.js/bindings/node/crypto/JSPublicKeyObjectPrototype.cpp b/src/bun.js/bindings/node/crypto/JSPublicKeyObjectPrototype.cpp index f21c272c7d..eda6e4f1e0 100644 --- a/src/bun.js/bindings/node/crypto/JSPublicKeyObjectPrototype.cpp +++ b/src/bun.js/bindings/node/crypto/JSPublicKeyObjectPrototype.cpp @@ -44,7 +44,7 @@ JSC_DEFINE_HOST_FUNCTION(jsPublicKeyObjectPrototype_export, (JSGlobalObject * gl JSPublicKeyObject* publicKeyObject = jsDynamicCast(callFrame->thisValue()); if (!publicKeyObject) { throwThisTypeError(*globalObject, scope, "PublicKeyObject"_s, "export"_s); - return JSValue::encode({}); + return {}; } KeyObject& handle = publicKeyObject->handle(); @@ -97,7 +97,7 @@ JSC_DEFINE_HOST_FUNCTION(jsPublicKeyObjectPrototype_asymmetricKeyDetails, (JSGlo // JSPublicKeyObject* publicKeyObject = jsDynamicCast(callFrame->thisValue()); // if (!publicKeyObject) { // throwThisTypeError(*globalObject, scope, "PublicKeyObject"_s, "toCryptoKey"_s); -// return JSValue::encode({}); +// return {}; // } // KeyObject& handle = publicKeyObject->handle(); diff --git a/src/bun.js/bindings/node/crypto/JSSecretKeyObjectConstructor.cpp b/src/bun.js/bindings/node/crypto/JSSecretKeyObjectConstructor.cpp index 6e5e5f2e37..3caa180da4 100644 --- a/src/bun.js/bindings/node/crypto/JSSecretKeyObjectConstructor.cpp +++ b/src/bun.js/bindings/node/crypto/JSSecretKeyObjectConstructor.cpp @@ -24,7 +24,7 @@ JSC_DEFINE_HOST_FUNCTION(callSecretKeyObject, (JSC::JSGlobalObject * lexicalGlob VM& vm = lexicalGlobalObject->vm(); ThrowScope scope = DECLARE_THROW_SCOPE(vm); throwConstructorCannotBeCalledAsFunctionTypeError(lexicalGlobalObject, scope, "SecretKeyObject"_s); - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(constructSecretKeyObject, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::CallFrame* callFrame)) diff --git a/src/bun.js/bindings/node/crypto/JSSecretKeyObjectPrototype.cpp b/src/bun.js/bindings/node/crypto/JSSecretKeyObjectPrototype.cpp index 222871d1fd..57dac4bf87 100644 --- a/src/bun.js/bindings/node/crypto/JSSecretKeyObjectPrototype.cpp +++ b/src/bun.js/bindings/node/crypto/JSSecretKeyObjectPrototype.cpp @@ -42,7 +42,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSecretKeyObjectExport, (JSGlobalObject * globalObject JSSecretKeyObject* secretKeyObject = jsDynamicCast(callFrame->thisValue()); if (!secretKeyObject) { throwThisTypeError(*globalObject, scope, "SecretKeyObject"_s, "export"_s); - return JSValue::encode({}); + return {}; } KeyObject& handle = secretKeyObject->handle(); @@ -70,7 +70,7 @@ JSC_DEFINE_CUSTOM_GETTER(jsSecretKeyObjectSymmetricKeySize, (JSGlobalObject*, JS // JSSecretKeyObject* secretKeyObject = jsDynamicCast(callFrame->thisValue()); // if (!secretKeyObject) { // throwThisTypeError(*globalObject, scope, "SecretKeyObject"_s, "toCryptoKey"_s); -// return JSValue::encode({}); +// return {}; // } // KeyObject& handle = secretKeyObject->handle(); diff --git a/src/bun.js/bindings/node/crypto/JSSign.cpp b/src/bun.js/bindings/node/crypto/JSSign.cpp index 9bbdab4eae..4f1a654351 100644 --- a/src/bun.js/bindings/node/crypto/JSSign.cpp +++ b/src/bun.js/bindings/node/crypto/JSSign.cpp @@ -233,7 +233,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncUpdate, (JSC::JSGlobalObject * globalObj JSSign* thisObject = jsDynamicCast(callFrame->thisValue()); if (!thisObject) [[unlikely]] { Bun::throwThisTypeError(*globalObject, scope, "Sign"_s, "update"_s); - return JSValue::encode({}); + return {}; } JSValue wrappedSign = callFrame->argument(0); @@ -241,7 +241,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncUpdate, (JSC::JSGlobalObject * globalObj // Check that we have at least 1 argument (the data) if (callFrame->argumentCount() < 2) { throwVMError(globalObject, scope, "Sign.prototype.update requires at least 1 argument"_s); - return JSValue::encode({}); + return {}; } // Get the data argument @@ -250,7 +250,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncUpdate, (JSC::JSGlobalObject * globalObj // if it's a string, using encoding for decode. if it's a buffer, just use the buffer if (data.isString()) { JSString* dataString = data.toString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue encodingValue = callFrame->argument(2); auto encoding = parseEnumeration(*globalObject, encodingValue).value_or(BufferEncodingType::utf8); @@ -264,12 +264,12 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncUpdate, (JSC::JSGlobalObject * globalObj RETURN_IF_EXCEPTION(scope, {}); JSValue buf = JSValue::decode(constructFromEncoding(globalObject, dataView, encoding)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto* view = jsDynamicCast(buf); updateWithBufferView(globalObject, thisObject, view); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return JSValue::encode(wrappedSign); } @@ -282,7 +282,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncUpdate, (JSC::JSGlobalObject * globalObj if (auto* view = JSC::jsDynamicCast(data)) { updateWithBufferView(globalObject, thisObject, view); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); return JSValue::encode(wrappedSign); } @@ -403,7 +403,7 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncSign, (JSC::JSGlobalObject * lexicalGlob JSValue options = callFrame->argument(0); bool optionsBool = options.toBoolean(lexicalGlobalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); // https://github.com/nodejs/node/blob/1b2d2f7e682268228b1352cba7389db01614812a/lib/internal/crypto/sig.js#L116 if (!optionsBool) { @@ -416,18 +416,18 @@ JSC_DEFINE_HOST_FUNCTION(jsSignProtoFuncSign, (JSC::JSGlobalObject * lexicalGlob JSValue outputEncodingValue = callFrame->argument(1); auto outputEncoding = parseEnumeration(*lexicalGlobalObject, outputEncodingValue).value_or(BufferEncodingType::buffer); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); // Get RSA padding mode and salt length if applicable int32_t padding = getPadding(lexicalGlobalObject, scope, options, {}); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); std::optional saltLen = getSaltLength(lexicalGlobalObject, scope, options); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); // Get DSA signature encoding format DSASigEnc dsaSigEnc = getDSASigEnc(lexicalGlobalObject, scope, options); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto prepareResult = KeyObject::preparePrivateKey(lexicalGlobalObject, scope, options); RETURN_IF_EXCEPTION(scope, {}); @@ -472,7 +472,7 @@ JSC_DEFINE_HOST_FUNCTION(callSign, (JSC::JSGlobalObject * globalObject, JSC::Cal JSC::VM& vm = globalObject->vm(); auto scope = DECLARE_THROW_SCOPE(vm); throwTypeError(globalObject, scope, "Sign constructor cannot be called as a function"_s); - return JSValue::encode({}); + return {}; } JSC_DEFINE_HOST_FUNCTION(constructSign, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame)) diff --git a/src/bun.js/bindings/node/crypto/JSVerify.cpp b/src/bun.js/bindings/node/crypto/JSVerify.cpp index a34eab4fca..d0d89d18c4 100644 --- a/src/bun.js/bindings/node/crypto/JSVerify.cpp +++ b/src/bun.js/bindings/node/crypto/JSVerify.cpp @@ -213,7 +213,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject JSVerify* thisObject = jsDynamicCast(callFrame->thisValue()); if (!thisObject) [[unlikely]] { Bun::throwThisTypeError(*globalObject, scope, "Verify"_s, "update"_s); - return JSValue::encode({}); + return {}; } JSValue wrappedVerify = callFrame->argument(0); @@ -221,7 +221,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject // Check that we have at least 1 argument (the data) if (callFrame->argumentCount() < 2) { throwVMError(globalObject, scope, "Verify.prototype.update requires at least 1 argument"_s); - return JSValue::encode({}); + return {}; } // Get the data argument @@ -230,7 +230,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject // if it's a string, using encoding for decode. if it's a buffer, just use the buffer if (data.isString()) { JSString* dataString = data.toString(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue encodingValue = callFrame->argument(2); auto encoding = parseEnumeration(*globalObject, encodingValue).value_or(BufferEncodingType::utf8); @@ -241,22 +241,22 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject } auto dataView = dataString->view(globalObject); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); JSValue buf = JSValue::decode(constructFromEncoding(globalObject, dataView, encoding)); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto* view = jsDynamicCast(buf); // Update the digest context with the buffer data if (view->isDetached()) { throwTypeError(globalObject, scope, "Buffer is detached"_s); - return JSValue::encode({}); + return {}; } size_t byteLength = view->byteLength(); if (byteLength > INT_MAX) { throwRangeError(globalObject, scope, "data is too long"_s); - return JSValue::encode({}); + return {}; } auto buffer = ncrypto::Buffer { @@ -266,7 +266,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject if (!thisObject->m_mdCtx.digestUpdate(buffer)) { throwCryptoError(globalObject, scope, ERR_get_error(), "Failed to update digest"); - return JSValue::encode({}); + return {}; } return JSValue::encode(wrappedVerify); @@ -280,13 +280,13 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject if (auto* view = JSC::jsDynamicCast(data)) { if (view->isDetached()) { throwTypeError(globalObject, scope, "Buffer is detached"_s); - return JSValue::encode({}); + return {}; } size_t byteLength = view->byteLength(); if (byteLength > INT_MAX) { throwRangeError(globalObject, scope, "data is too long"_s); - return JSValue::encode({}); + return {}; } auto buffer = ncrypto::Buffer { @@ -296,7 +296,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncUpdate, (JSGlobalObject * globalObject if (!thisObject->m_mdCtx.digestUpdate(buffer)) { throwCryptoError(globalObject, scope, ERR_get_error(), "Failed to update digest"); - return JSValue::encode({}); + return {}; } return JSValue::encode(wrappedVerify); @@ -316,13 +316,13 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncVerify, (JSGlobalObject * globalObject JSVerify* thisObject = jsDynamicCast(callFrame->thisValue()); if (!thisObject) [[unlikely]] { Bun::throwThisTypeError(*globalObject, scope, "Verify"_s, "verify"_s); - return JSValue::encode({}); + return {}; } // Check if the context is initialized if (!thisObject->m_mdCtx) { throwTypeError(globalObject, scope, "Verify.prototype.verify cannot be called before Verify.prototype.init"_s); - return JSValue::encode({}); + return {}; } // This function receives two arguments: options and signature @@ -331,7 +331,7 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncVerify, (JSGlobalObject * globalObject JSValue sigEncodingValue = callFrame->argument(2); JSC::JSArrayBufferView* signatureBuffer = getArrayBufferOrView(globalObject, scope, signatureValue, "signature"_s, sigEncodingValue); - RETURN_IF_EXCEPTION(scope, JSValue::encode({})); + RETURN_IF_EXCEPTION(scope, {}); auto prepareResult = KeyObject::preparePublicOrPrivateKey(globalObject, scope, options); RETURN_IF_EXCEPTION(scope, {}); @@ -371,35 +371,35 @@ JSC_DEFINE_HOST_FUNCTION(jsVerifyProtoFuncVerify, (JSGlobalObject * globalObject // Validate DSA parameters if (!keyPtr.validateDsaParameters()) { throwTypeError(globalObject, scope, "Invalid DSA parameters"_s); - return JSValue::encode({}); + return {}; } // Get the final digest auto data = mdCtx.digestFinal(mdCtx.getExpectedSize()); if (!data) { throwTypeError(globalObject, scope, "Failed to finalize digest"_s); - return JSValue::encode({}); + return {}; } // Create verification context auto pkctx = keyPtr.newCtx(); if (!pkctx || pkctx.initForVerify() <= 0) { throwCryptoError(globalObject, scope, ERR_peek_error(), "Failed to initialize verification context"_s); - return JSValue::encode({}); + return {}; } // Set RSA padding mode and salt length if applicable if (keyPtr.isRsaVariant()) { if (!ncrypto::EVPKeyCtxPointer::setRsaPadding(pkctx.get(), padding, saltLen)) { throwCryptoError(globalObject, scope, ERR_peek_error(), "Failed to set RSA padding"_s); - return JSValue::encode({}); + return {}; } } // Set signature MD from the digest context if (!pkctx.setSignatureMd(mdCtx)) { throwCryptoError(globalObject, scope, ERR_peek_error(), "Failed to set signature message digest"_s); - return JSValue::encode({}); + return {}; } // Handle P1363 format conversion for EC keys if needed diff --git a/src/bun.js/bindings/node/crypto/node_crypto_binding.cpp b/src/bun.js/bindings/node/crypto/node_crypto_binding.cpp index 0c5bd60dd4..f1a58b287c 100644 --- a/src/bun.js/bindings/node/crypto/node_crypto_binding.cpp +++ b/src/bun.js/bindings/node/crypto/node_crypto_binding.cpp @@ -123,7 +123,7 @@ JSC_DEFINE_HOST_FUNCTION(jsGetCiphers, (JSC::JSGlobalObject * lexicalGlobalObjec EVP_CIPHER_do_all_sorted(callback, &ctx); if (ctx.hasException) - return JSValue::encode({}); + return {}; return JSValue::encode(result); } diff --git a/src/bun.js/bindings/webcore/EventEmitter.cpp b/src/bun.js/bindings/webcore/EventEmitter.cpp index a34db09b4f..afdbedab4c 100644 --- a/src/bun.js/bindings/webcore/EventEmitter.cpp +++ b/src/bun.js/bindings/webcore/EventEmitter.cpp @@ -217,7 +217,7 @@ bool EventEmitter::innerInvokeEventListeners(const Identifier& eventType, Simple VM& vm = context.vm(); auto* thisObject = protectedThis->m_thisObject.get(); - JSC::JSValue thisValue = thisObject ? JSC::JSValue(thisObject) : JSC::jsUndefined(); + JSC::JSValue thisValue = thisObject ? thisObject : JSC::jsUndefined(); auto fired = false; for (auto& registeredListener : listeners) { diff --git a/src/bun.js/bindings/webcore/JSDOMCastThisValue.h b/src/bun.js/bindings/webcore/JSDOMCastThisValue.h index d7028c4b5a..142cad7818 100644 --- a/src/bun.js/bindings/webcore/JSDOMCastThisValue.h +++ b/src/bun.js/bindings/webcore/JSDOMCastThisValue.h @@ -46,7 +46,7 @@ JSClass* castThisValue(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSValue th { auto& vm = JSC::getVM(&lexicalGlobalObject); if constexpr (std::is_base_of_v) - return toJSDOMGlobalObject(vm, thisValue.isUndefinedOrNull() ? JSC::JSValue(&lexicalGlobalObject) : thisValue); + return toJSDOMGlobalObject(vm, thisValue.isUndefinedOrNull() ? &lexicalGlobalObject : thisValue); else return JSC::jsDynamicCast(thisValue); } diff --git a/src/bun.js/bindings/webcore/JSEventTargetCustom.h b/src/bun.js/bindings/webcore/JSEventTargetCustom.h index 4de018f6f8..e719800691 100644 --- a/src/bun.js/bindings/webcore/JSEventTargetCustom.h +++ b/src/bun.js/bindings/webcore/JSEventTargetCustom.h @@ -64,7 +64,7 @@ public: auto throwScope = DECLARE_THROW_SCOPE(vm); auto thisValue = callFrame.thisValue().toThis(&lexicalGlobalObject, JSC::ECMAMode::strict()); - auto thisObject = jsEventTargetCast(vm, thisValue.isUndefinedOrNull() ? JSC::JSValue(&lexicalGlobalObject) : thisValue); + auto thisObject = jsEventTargetCast(vm, thisValue.isUndefinedOrNull() ? &lexicalGlobalObject : thisValue); if (!thisObject) [[unlikely]] { return throwThisTypeError(lexicalGlobalObject, throwScope, "EventTarget", operationName); } diff --git a/src/bun.js/modules/NodeModuleModule.cpp b/src/bun.js/modules/NodeModuleModule.cpp index 20dce1e733..52cc334a54 100644 --- a/src/bun.js/modules/NodeModuleModule.cpp +++ b/src/bun.js/modules/NodeModuleModule.cpp @@ -252,13 +252,13 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModuleCreateRequire, ERR::INVALID_ARG_VALUE(scope, globalObject, "filename"_s, argument, "must be a file URL object, file URL string, or absolute path string"_s); - RELEASE_AND_RETURN(scope, JSValue::encode({})); + RELEASE_AND_RETURN(scope, {}); } if (!url.protocolIsFile()) { ERR::INVALID_ARG_VALUE(scope, globalObject, "filename"_s, argument, "must be a file URL object, file URL string, or absolute path string"_s); - RELEASE_AND_RETURN(scope, JSValue::encode({})); + RELEASE_AND_RETURN(scope, {}); } val = url.fileSystemPath(); }