diff options
| author |  Dylan Conway <dylan.conway567@gmail.com>
| 2023-08-31 22:24:34 -0700 |
|---|---|---|
| committer | Dylan Conway <dylan.conway567@gmail.com>
| 2023-08-31 22:24:34 -0700 |
| commit | 7dd06e2a12c1696bfbce715b6baaced3fa802944 (patch) | |
| tree | e3d918c60f3358439e239cbcfb1432bf9001d988 /src/bun.js/bindings/CommonJSModuleRecord.cpp | |
| parent | 7528ea00843f7c33b8e3017ca28b83cca556f783 (diff) | |
| download | bun-7dd06e2a12c1696bfbce715b6baaced3fa802944.tar.gz bun-7dd06e2a12c1696bfbce715b6baaced3fa802944.tar.zst bun-7dd06e2a12c1696bfbce715b6baaced3fa802944.zip | |
insert `enumerable: true` when needed
Diffstat (limited to 'src/bun.js/bindings/CommonJSModuleRecord.cpp')
| -rw-r--r-- | src/bun.js/bindings/CommonJSModuleRecord.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/bun.js/bindings/CommonJSModuleRecord.cpp b/src/bun.js/bindings/CommonJSModuleRecord.cpp index 007410dde..a1f5781d7 100644 --- a/src/bun.js/bindings/CommonJSModuleRecord.cpp +++ b/src/bun.js/bindings/CommonJSModuleRecord.cpp @@ -556,7 +556,7 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, if (canPerformFastEnumeration(structure)) { exports->structure()->forEachProperty(vm, [&](const PropertyTableEntry& entry) -> bool { auto key = entry.key(); - if (key->isSymbol() || entry.attributes() & PropertyAttribute::Accessor || entry.attributes() & PropertyAttribute::CustomAccessor || key == esModuleMarker) + if (key->isSymbol() || entry.attributes() & PropertyAttribute::DontEnum || key == esModuleMarker) return true; needsToAssignDefault = needsToAssignDefault && key != vm.propertyNames->defaultKeyword; @@ -568,7 +568,7 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, }); } else { JSC::PropertyNameArray properties(vm, JSC::PropertyNameMode::Strings, JSC::PrivateSymbolMode::Exclude); - exports->methodTable()->getOwnPropertyNames(exports, globalObject, properties, DontEnumPropertiesMode::Include); + exports->methodTable()->getOwnPropertyNames(exports, globalObject, properties, DontEnumPropertiesMode::Exclude); if (catchScope.exception()) { catchScope.clearExceptionExceptTermination(); return; @@ -586,9 +586,6 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, if (!exports->getPropertySlot(globalObject, property, slot)) continue; - if (slot.isAccessor() || slot.isUnset()) - continue; - exportNames.append(property); JSValue getterResult = slot.getValue(globalObject, property); @@ -609,7 +606,7 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, } else if (canPerformFastEnumeration(structure)) { exports->structure()->forEachProperty(vm, [&](const PropertyTableEntry& entry) -> bool { auto key = entry.key(); - if (key->isSymbol() || key == vm.propertyNames->defaultKeyword || entry.attributes() & PropertyAttribute::Accessor || entry.attributes() & PropertyAttribute::CustomAccessor) + if (key->isSymbol() || entry.attributes() & PropertyAttribute::DontEnum || key == vm.propertyNames->defaultKeyword) return true; JSValue value = exports->getDirect(entry.offset()); @@ -620,7 +617,7 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, }); } else { JSC::PropertyNameArray properties(vm, JSC::PropertyNameMode::Strings, JSC::PrivateSymbolMode::Exclude); - exports->methodTable()->getOwnPropertyNames(exports, globalObject, properties, DontEnumPropertiesMode::Include); + exports->methodTable()->getOwnPropertyNames(exports, globalObject, properties, DontEnumPropertiesMode::Exclude); if (catchScope.exception()) { catchScope.clearExceptionExceptTermination(); return; @@ -638,9 +635,6 @@ void JSCommonJSModule::toSyntheticSource(JSC::JSGlobalObject* globalObject, if (!exports->getPropertySlot(globalObject, property, slot)) continue; - if (slot.isAccessor() || slot.isUnset()) - continue; - exportNames.append(property); JSValue getterResult = slot.getValue(globalObject, property); |