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

Replace some Identifier::fromString usages with vm->propertyNames (#12575)

Browse Source
This commit is contained in:
Jarred Sumner
2024-07-15 16:15:56 -07:00
committed by GitHub
parent b9d2a03ffc
commit 8808af1c99
31 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bun.js/bindings/BunInjectedScriptHost.cpp
View File

@@ -33,7 +33,7 @@ JSValue BunInjectedScriptHost::subtype(JSGlobalObject* exec, JSValue value)
static JSObject* constructInternalProperty(VM& vm, JSGlobalObject* exec, const String& name, JSValue value)
{
auto* object = constructEmptyObject(exec);
object->putDirect(vm, Identifier::fromString(vm, "name"_s), jsString(vm, name));
object->putDirect(vm, vm.propertyNames->name, jsString(vm, name));
object->putDirect(vm, Identifier::fromString(vm, "value"_s), value);
return object;
}
@@ -41,7 +41,7 @@ static JSObject* constructInternalProperty(VM& vm, JSGlobalObject* exec, const S
static JSObject* constructInternalProperty(VM& vm, JSGlobalObject* exec, const Identifier& name, JSValue value)
{
auto* object = constructEmptyObject(exec);
object->putDirect(vm, Identifier::fromString(vm, "name"_s), JSC::identifierToJSValue(vm, name));
object->putDirect(vm, vm.propertyNames->name, JSC::identifierToJSValue(vm, name));
object->putDirect(vm, Identifier::fromString(vm, "value"_s), value);
return object;
}

4
src/bun.js/bindings/BunProcess.cpp
View File

@@ -205,7 +205,7 @@ static JSValue constructProcessReleaseObject(VM& vm, JSObject* processObject)
auto* release = JSC::constructEmptyObject(globalObject);
// SvelteKit compatibility hack
release->putDirect(vm, Identifier::fromString(vm, "name"_s), jsString(vm, WTF::String("node"_s)), 0);
release->putDirect(vm, vm.propertyNames->name, jsString(vm, WTF::String("node"_s)), 0);
release->putDirect(vm, Identifier::fromString(vm, "lts"_s), jsBoolean(false), 0);
release->putDirect(vm, Identifier::fromString(vm, "sourceUrl"_s), jsString(vm, WTF::String(std::span { Bun__githubURL, strlen(Bun__githubURL) })), 0);
@@ -1068,7 +1068,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_emitWarning, (JSGlobalObject * lexicalGlobalObj
return createError(globalObject, str);
})();
errorInstance->putDirect(vm, Identifier::fromString(vm, "name"_s), jsString(vm, String("warn"_s)), JSC::PropertyAttribute::DontEnum | 0);
errorInstance->putDirect(vm, vm.propertyNames->name, jsString(vm, String("warn"_s)), JSC::PropertyAttribute::DontEnum | 0);
auto ident = Identifier::fromString(vm, "warning"_s);
if (process->wrapped().hasEventListeners(ident)) {

4
src/bun.js/bindings/JSMockFunction.cpp
View File

@@ -711,14 +711,14 @@ extern Structure* createMockResultStructure(JSC::VM& vm, JSC::JSGlobalObject* gl
structure = structure->addPropertyTransition(
vm,
structure,
JSC::Identifier::fromString(vm, "type"_s),
vm.propertyNames->type,
0,
offset);
structure = structure->addPropertyTransition(
vm,
structure,
JSC::Identifier::fromString(vm, "value"_s),
vm.propertyNames->value,
0, offset);
return structure;
}

6
src/bun.js/bindings/KeyObject.cpp
View File

@@ -550,7 +550,7 @@ JSC_DEFINE_HOST_FUNCTION(KeyObject__createPrivateKey, (JSC::JSGlobalObject * glo
}
}
if (format == "der"_s) {
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(Identifier::fromString(vm, "type"_s)));
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(vm.propertyNames->type));
WTF::String type = "pkcs8"_s;
if (!typeJSValue.isUndefinedOrNull() && !typeJSValue.isEmpty()) {
if (!typeJSValue.isString()) {
@@ -1138,7 +1138,7 @@ JSC_DEFINE_HOST_FUNCTION(KeyObject__createPublicKey, (JSC::JSGlobalObject * glob
}
}
if (format == "der"_s) {
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(Identifier::fromString(vm, "type"_s)));
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(vm.propertyNames->type));
WTF::String type = "spki"_s;
if (!typeJSValue.isUndefinedOrNull() && !typeJSValue.isEmpty()) {
if (!typeJSValue.isString()) {
@@ -1800,7 +1800,7 @@ JSC_DEFINE_HOST_FUNCTION(KeyObject__Exports, (JSC::JSGlobalObject * globalObject
auto id = wrapped.keyClass();
if (auto* options = jsDynamicCast<JSC::JSObject*>(callFrame->argument(1))) {
JSValue formatJSValue = options->getIfPropertyExists(globalObject, PropertyName(Identifier::fromString(vm, "format"_s)));
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(Identifier::fromString(vm, "type"_s)));
JSValue typeJSValue = options->getIfPropertyExists(globalObject, PropertyName(vm.propertyNames->type));
JSValue passphraseJSValue = options->getIfPropertyExists(globalObject, PropertyName(Identifier::fromString(vm, "passphrase"_s)));
KeyPassphrase passphrase(passphraseJSValue, globalObject, scope);
RETURN_IF_EXCEPTION(scope, encodedJSValue());

2
src/bun.js/bindings/webcore/JSPerformanceEntry.cpp
View File

@@ -235,7 +235,7 @@ static inline EncodedJSValue jsPerformanceEntryPrototypeFunction_toJSONBody(JSGl
auto* result = constructEmptyObject(lexicalGlobalObject);
auto nameValue = toJS<IDLDOMString>(*lexicalGlobalObject, throwScope, impl.name());
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto entryTypeValue = toJS<IDLDOMString>(*lexicalGlobalObject, throwScope, impl.entryType());
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, Identifier::fromString(vm, "entryType"_s), entryTypeValue);

2
src/bun.js/bindings/webcore/JSPerformanceObserver.cpp
View File

@@ -95,7 +95,7 @@ template<> PerformanceObserver::Init convertDictionary<PerformanceObserver::Init
if (isNullOrUndefined)
typeValue = jsUndefined();
else {
typeValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "type"_s));
typeValue = object->get(&lexicalGlobalObject, vm.propertyNames->type);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!typeValue.isUndefined()) {

2
src/bun.js/bindings/webcore/JSWorker.cpp
View File

@@ -131,7 +131,7 @@ template<> JSC::EncodedJSValue JSC_HOST_CALL_ATTRIBUTES JSWorkerDOMConstructor::
options.bun.unref = false;
if (JSObject* optionsObject = JSC::jsDynamicCast<JSC::JSObject*>(argument1.value())) {
if (auto nameValue = optionsObject->getIfPropertyExists(lexicalGlobalObject, Identifier::fromString(vm, "name"_s))) {
if (auto nameValue = optionsObject->getIfPropertyExists(lexicalGlobalObject, vm.propertyNames->name)) {
if (nameValue.isString()) {
options.name = nameValue.toWTFString(lexicalGlobalObject);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());

2
src/bun.js/bindings/webcore/JSWorkerOptions.cpp
View File

@@ -57,7 +57,7 @@ template<> WorkerOptions convertDictionary<WorkerOptions>(JSGlobalObject& lexica
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSAesCbcCfbParams.cpp
View File

@@ -50,7 +50,7 @@ template<> CryptoAlgorithmAesCbcCfbParams convertDictionary<CryptoAlgorithmAesCb
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSAesCtrParams.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoAlgorithmAesCtrParams convertDictionary<CryptoAlgorithmAesCtrPa
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSAesGcmParams.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoAlgorithmAesGcmParams convertDictionary<CryptoAlgorithmAesGcmPa
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSAesKeyParams.cpp
View File

@@ -48,7 +48,7 @@ template<> CryptoAlgorithmAesKeyParams convertDictionary<CryptoAlgorithmAesKeyPa
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

6
src/bun.js/bindings/webcrypto/JSCryptoAesKeyAlgorithm.cpp
View File

@@ -50,7 +50,7 @@ template<> CryptoAesKeyAlgorithm convertDictionary<CryptoAesKeyAlgorithm>(JSGlob
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -86,10 +86,10 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto lengthValue = toJS<IDLUnsignedShort>(lexicalGlobalObject, throwScope, dictionary.length);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "length"_s), lengthValue);
result->putDirect(vm, vm.propertyNames->length, lengthValue);
return result;
}

2
src/bun.js/bindings/webcrypto/JSCryptoAlgorithmParameters.cpp
View File

@@ -47,7 +47,7 @@ template<> CryptoAlgorithmParameters convertDictionary<CryptoAlgorithmParameters
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

4
src/bun.js/bindings/webcrypto/JSCryptoEcKeyAlgorithm.cpp
View File

@@ -49,7 +49,7 @@ template<> CryptoEcKeyAlgorithm convertDictionary<CryptoEcKeyAlgorithm>(JSGlobal
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -85,7 +85,7 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto namedCurveValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.namedCurve);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "namedCurve"_s), namedCurveValue);

6
src/bun.js/bindings/webcrypto/JSCryptoHmacKeyAlgorithm.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoHmacKeyAlgorithm convertDictionary<CryptoHmacKeyAlgorithm>(JSGl
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -101,13 +101,13 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto hashValue = toJS<IDLDictionary<CryptoKeyAlgorithm>>(lexicalGlobalObject, globalObject, throwScope, dictionary.hash);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "hash"_s), hashValue);
auto lengthValue = toJS<IDLUnsignedLong>(lexicalGlobalObject, throwScope, dictionary.length);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "length"_s), lengthValue);
result->putDirect(vm, vm.propertyNames->length, lengthValue);
return result;
}

4
src/bun.js/bindings/webcrypto/JSCryptoKeyAlgorithm.cpp
View File

@@ -49,7 +49,7 @@ template<> CryptoKeyAlgorithm convertDictionary<CryptoKeyAlgorithm>(JSGlobalObje
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -71,7 +71,7 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
return result;
}

4
src/bun.js/bindings/webcrypto/JSCryptoRsaHashedKeyAlgorithm.cpp
View File

@@ -52,7 +52,7 @@ template<> CryptoRsaHashedKeyAlgorithm convertDictionary<CryptoRsaHashedKeyAlgor
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -116,7 +116,7 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto modulusLengthValue = toJS<IDLUnsignedLong>(lexicalGlobalObject, throwScope, dictionary.modulusLength);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "modulusLength"_s), modulusLengthValue);

4
src/bun.js/bindings/webcrypto/JSCryptoRsaKeyAlgorithm.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoRsaKeyAlgorithm convertDictionary<CryptoRsaKeyAlgorithm>(JSGlob
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {
@@ -101,7 +101,7 @@ JSC::JSObject* convertDictionaryToJS(JSC::JSGlobalObject& lexicalGlobalObject, J
auto nameValue = toJS<IDLDOMString>(lexicalGlobalObject, throwScope, dictionary.name);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "name"_s), nameValue);
result->putDirect(vm, vm.propertyNames->name, nameValue);
auto modulusLengthValue = toJS<IDLUnsignedLong>(lexicalGlobalObject, throwScope, dictionary.modulusLength);
RETURN_IF_EXCEPTION(throwScope, {});
result->putDirect(vm, JSC::Identifier::fromString(vm, "modulusLength"_s), modulusLengthValue);

2
src/bun.js/bindings/webcrypto/JSEcKeyParams.cpp
View File

@@ -47,7 +47,7 @@ template<> CryptoAlgorithmEcKeyParams convertDictionary<CryptoAlgorithmEcKeyPara
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSEcdhKeyDeriveParams.cpp
View File

@@ -49,7 +49,7 @@ template<> CryptoAlgorithmEcdhKeyDeriveParams convertDictionary<CryptoAlgorithmE
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSEcdsaParams.cpp
View File

@@ -50,7 +50,7 @@ template<> CryptoAlgorithmEcdsaParams convertDictionary<CryptoAlgorithmEcdsaPara
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSHkdfParams.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoAlgorithmHkdfParams convertDictionary<CryptoAlgorithmHkdfParams
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSHmacKeyParams.cpp
View File

@@ -51,7 +51,7 @@ template<> CryptoAlgorithmHmacKeyParams convertDictionary<CryptoAlgorithmHmacKey
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSPbkdf2Params.cpp
View File

@@ -52,7 +52,7 @@ template<> CryptoAlgorithmPbkdf2Params convertDictionary<CryptoAlgorithmPbkdf2Pa
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSRsaHashedImportParams.cpp
View File

@@ -50,7 +50,7 @@ template<> CryptoAlgorithmRsaHashedImportParams convertDictionary<CryptoAlgorith
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSRsaHashedKeyGenParams.cpp
View File

@@ -52,7 +52,7 @@ template<> CryptoAlgorithmRsaHashedKeyGenParams convertDictionary<CryptoAlgorith
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSRsaKeyGenParams.cpp
View File

@@ -49,7 +49,7 @@ template<> CryptoAlgorithmRsaKeyGenParams convertDictionary<CryptoAlgorithmRsaKe
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSRsaOaepParams.cpp
View File

@@ -50,7 +50,7 @@ template<> CryptoAlgorithmRsaOaepParams convertDictionary<CryptoAlgorithmRsaOaep
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

2
src/bun.js/bindings/webcrypto/JSRsaPssParams.cpp
View File

@@ -48,7 +48,7 @@ template<> CryptoAlgorithmRsaPssParams convertDictionary<CryptoAlgorithmRsaPssPa
if (isNullOrUndefined)
nameValue = jsUndefined();
else {
nameValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "name"_s));
nameValue = object->get(&lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(throwScope, {});
}
if (!nameValue.isUndefined()) {

6
src/bun.js/bindings/webcrypto/SubtleCrypto.cpp
View File

@@ -111,7 +111,7 @@ static ExceptionOr<std::unique_ptr<CryptoAlgorithmParameters>> normalizeCryptoAl
if (std::holds_alternative<String>(algorithmIdentifier)) {
auto newParams = Strong<JSObject>(vm, constructEmptyObject(&state));
newParams->putDirect(vm, Identifier::fromString(vm, "name"_s), jsString(vm, std::get<String>(algorithmIdentifier)));
newParams->putDirect(vm, vm.propertyNames->name, jsString(vm, std::get<String>(algorithmIdentifier)));
return normalizeCryptoAlgorithmParameters(state, newParams, operation);
}
@@ -268,10 +268,10 @@ static ExceptionOr<std::unique_ptr<CryptoAlgorithmParameters>> normalizeCryptoAl
switch (*identifier) {
case CryptoAlgorithmIdentifier::ECDH: {
// Remove this hack once https://bugs.webkit.org/show_bug.cgi?id=169333 is fixed.
JSValue nameValue = value.get()->get(&state, Identifier::fromString(vm, "name"_s));
JSValue nameValue = value.get()->get(&state, vm.propertyNames->name);
JSValue publicValue = value.get()->get(&state, Identifier::fromString(vm, "public"_s));
JSObject* newValue = constructEmptyObject(&state);
newValue->putDirect(vm, Identifier::fromString(vm, "name"_s), nameValue);
newValue->putDirect(vm, vm.propertyNames->name, nameValue);
newValue->putDirect(vm, Identifier::fromString(vm, "publicKey"_s), publicValue);
auto params = convertDictionary<CryptoAlgorithmEcdhKeyDeriveParams>(state, newValue);