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

Recursive module evaluation support (sync-only for now) + namespace object fixes

Browse Source
This commit is contained in:
Kai Tamkun
2025-05-13 19:12:29 -07:00
parent d12d0b9483
commit e2d5bfad85
4 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/bun.js/bindings/NodeVMSourceTextModule.cpp
View File

@@ -2,8 +2,8 @@
#include "ErrorCode.h"
#include "JSDOMExceptionHandling.h"
#include "JSModuleLoader.h"
#include "JSModuleRecord.h"
#include "JSPromise.h"
#include "JSSourceCode.h"
#include "ModuleAnalyzer.h"
#include "Parser.h"
@@ -228,7 +228,7 @@ JSValue NodeVMSourceTextModule::link(JSGlobalObject* globalObject, JSArray* spec
WTF::String specifier = specifierValue.toWTFString(globalObject);
JSObject* moduleNative = moduleNativeValue.getObject();
auto* resolvedRecord = jsCast<NodeVMModule*>(moduleNative)->moduleRecord(globalObject);
AbstractModuleRecord* resolvedRecord = jsCast<NodeVMModule*>(moduleNative)->moduleRecord(globalObject);
record->setImportedModule(globalObject, Identifier::fromString(vm, specifier), resolvedRecord);
m_resolveCache.set(WTFMove(specifier), WriteBarrier<JSObject> { vm, this, moduleNative });
@@ -244,11 +244,9 @@ JSValue NodeVMSourceTextModule::link(JSGlobalObject* globalObject, JSArray* spec
RETURN_IF_EXCEPTION(scope, {});
if (sync == Synchronousness::Async) {
ASSERT_NOT_REACHED_WITH_MESSAGE("TODO(@heimskr): async module linking");
RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE("TODO(@heimskr): async module linking");
}
RETURN_IF_EXCEPTION(scope, {});
status(Status::Linked);
return JSC::jsUndefined();
}
@@ -273,7 +271,19 @@ JSValue NodeVMSourceTextModule::evaluate(JSGlobalObject* globalObject, uint32_t
}
auto run = [&] {
// TODO(@heimskr): top-level await support
status(Status::Evaluating);
for (const auto& request : record->requestedModules()) {
if (auto iter = m_resolveCache.find(WTF::String(*request.m_specifier)); iter != m_resolveCache.end()) {
if (auto* dependency = jsDynamicCast<NodeVMSourceTextModule*>(iter->value.get())) {
if (dependency->status() == Status::Linked) {
JSValue dependencyResult = dependency->evaluate(globalObject, timeout, breakOnSigint);
RELEASE_ASSERT_WITH_MESSAGE(jsDynamicCast<JSC::JSPromise*>(dependencyResult) == nullptr, "TODO(@heimskr): implement async support for node:vm SourceTextModule dependencies");
}
}
}
}
result = record->evaluate(globalObject, jsUndefined(), jsNumber(static_cast<int32_t>(JSGenerator::ResumeMode::NormalMode)));
};