aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/builtins
diff options
context:
space:
mode:
Diffstat (limited to 'src/bun.js/builtins')
-rw-r--r--src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp13
-rw-r--r--src/bun.js/builtins/js/ImportMetaObject.js11
2 files changed, 7 insertions, 17 deletions
diff --git a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
index 73d3cd9ab..acf81645f 100644
--- a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
@@ -99,7 +99,7 @@ const char* const s_importMetaObjectRequireCode =
const JSC::ConstructAbility s_importMetaObjectLoadModuleCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
const JSC::ConstructorKind s_importMetaObjectLoadModuleCodeConstructorKind = JSC::ConstructorKind::None;
const JSC::ImplementationVisibility s_importMetaObjectLoadModuleCodeImplementationVisibility = JSC::ImplementationVisibility::Public;
-const int s_importMetaObjectLoadModuleCodeLength = 2932;
+const int s_importMetaObjectLoadModuleCodeLength = 2925;
static const JSC::Intrinsic s_importMetaObjectLoadModuleCodeIntrinsic = JSC::NoIntrinsic;
const char* const s_importMetaObjectLoadModuleCode =
"(function (meta, resolvedSpecifier) {\n" \
@@ -127,7 +127,6 @@ const char* const s_importMetaObjectLoadModuleCode =
" entry.fetch,\n" \
" @promiseFieldReactionsOrResult\n" \
" );\n" \
- "\n" \
" //\n" \
" //\n" \
" //\n" \
@@ -143,7 +142,6 @@ const char* const s_importMetaObjectLoadModuleCode =
" @promiseFieldFlags\n" \
" );\n" \
" var state = flags & @promiseStateMask;\n" \
- "\n" \
" //\n" \
" if (\n" \
" state === @promiseStatePending ||\n" \
@@ -169,18 +167,15 @@ const char* const s_importMetaObjectLoadModuleCode =
" var dependenciesMap = module.dependenciesMap;\n" \
" var requestedModules = Loader.requestedModules(module);\n" \
" var dependencies = @newArrayWithSize(requestedModules.length);\n" \
- "\n" \
" for (var i = 0, length = requestedModules.length; i < length; ++i) {\n" \
" var depName = requestedModules[i];\n" \
- "\n" \
" //\n" \
" //\n" \
" var depKey =\n" \
" depName[0] === \"/\"\n" \
" ? depName\n" \
- " : Loader.resolveSync(depName, key, @undefined);\n" \
+ " : Loader.resolve(depName, key, @undefined);\n" \
" var depEntry = Loader.ensureRegistered(depKey);\n" \
- "\n" \
" if (depEntry.state < @ModuleLink) {\n" \
" queue.push(depKey);\n" \
" }\n" \
@@ -191,8 +186,8 @@ const char* const s_importMetaObjectLoadModuleCode =
"\n" \
" entry.dependencies = dependencies;\n" \
" //\n" \
- " entry.instantiate = Promise.resolve(entry)\n" \
- " entry.satisfy = Promise.resolve(entry);\n" \
+ " entry.instantiate = @Promise.resolve(entry)\n" \
+ " entry.satisfy = @Promise.resolve(entry);\n" \
" key = queue.shift();\n" \
" while (key && (Loader.registry.@get(key)?.state ?? @ModuleFetch) >= @ModuleLink) {\n" \
" key = queue.shift();\n" \
diff --git a/src/bun.js/builtins/js/ImportMetaObject.js b/src/bun.js/builtins/js/ImportMetaObject.js
index 2318268c2..ce28775c2 100644
--- a/src/bun.js/builtins/js/ImportMetaObject.js
+++ b/src/bun.js/builtins/js/ImportMetaObject.js
@@ -89,7 +89,6 @@ function loadModule(meta, resolvedSpecifier) {
entry.fetch,
@promiseFieldReactionsOrResult
);
-
// parseModule() returns a Promise, but the value is already fulfilled
// so we just pull it out of the promise here once again
// But, this time we do it a little more carefully because this is a JSC function call and not bun source code
@@ -105,7 +104,6 @@ function loadModule(meta, resolvedSpecifier) {
@promiseFieldFlags
);
var state = flags & @promiseStateMask;
-
// this branch should never happen, but just to be safe
if (
state === @promiseStatePending ||
@@ -131,18 +129,15 @@ function loadModule(meta, resolvedSpecifier) {
var dependenciesMap = module.dependenciesMap;
var requestedModules = Loader.requestedModules(module);
var dependencies = @newArrayWithSize(requestedModules.length);
-
for (var i = 0, length = requestedModules.length; i < length; ++i) {
var depName = requestedModules[i];
-
// optimization: if it starts with a slash then it's an absolute path
// we don't need to run the resolver a 2nd time
var depKey =
depName[0] === "/"
? depName
- : Loader.resolveSync(depName, key, @undefined);
+ : Loader.resolve(depName, key, @undefined);
var depEntry = Loader.ensureRegistered(depKey);
-
if (depEntry.state < @ModuleLink) {
queue.push(depKey);
}
@@ -153,8 +148,8 @@ function loadModule(meta, resolvedSpecifier) {
entry.dependencies = dependencies;
// All dependencies resolved, set instantiate and satisfy field directly.
- entry.instantiate = Promise.resolve(entry)
- entry.satisfy = Promise.resolve(entry);
+ entry.instantiate = @Promise.resolve(entry)
+ entry.satisfy = @Promise.resolve(entry);
key = queue.shift();
while (key && (Loader.registry.@get(key)?.state ?? @ModuleFetch) >= @ModuleLink) {
key = queue.shift();