Use functions for accessing bundled system UDFs (#24174)

Sets us up to overlay system udfs more easily rather than directly
accessing global variables.

GitOrigin-RevId: 61ae14269bbf2196cfdd3a9c6f9d60c833a27197

Author: nipunn1313

crates/isolate/src/bundled_js.rs

@@ -1,21 +1,32 @@
+use value::sha256::Sha256Digest;
+
 /// This file includes the generated table of all of the system JS
 /// files, which we mount under "_system/" in the module namespace.
 mod system_udf_js_data {
     include!(concat!(env!("OUT_DIR"), "/system_udf_js_data.rs"));
 }
-pub use self::system_udf_js_data::FILES as SYSTEM_UDF_FILES;
-#[allow(dead_code)]
-static UNUSED: [u8; 32] = self::system_udf_js_data::FILES_SHA256;
 
 /// This file includes the generated table of all of the system JS
 /// files, which we mount under "_system/" in the module namespace.
 mod node_executor_js_data {
     include!(concat!(env!("OUT_DIR"), "/node_executor_js_data.rs"));
 }
-pub use self::node_executor_js_data::{
-    FILES as NODE_EXECUTOR_FILES,
-    FILES_SHA256 as NODE_EXECUTOR_SHA256,
-};
+
+/// Source and sourcemap
+pub type BundledJsFile = (&'static str, Option<&'static str>);
+
+pub fn system_udf_file(path: &str) -> Option<BundledJsFile> {
+    system_udf_js_data::FILES.get(path).copied()
+}
+pub fn system_udf_files_sha256() -> Sha256Digest {
+    system_udf_js_data::FILES_SHA256.into()
+}
+pub fn node_executor_file(path: &str) -> Option<BundledJsFile> {
+    node_executor_js_data::FILES.get(path).copied()
+}
+pub fn node_executor_files_sha256() -> Sha256Digest {
+    node_executor_js_data::FILES_SHA256.into()
+}
 
 #[cfg(any(test, feature = "testing"))]
 pub const UDF_TEST_BUNDLE_PATH: &str = concat!(env!("OUT_DIR"), "/udf_test_bundle.json");

crates/isolate/src/execution_scope.rs

@@ -35,7 +35,7 @@ use serde_json::Value as JsonValue;
 use value::heap_size::HeapSize;
 
 use crate::{
-    bundled_js::SYSTEM_UDF_FILES,
+    bundled_js::system_udf_file,
     environment::IsolateEnvironment,
     helpers::{
         self,
@@ -414,8 +414,7 @@ impl<'a, 'b: 'a, RT: Runtime, E: IsolateEnvironment<RT>> ExecutionScope<'a, 'b,
 
         // Overlay our "_system/" files on top of the user's UDFs.
         if let Some(system_path) = module_path.strip_prefix(SYSTEM_PREFIX) {
-            let (source, source_map) = SYSTEM_UDF_FILES
-                .get(system_path)
+            let (source, source_map) = system_udf_file(system_path)
                 .ok_or_else(|| SystemModuleNotFoundError::new(system_path))?;
             return Ok((
                 source.to_string(),

crates/isolate/src/isolate2/context.rs

@@ -21,7 +21,7 @@ use super::{
     FunctionId,
 };
 use crate::{
-    bundled_js::SYSTEM_UDF_FILES,
+    bundled_js::system_udf_file,
     isolate::SETUP_URL,
     strings,
 };
@@ -85,9 +85,8 @@ impl Context {
 
         ctx.enter(session, |mut ctx| {
             let setup_url = ModuleSpecifier::parse(SETUP_URL)?;
-            let (source, _) = SYSTEM_UDF_FILES
-                .get("setup.js")
-                .ok_or_else(|| anyhow!("Setup module not found"))?;
+            let (source, _) =
+                system_udf_file("setup.js").ok_or_else(|| anyhow!("Setup module not found"))?;
             let unresolved_imports = ctx.register_module(&setup_url, source)?;
             anyhow::ensure!(
                 unresolved_imports.is_empty(),

crates/isolate/src/lib.rs

@@ -40,10 +40,6 @@ mod user_error;
 pub mod test_helpers;
 
 pub use self::{
-    bundled_js::{
-        NODE_EXECUTOR_FILES,
-        NODE_EXECUTOR_SHA256,
-    },
     client::{
         ActionCallbacks,
         ActionRequest,

crates/node_executor/src/local.rs

@@ -13,7 +13,7 @@ use futures::{
     FutureExt,
     StreamExt,
 };
-use isolate::NODE_EXECUTOR_FILES;
+use isolate::bundled_js::node_executor_file;
 use serde_json::Value as JsonValue;
 use tempfile::TempDir;
 use tokio::process::Command as TokioCommand;
@@ -46,9 +46,8 @@ impl LocalNodeExecutor {
     pub fn new(node_process_timeout: Duration) -> anyhow::Result<Self> {
         // Write the source of local.cjs to a temp file.
         let source_dir = TempDir::new()?;
-        let (source, source_map) = NODE_EXECUTOR_FILES
-            .get("local.cjs")
-            .expect("local.cjs not generated!");
+        let (source, source_map) =
+            node_executor_file("local.cjs").expect("local.cjs not generated!");
         let source_map = source_map.context("Missing local.cjs.map")?;
         let source_path = source_dir.path().join("local.cjs");
         let source_map_path = source_dir.path().join("local.cjs.map");