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

Fix test failures in import.meta (#3403)

Browse Source 
* Fix test failures in import.meta

* regenerate

* Use bound functions for `import.meta.require` and `import.meta.require.resolve` and `Module.createRequire`

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
This commit is contained in:
Jarred Sumner
2023-06-25 19:48:56 -07:00
committed by GitHub
parent 116bcf4245
commit 76626ac54b
16 changed files with 355 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,24 +19,12 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModuleCreateRequire,
return JSC::JSValue::encode(JSC::jsUndefined());
}
auto str = callFrame->uncheckedArgument(0).toStringOrNull(globalObject);
auto val = callFrame->uncheckedArgument(0).toWTFString(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);
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,
ArgList(), 0, jsString(vm, nameStr));
boundRequireFunction->putDirect(
vm, clientData->builtinNames().resolvePublicName(),
requireFunction->getDirect(
vm, clientData->builtinNames().resolvePublicName()),
0);
RELEASE_AND_RETURN(scope, JSValue::encode(boundRequireFunction));
RELEASE_AND_RETURN(
scope, JSValue::encode(Zig::ImportMetaObject::createRequireFunction(
vm, globalObject, val)));
}
JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModulePaths,
(JSC::JSGlobalObject * globalObject,
@@ -158,7 +146,8 @@ void generateNodeModuleModule(JSC::JSGlobalObject *globalObject,
jsFunctionNodeModulePaths, ImplementationVisibility::Public));
exportNames.append(JSC::Identifier::fromString(vm, "_cache"_s));
exportValues.append(JSC::constructEmptyObject(globalObject));
exportValues.append(
jsCast<Zig::GlobalObject *>(globalObject)->lazyRequireCacheObject());
exportNames.append(JSC::Identifier::fromString(vm, "builtinModules"_s));