refactor(node): move most of cli/node to ext/node (#18797)

This is just a straight refactor and I didn't do any cleanup in
ext/node. After this PR we can start to clean it up and make things
private that don't need to be public anymore.

1 files changed, 12 insertions, 11 deletions

diff --git a/cli/worker.rs b/cli/worker.rs
index 7ee8fc802..c73e4edbe 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -13,6 +13,8 @@ use deno_core::Extension;
 use deno_core::ModuleId;
 use deno_runtime::colors;
 use deno_runtime::deno_node;
+use deno_runtime::deno_node::NodeResolution;
+use deno_runtime::deno_node::RealFs;
 use deno_runtime::fmt_errors::format_js_error;
 use deno_runtime::ops::worker_host::CreateWebWorkerCb;
 use deno_runtime::ops::worker_host::WorkerEventCb;
@@ -27,7 +29,6 @@ use deno_semver::npm::NpmPackageReqReference;
 use crate::args::DenoSubcommand;
 use crate::errors;
 use crate::module_loader::CliModuleLoader;
-use crate::node;
 use crate::ops;
 use crate::proc_state::ProcState;
 use crate::tools;
@@ -258,16 +259,16 @@ pub async fn create_custom_worker(
     ps.npm_resolver
       .add_package_reqs(vec![package_ref.req.clone()])
       .await?;
-    let node_resolution =
-      ps.node_resolver.resolve_binary_export(&package_ref)?;
-    let is_main_cjs =
-      matches!(node_resolution, node::NodeResolution::CommonJs(_));
+    let node_resolution = ps
+      .node_resolver
+      .resolve_binary_export::<RealFs>(&package_ref)?;
+    let is_main_cjs = matches!(node_resolution, NodeResolution::CommonJs(_));
     (node_resolution.into_url(), is_main_cjs)
   } else if ps.options.is_npm_main() {
-    let node_resolution =
-      ps.node_resolver.url_to_node_resolution(main_module)?;
-    let is_main_cjs =
-      matches!(node_resolution, node::NodeResolution::CommonJs(_));
+    let node_resolution = ps
+      .node_resolver
+      .url_to_node_resolution::<RealFs>(main_module)?;
+    let is_main_cjs = matches!(node_resolution, NodeResolution::CommonJs(_));
     (node_resolution.into_url(), is_main_cjs)
   } else {
     (main_module, false)
@@ -344,7 +345,7 @@ pub async fn create_custom_worker(
     should_break_on_first_statement: ps.options.inspect_brk().is_some(),
     should_wait_for_inspector_session: ps.options.inspect_wait().is_some(),
     module_loader,
-    npm_resolver: Some(Rc::new(ps.npm_resolver.as_require_npm_resolver())),
+    npm_resolver: Some(Rc::new(ps.npm_resolver.clone())),
     get_error_class_fn: Some(&errors::get_error_class_name),
     cache_storage_dir,
     origin_storage_dir,
@@ -467,7 +468,7 @@ fn create_web_worker_callback(
       format_js_error_fn: Some(Arc::new(format_js_error)),
       source_map_getter: Some(Box::new(module_loader.clone())),
       module_loader,
-      npm_resolver: Some(Rc::new(ps.npm_resolver.as_require_npm_resolver())),
+      npm_resolver: Some(Rc::new(ps.npm_resolver.clone())),
       worker_type: args.worker_type,
       maybe_inspector_server,
       get_error_class_fn: Some(&errors::get_error_class_name),