chore(module): Refactor module module (#1255)

Author: nabetti1720

llrt_core/src/modules/mod.rs

@@ -7,7 +7,7 @@ pub use llrt_modules::{
     https, module, navigator, net, os, path, perf_hooks, process, stream_web, string_decoder,
     timers, tls, tty, url, util, zlib,
 };
-pub use llrt_modules::{module_builder, package, require, CJS_IMPORT_PREFIX, CJS_LOADER_PREFIX};
+pub use llrt_modules::{module_builder, package, CJS_IMPORT_PREFIX, CJS_LOADER_PREFIX};
 
 #[cfg(feature = "lambda")]
 pub mod console;

llrt_modules/src/lib.rs

@@ -1,9 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+use std::env;
+
+use once_cell::sync::Lazy;
+
 pub mod module;
 pub mod module_builder;
 pub mod package;
-pub mod require;
 
 pub use self::modules::*;
 
@@ -72,3 +75,10 @@ pub const CJS_IMPORT_PREFIX: &str = "__cjs:";
 pub const CJS_LOADER_PREFIX: &str = "__cjsm:";
 
 pub const ENV_LLRT_PLATFORM: &str = "LLRT_PLATFORM";
+
+pub static LLRT_PLATFORM: Lazy<String> = Lazy::new(|| {
+    env::var(ENV_LLRT_PLATFORM)
+        .ok()
+        .filter(|platform| platform == "node")
+        .unwrap_or_else(|| "browser".to_string())
+});

llrt_modules/src/module/mod.rs

@@ -1,6 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-use std::{cell::RefCell, collections::HashSet, marker::PhantomData};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, HashSet},
+    marker::PhantomData,
+    rc::Rc,
+};
 
 use llrt_utils::{
     ctx::CtxExt,
@@ -15,9 +20,9 @@ use rquickjs::{
 };
 
 pub mod loader;
+mod require;
 pub mod resolver;
 
-use crate::require::{require, RequireState};
 use crate::CJS_IMPORT_PREFIX;
 
 #[derive(JsLifetime)]
@@ -39,6 +44,17 @@ impl ModuleNames<'_> {
     }
 }
 
+#[derive(Default)]
+pub struct RequireState<'js> {
+    pub cache: HashMap<Rc<str>, Value<'js>>,
+    pub exports: HashMap<Rc<str>, Value<'js>>,
+    pub progress: HashMap<Rc<str>, Object<'js>>,
+}
+
+unsafe impl<'js> JsLifetime<'js> for RequireState<'js> {
+    type Changed<'to> = RequireState<'to>;
+}
+
 #[derive(Clone, JsLifetime)]
 struct Hook<'js> {
     resolve: Option<Function<'js>>,
@@ -64,13 +80,6 @@ impl ModuleHookState<'_> {
 
 pub struct ModuleModule;
 
-fn create_require(ctx: Ctx<'_>) -> Result<Value<'_>> {
-    ctx.globals()
-        .get::<_, Function>("require")
-        .map(|f| f.into())
-        .map_err(|_| Exception::throw_reference(&ctx, "create_require is not supported"))
-}
-
 fn is_builtin(ctx: Ctx<'_>, name: String) -> Result<bool> {
     let module_list = ctx
         .userdata::<ModuleNames>()
@@ -111,7 +120,7 @@ impl ModuleDef for ModuleModule {
                 .map_or_else(HashSet::new, |v| v.get_list());
 
             default.set("builtinModules", module_list)?;
-            default.set("createRequire", Func::from(create_require))?;
+            default.set("createRequire", Func::from(require::require))?;
             default.set("isBuiltin", Func::from(is_builtin))?;
             default.set("registerHooks", Func::from(register_hooks))?;
 
@@ -170,7 +179,7 @@ pub fn init(ctx: &Ctx) -> Result<()> {
     .enumerable();
 
     globals.prop("exports", exports_accessor)?;
-    globals.set("require", Func::from(require))?;
+    globals.set("require", Func::from(require::require))?;
 
     let module = Object::new(ctx.clone())?;
     module.prop("exports", exports_accessor)?;

llrt_modules/src/require.rs renamed to llrt_modules/src/module/require.rs

@@ -1,44 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-use std::{
-    cell::RefCell,
-    collections::{HashMap, HashSet},
-    env, fs,
-    rc::Rc,
-};
+use std::{cell::RefCell, collections::HashSet, fs, rc::Rc};
 
 use llrt_hooking::{invoke_async_hook, register_finalization_registry, HookType};
 use llrt_json::parse::json_parse;
 use llrt_utils::{ctx::CtxExt, io::BYTECODE_FILE_EXT, provider::ProviderType};
-use once_cell::sync::Lazy;
-use rquickjs::{
-    atom::PredefinedAtom, qjs, Ctx, Filter, Function, JsLifetime, Module, Object, Result, Value,
-};
+use rquickjs::{atom::PredefinedAtom, qjs, Ctx, Filter, Function, Module, Object, Result, Value};
 use tokio::time::Instant;
 use tracing::trace;
 
-use crate::module::ModuleNames;
 use crate::modules::{path::resolve_path, timers::poll_timers};
 use crate::package::resolver::require_resolve;
 use crate::CJS_IMPORT_PREFIX;
 
-pub static LLRT_PLATFORM: Lazy<String> = Lazy::new(|| {
-    env::var(super::ENV_LLRT_PLATFORM)
-        .ok()
-        .filter(|platform| platform == "node")
-        .unwrap_or_else(|| "browser".to_string())
-});
-
-#[derive(Default)]
-pub struct RequireState<'js> {
-    pub cache: HashMap<Rc<str>, Value<'js>>,
-    pub exports: HashMap<Rc<str>, Value<'js>>,
-    pub progress: HashMap<Rc<str>, Object<'js>>,
-}
-
-unsafe impl<'js> JsLifetime<'js> for RequireState<'js> {
-    type Changed<'to> = RequireState<'to>;
-}
+use super::{ModuleNames, RequireState};
 
 pub fn require(ctx: Ctx<'_>, specifier: String) -> Result<Value<'_>> {
     let globals = ctx.globals();

llrt_modules/src/package/resolver.rs

@@ -20,8 +20,7 @@ use simd_json::{derived::ValueObjectAccessAsScalar, BorrowedValue};
 use tracing::trace;
 
 use crate::modules::path;
-use crate::require::LLRT_PLATFORM;
-use crate::{CJS_IMPORT_PREFIX, CJS_LOADER_PREFIX};
+use crate::{CJS_IMPORT_PREFIX, CJS_LOADER_PREFIX, LLRT_PLATFORM};
 
 fn rc_string_to_cow<'a>(rc: Rc<String>) -> Cow<'a, str> {
     match Rc::try_unwrap(rc) {