From a615eb3b56545960ec9684991442dd34a8b2abfc Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:02:46 -0400
Subject: 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.
---
 cli/tools/check.rs |  6 +++---
 cli/tools/info.rs  | 10 +++++-----
 cli/tools/task.rs  |  8 +++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'cli/tools')

diff --git a/cli/tools/check.rs b/cli/tools/check.rs
index c7f404223..36bc25d6a 100644
--- a/cli/tools/check.rs
+++ b/cli/tools/check.rs
@@ -22,7 +22,7 @@ use crate::cache::DenoDir;
 use crate::cache::FastInsecureHasher;
 use crate::cache::TypeCheckCache;
 use crate::node::CliNodeResolver;
-use crate::npm::NpmPackageResolver;
+use crate::npm::CliNpmResolver;
 use crate::tsc;
 use crate::version;
 
@@ -43,7 +43,7 @@ pub struct TypeChecker {
   caches: Arc<Caches>,
   cli_options: Arc<CliOptions>,
   node_resolver: Arc<CliNodeResolver>,
-  npm_resolver: Arc<NpmPackageResolver>,
+  npm_resolver: Arc<CliNpmResolver>,
 }
 
 impl TypeChecker {
@@ -52,7 +52,7 @@ impl TypeChecker {
     caches: Arc<Caches>,
     cli_options: Arc<CliOptions>,
     node_resolver: Arc<CliNodeResolver>,
-    npm_resolver: Arc<NpmPackageResolver>,
+    npm_resolver: Arc<CliNpmResolver>,
   ) -> Self {
     Self {
       deno_dir,
diff --git a/cli/tools/info.rs b/cli/tools/info.rs
index 69faa10fb..a59f8a4c8 100644
--- a/cli/tools/info.rs
+++ b/cli/tools/info.rs
@@ -28,7 +28,7 @@ use crate::args::Flags;
 use crate::args::InfoFlags;
 use crate::display;
 use crate::graph_util::graph_lock_or_exit;
-use crate::npm::NpmPackageResolver;
+use crate::npm::CliNpmResolver;
 use crate::proc_state::ProcState;
 use crate::util::checksum;
 
@@ -141,7 +141,7 @@ fn print_cache_info(
 
 fn add_npm_packages_to_json(
   json: &mut serde_json::Value,
-  npm_resolver: &NpmPackageResolver,
+  npm_resolver: &CliNpmResolver,
 ) {
   // ideally deno_graph could handle this, but for now we just modify the json here
   let snapshot = npm_resolver.snapshot();
@@ -318,7 +318,7 @@ struct NpmInfo {
 impl NpmInfo {
   pub fn build<'a>(
     graph: &'a ModuleGraph,
-    npm_resolver: &'a NpmPackageResolver,
+    npm_resolver: &'a CliNpmResolver,
     npm_snapshot: &'a NpmResolutionSnapshot,
   ) -> Self {
     let mut info = NpmInfo::default();
@@ -344,7 +344,7 @@ impl NpmInfo {
   fn fill_package_info<'a>(
     &mut self,
     package: &NpmResolutionPackage,
-    npm_resolver: &'a NpmPackageResolver,
+    npm_resolver: &'a CliNpmResolver,
     npm_snapshot: &'a NpmResolutionSnapshot,
   ) {
     self
@@ -380,7 +380,7 @@ struct GraphDisplayContext<'a> {
 impl<'a> GraphDisplayContext<'a> {
   pub fn write<TWrite: Write>(
     graph: &'a ModuleGraph,
-    npm_resolver: &'a NpmPackageResolver,
+    npm_resolver: &'a CliNpmResolver,
     writer: &mut TWrite,
   ) -> fmt::Result {
     let npm_snapshot = npm_resolver.snapshot();
diff --git a/cli/tools/task.rs b/cli/tools/task.rs
index c64e2a77c..898cdd8d9 100644
--- a/cli/tools/task.rs
+++ b/cli/tools/task.rs
@@ -5,7 +5,7 @@ use crate::args::Flags;
 use crate::args::TaskFlags;
 use crate::colors;
 use crate::node::CliNodeResolver;
-use crate::npm::NpmPackageResolver;
+use crate::npm::CliNpmResolver;
 use crate::proc_state::ProcState;
 use crate::util::fs::canonicalize_path;
 use deno_core::anyhow::bail;
@@ -13,6 +13,7 @@ use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use deno_core::futures;
 use deno_core::futures::future::LocalBoxFuture;
+use deno_runtime::deno_node::RealFs;
 use deno_semver::npm::NpmPackageNv;
 use deno_task_shell::ExecuteResult;
 use deno_task_shell::ShellCommand;
@@ -234,13 +235,14 @@ impl ShellCommand for NpmPackageBinCommand {
 }
 
 fn resolve_npm_commands(
-  npm_resolver: &NpmPackageResolver,
+  npm_resolver: &CliNpmResolver,
   node_resolver: &CliNodeResolver,
 ) -> Result<HashMap<String, Rc<dyn ShellCommand>>, AnyError> {
   let mut result = HashMap::new();
   let snapshot = npm_resolver.snapshot();
   for id in snapshot.top_level_packages() {
-    let bin_commands = node_resolver.resolve_binary_commands(&id.nv)?;
+    let bin_commands =
+      node_resolver.resolve_binary_commands::<RealFs>(&id.nv)?;
     for bin_command in bin_commands {
       result.insert(
         bin_command.to_string(),
-- 
cgit v1.2.3