From 4a33c349afd4b2728eb8c3c29676651353282d3b Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:38:10 -0400
Subject: refactor: move some CJS and ESM code analysis to ext/node (#18789)

---
 cli/module_loader.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'cli/module_loader.rs')

diff --git a/cli/module_loader.rs b/cli/module_loader.rs
index 06755bbf5..07fad6ffc 100644
--- a/cli/module_loader.rs
+++ b/cli/module_loader.rs
@@ -11,9 +11,10 @@ use crate::graph_util::graph_valid_with_cli_options;
 use crate::graph_util::ModuleGraphBuilder;
 use crate::graph_util::ModuleGraphContainer;
 use crate::node;
+use crate::node::CliCjsEsmCodeAnalyzer;
 use crate::node::CliNodeResolver;
-use crate::node::NodeCodeTranslator;
 use crate::node::NodeResolution;
+use crate::npm::CliRequireNpmResolver;
 use crate::proc_state::CjsResolutionStore;
 use crate::proc_state::FileWatcherReporter;
 use crate::proc_state::ProcState;
@@ -49,7 +50,9 @@ use deno_graph::JsonModule;
 use deno_graph::Module;
 use deno_graph::Resolution;
 use deno_lockfile::Lockfile;
+use deno_runtime::deno_node::analyze::NodeCodeTranslator;
 use deno_runtime::deno_node::NodeResolutionMode;
+use deno_runtime::deno_node::RealFs;
 use deno_runtime::permissions::PermissionsContainer;
 use deno_semver::npm::NpmPackageReqReference;
 use std::borrow::Cow;
@@ -241,7 +244,8 @@ pub struct CliModuleLoader {
   emitter: Arc<Emitter>,
   graph_container: Arc<ModuleGraphContainer>,
   module_load_preparer: Arc<ModuleLoadPreparer>,
-  node_code_translator: Arc<NodeCodeTranslator>,
+  node_code_translator:
+    Arc<NodeCodeTranslator<CliCjsEsmCodeAnalyzer, CliRequireNpmResolver>>,
   node_resolver: Arc<CliNodeResolver>,
   parsed_source_cache: Arc<ParsedSourceCache>,
   resolver: Arc<CliGraphResolver>,
@@ -385,17 +389,16 @@ impl CliModuleLoader {
           self.root_permissions.clone()
         };
         // translate cjs to esm if it's cjs and inject node globals
-        self.node_code_translator.translate_cjs_to_esm(
+        self.node_code_translator.translate_cjs_to_esm::<RealFs>(
           specifier,
-          code,
-          MediaType::Cjs,
+          &code,
           &mut permissions,
         )?
       } else {
         // only inject node globals for esm
         self
           .node_code_translator
-          .esm_code_with_node_globals(specifier, code)?
+          .esm_code_with_node_globals(specifier, &code)?
       };
       ModuleCodeSource {
         code: code.into(),
-- 
cgit v1.2.3