diff options
Diffstat (limited to 'src/js/builtins/ImportMetaObject.ts')
-rw-r--r-- | src/js/builtins/ImportMetaObject.ts | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/js/builtins/ImportMetaObject.ts b/src/js/builtins/ImportMetaObject.ts index 9409bb0f1..bf498e9f9 100644 --- a/src/js/builtins/ImportMetaObject.ts +++ b/src/js/builtins/ImportMetaObject.ts @@ -118,17 +118,17 @@ export function internalRequire(this: ImportMetaObject, id) { if (last5 === ".json") { var fs = (globalThis[Symbol.for("_fs")] ||= Bun.fs()); var exports = JSON.parse(fs.readFileSync(id, "utf8")); - $requireMap.$set(id, $createCommonJSModule(id, exports, true)); + $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined)); return exports; } else if (last5 === ".node") { - const module = $createCommonJSModule(id, {}, true); + const module = $createCommonJSModule(id, {}, true, undefined); process.dlopen(module, id); $requireMap.$set(id, module); return module.exports; } else if (last5 === ".toml") { var fs = (globalThis[Symbol.for("_fs")] ||= Bun.fs()); var exports = Bun.TOML.parse(fs.readFileSync(id, "utf8")); - $requireMap.$set(id, $createCommonJSModule(id, exports, true)); + $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined)); return exports; } else { var exports = $requireESM(id); @@ -136,7 +136,7 @@ export function internalRequire(this: ImportMetaObject, id) { if (cachedModule) { return cachedModule.exports; } - $requireMap.$set(id, $createCommonJSModule(id, exports, true)); + $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined)); return exports; } } @@ -152,7 +152,7 @@ export function createRequireCache() { const esm = Loader.registry.$get(key); if (esm?.evaluated) { const namespace = Loader.getModuleNamespaceObject(esm.module); - const mod = $createCommonJSModule(key, namespace, true); + const mod = $createCommonJSModule(key, namespace, true, undefined); $requireMap.$set(key, mod); return mod; } @@ -165,7 +165,7 @@ export function createRequireCache() { }, has(target, key: string) { - return $requireMap.$has(key) || Loader.registry.$has(key); + return $requireMap.$has(key) || Boolean(Loader.registry.$get(key)?.evaluated); }, deleteProperty(target, key: string) { @@ -177,13 +177,11 @@ export function createRequireCache() { ownKeys(target) { var array = [...$requireMap.$keys()]; - const registryKeys = [...Loader.registry.$keys()]; - for (const key of registryKeys) { - if (!array.includes(key)) { + for (const key of Loader.registry.$keys()) { + if (!array.includes(key) && Loader.registry.$get(key)?.evaluated) { $arrayPush(array, key); } } - return array; }, @@ -193,7 +191,7 @@ export function createRequireCache() { }, getOwnPropertyDescriptor(target, key: string) { - if ($requireMap.$has(key) || Loader.registry.$has(key)) { + if ($requireMap.$has(key) || Loader.registry.$get(key)?.evaluated) { return { configurable: true, enumerable: true, |