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

require.resolve in the runtime should use CommonJS export conditions

Browse Source
This commit is contained in:
Jarred Sumner
2023-01-11 14:22:31 -08:00
parent 5a3b634982
commit 4a1470d26c
8 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/bun.js/modules/NodeModuleModule.cpp
View File

@@ -19,36 +19,24 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModuleCreateRequire,
return JSC::JSValue::encode(JSC::jsUndefined());
}
Zig::ImportMetaObject *importMetaObject = Zig::ImportMetaObject::create(
globalObject, callFrame->uncheckedArgument(0));
auto str = callFrame->uncheckedArgument(0).toStringOrNull(globalObject);
RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode(JSC::jsUndefined()));
WTF::String val = str->value(globalObject);
auto *meta = Zig::ImportMetaObject::create(globalObject, str);
auto clientData = WebCore::clientData(vm);
RETURN_IF_EXCEPTION(scope, {});
if (!importMetaObject) {
throwTypeError(globalObject, scope, "Invalid path"_s);
return JSC::JSValue::encode(JSC::jsUndefined());
}
auto requireFunctionValue = importMetaObject->get(
globalObject, clientData->builtinNames().requirePublicName());
RETURN_IF_EXCEPTION(scope, {});
JSC::JSBoundFunction *boundRequireFunction = JSC::JSBoundFunction::create(
vm, globalObject, requireFunctionValue.getObject(), importMetaObject,
nullptr, 1, jsString(vm, String("require"_s)));
RETURN_IF_EXCEPTION(scope, {});
auto resolveFunction = importMetaObject->get(
globalObject, clientData->builtinNames().resolveSyncPublicName());
JSC::JSBoundFunction *boundResolveFunction = JSC::JSBoundFunction::create(
vm, globalObject, resolveFunction.getObject(), importMetaObject, nullptr,
1, jsString(vm, String("resolve"_s)));
auto requireFunction =
Zig::ImportMetaObject::createRequireFunction(vm, globalObject, val);
auto nameStr = jsCast<JSFunction *>(requireFunction)->name(vm);
JSC::JSBoundFunction *boundRequireFunction =
JSC::JSBoundFunction::create(vm, globalObject, requireFunction, meta,
nullptr, 0, jsString(vm, nameStr));
boundRequireFunction->putDirect(
vm, clientData->builtinNames().resolvePublicName(), boundResolveFunction,
JSC::PropertyAttribute::Function | 0);
vm, clientData->builtinNames().resolvePublicName(),
requireFunction->getDirect(
vm, clientData->builtinNames().resolvePublicName()),
0);
RELEASE_AND_RETURN(scope, JSC::JSValue::encode(boundRequireFunction));
RELEASE_AND_RETURN(scope, JSValue::encode(boundRequireFunction));
}
JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModulePaths,
(JSC::JSGlobalObject * globalObject,
@@ -113,7 +101,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionResolveFileName,
auto result =
Bun__resolveSync(globalObject, JSC::JSValue::encode(moduleName),
JSValue::encode(callFrame->argument(1)));
JSValue::encode(callFrame->argument(1)), false);
auto scope = DECLARE_THROW_SCOPE(globalObject->vm());
if (!JSC::JSValue::decode(result).isString()) {