refactor: move FileCollector to deno_config (denoland#24433)

zebreus · Jul 8, 2024 · a7f8fb2 · a7f8fb2
1 parent d439286
commit a7f8fb2
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 635 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,7 101,7 @@ console_static_text = "=0.8.1"
 data-encoding = "2.3.3"
 data-url = "=0.3.0"
 deno_cache_dir = "=0.10.0"
-deno_config = { version = "=0.19.1", default-features = false }
 deno_config = { version = "=0.20.0", default-features = false }
 dlopen2 = "0.6.1"
 ecb = "=0.1.2"
 elliptic-curve = { version = "0.13.4", features = ["alloc", "arithmetic", "ecdh", "std", "pem"] }

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -107,7 107,6 @@ faster-hex.workspace = true
 flate2.workspace = true
 fs3.workspace = true
 glob = "0.3.1"
-ignore = "0.4"
 import_map = { version = "=0.20.0", features = ["ext"] }
 indexmap.workspace = true
 jsonc-parser.workspace = true
@@ -149,7 148,6 @@ tower-lsp.workspace = true
 twox-hash.workspace = true
 typed-arena = "=2.0.1"
 uuid = { workspace = true, features = ["serde"] }
-walkdir = "=2.3.2"
 zeromq.workspace = true
 zstd.workspace = true
 
@@ -164,6 162,7 @@ nix.workspace = true
 deno_bench_util.workspace = true
 pretty_assertions.workspace = true
 test_util.workspace = true
 walkdir = "=2.3.2"
 
 [package.metadata.winres]
 # This section defines the metadata that appears in the deno.exe PE header.

diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -10,9 10,11 @@ mod package_json;
 use deno_ast::SourceMapOption;
 use deno_config::workspace::CreateResolverOptions;
 use deno_config::workspace::PackageJsonDepResolution;
 use deno_config::workspace::VendorEnablement;
 use deno_config::workspace::Workspace;
 use deno_config::workspace::WorkspaceDiscoverOptions;
 use deno_config::workspace::WorkspaceDiscoverStart;
 use deno_config::workspace::WorkspaceEmptyOptions;
 use deno_config::workspace::WorkspaceMemberContext;
 use deno_config::workspace::WorkspaceResolver;
 use deno_config::WorkspaceLintConfig;
@@ -778,7 780,6 @@ pub struct CliOptions {
  flags: Flags,
  initial_cwd: PathBuf,
  maybe_node_modules_folder: Option<PathBuf>,
- maybe_vendor_folder: Option<PathBuf>,
  npmrc: Arc<ResolvedNpmRc>,
  maybe_lockfile: Option<Arc<CliLockfile>>,
  overrides: CliOptionOverrides,
@@ -822,15 823,6 @@ impl CliOptions {
  root_folder.pkg_json.as_deref(),
  )
  .with_context(|| "Resolving node_modules folder.")?;
- let maybe_vendor_folder = if force_global_cache {
- None
- } else {
- resolve_vendor_folder(
- &initial_cwd,
- &flags,
- root_folder.deno_json.as_deref(),
- )
- };
 
  if let Some(env_file_name) = &flags.env_file {
  match from_filename(env_file_name) {
@@ -859,7 851,6 @@ impl CliOptions {
  maybe_lockfile,
  npmrc,
  maybe_node_modules_folder,
- maybe_vendor_folder,
  overrides: Default::default(),
  workspace,
  disable_deprecated_api_warning,
@@ -871,6 862,10 @@ impl CliOptions {
  let initial_cwd =
  std::env::current_dir().with_context(|| "Failed getting cwd.")?;
  let config_fs_adapter = DenoConfigFsAdapter::new(&RealFs);
  let maybe_vendor_override = flags.vendor.map(|v| match v {
  true => VendorEnablement::Enable { cwd: &initial_cwd },
  false => VendorEnablement::Disable,
  });
  let resolve_workspace_discover_options = || {
  let additional_config_file_names: &'static [&'static str] =
  if matches!(flags.subcommand, DenoSubcommand::Publish(..)) {
@@ -899,8 894,16 @@ impl CliOptions {
  config_parse_options,
  additional_config_file_names,
  discover_pkg_json,
  maybe_vendor_override,
  }
  };
  let resolve_empty_options = || WorkspaceEmptyOptions {
  root_dir: Arc::new(
  ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
  ),
  use_vendor_dir: maybe_vendor_override
  .unwrap_or(VendorEnablement::Disable),
  };
 
  let workspace = match &flags.config_flag {
  deno_config::ConfigFlag::Discover => {
@@ -910,9 913,7 @@ impl CliOptions {
  &resolve_workspace_discover_options(),
  )?
  } else {
- Workspace::empty(Arc::new(
- ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
- ))
  Workspace::empty(resolve_empty_options())
  }
  }
  deno_config::ConfigFlag::Path(path) => {
@@ -922,9 923,9 @@ impl CliOptions {
  &resolve_workspace_discover_options(),
  )?
  }
- deno_config::ConfigFlag::Disabled => Workspace::empty(Arc::new(
- ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
- )),
  deno_config::ConfigFlag::Disabled => {
  Workspace::empty(resolve_empty_options())
  }
  };
 
  for diagnostic in workspace.diagnostics() {
@@ -1258,7 1259,6 @@ impl CliOptions {
  flags: self.flags.clone(),
  initial_cwd: self.initial_cwd.clone(),
  maybe_node_modules_folder: Some(path),
- maybe_vendor_folder: self.maybe_vendor_folder.clone(),
  npmrc: self.npmrc.clone(),
  maybe_lockfile: self.maybe_lockfile.clone(),
  workspace: self.workspace.clone(),
@@ -1276,7 1276,7 @@ impl CliOptions {
  }
 
  pub fn vendor_dir_path(&self) -> Option<&PathBuf> {
- self.maybe_vendor_folder.as_ref()
  self.workspace.vendor_dir_path()
  }
 
  pub fn resolve_root_cert_store_provider(
@@ -1801,31 1801,6 @@ fn resolve_node_modules_folder(
  Ok(Some(canonicalize_path_maybe_not_exists(&path)?))
 }
 
-fn resolve_vendor_folder(
- cwd: &Path,
- flags: &Flags,
- maybe_config_file: Option<&ConfigFile>,
-) -> Option<PathBuf> {
- let use_vendor_dir = flags
- .vendor
- .or_else(|| maybe_config_file.and_then(|c| c.json.vendor))
- .unwrap_or(false);
- // Unlike the node_modules directory, there is no need to canonicalize
- // this directory because it's just used as a cache and the resolved
- // specifier is not based on the canonicalized path (unlike the modules
- // in the node_modules folder).
- if !use_vendor_dir {
- None
- } else if let Some(config_path) = maybe_config_file
- .as_ref()
- .and_then(|c| c.specifier.to_file_path().ok())
- {
- Some(config_path.parent().unwrap().join("vendor"))
- } else {
- Some(cwd.join("vendor"))
- }
-}
-
 fn resolve_import_map_specifier(
  maybe_import_map_path: Option<&str>,
  maybe_config_file: Option<&ConfigFile>,
@@ -1962,9 1937,8 @@ pub fn config_to_deno_graph_workspace_member(
 
 #[cfg(test)]
 mod test {
- use crate::util::fs::FileCollector;
-
  use super::*;
  use deno_config::glob::FileCollector;
  use pretty_assertions::assert_eq;
 
  #[test]
@@ -2109,7 2083,7 @@ mod test {
  let mut files = FileCollector::new(|_| true)
  .ignore_git_folder()
  .ignore_node_modules()
- .collect_file_patterns(resolved_files)
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, resolved_files)
  .unwrap();
 
  files.sort();

diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
@@ -1299,7 1299,13 @@ impl ConfigData {
  }
  };
 
- let vendor_dir = config_file.as_ref().and_then(|c| c.vendor_dir_path());
  let vendor_dir = config_file.as_ref().and_then(|c| {
  if c.vendor() == Some(true) {
  Some(c.specifier.to_file_path().ok()?.parent()?.join("vendor"))
  } else {
  None
  }
  });
 
  // Load lockfile
  let lockfile = config_file.as_ref().and_then(resolve_lockfile_from_config);

diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
@@ -3568,6 3568,11 @@ impl Inner {
  },
  additional_config_file_names: &[],
  discover_pkg_json: true,
  maybe_vendor_override: if force_global_cache {
  Some(deno_config::workspace::VendorEnablement::Disable)
  } else {
  None
  },
  },
  )?);
  let cli_options = CliOptions::new(

diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs
@@ -13,12 13,12 @@ use crate::tools::test::format_test_error;
 use crate::tools::test::TestFilter;
 use crate::util::file_watcher;
 use crate::util::fs::collect_specifiers;
-use crate::util::fs::WalkEntry;
 use crate::util::path::is_script_ext;
 use crate::util::path::matches_pattern_or_exact_path;
 use crate::version::get_user_agent;
 use crate::worker::CliMainWorkerFactory;
 
 use deno_config::glob::WalkEntry;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::error::JsError;

diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
@@ -9,11 9,11 @@ use crate::factory::CliFactory;
 use crate::npm::CliNpmResolver;
 use crate::tools::fmt::format_json;
 use crate::tools::test::is_supported_test_path;
-use crate::util::fs::FileCollector;
 use crate::util::text_encoding::source_map_from_code;
 
 use deno_ast::MediaType;
 use deno_ast::ModuleSpecifier;
 use deno_config::glob::FileCollector;
 use deno_config::glob::FilePatterns;
 use deno_config::glob::PathOrPattern;
 use deno_config::glob::PathOrPatternSet;
@@ -408,7 408,7 @@ fn collect_coverages(
  .ignore_git_folder()
  .ignore_node_modules()
  .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
- .collect_file_patterns(file_patterns)?;
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, file_patterns)?;
 
  let coverage_patterns = FilePatterns {
  base: initial_cwd.to_path_buf(),

diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
@@ -19,10 19,10 @@ use crate::factory::CliFactory;
 use crate::util::diff::diff;
 use crate::util::file_watcher;
 use crate::util::fs::canonicalize_path;
-use crate::util::fs::FileCollector;
 use crate::util::path::get_extension;
 use async_trait::async_trait;
 use deno_ast::ParsedSource;
 use deno_config::glob::FileCollector;
 use deno_config::glob::FilePatterns;
 use deno_core::anyhow::anyhow;
 use deno_core::anyhow::bail;
@@ -200,7 200,7 @@ fn collect_fmt_files(
  .ignore_git_folder()
  .ignore_node_modules()
  .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
- .collect_file_patterns(files)
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, files)
 }
 
 /// Formats markdown (using <https://github.com/dprint/dprint-plugin-markdown>) and its code blocks

diff --git a/cli/tools/lint/mod.rs b/cli/tools/lint/mod.rs
@@ -8,6 8,7 @@ use deno_ast::ModuleSpecifier;
 use deno_ast::ParsedSource;
 use deno_ast::SourceRange;
 use deno_ast::SourceTextInfo;
 use deno_config::glob::FileCollector;
 use deno_config::glob::FilePatterns;
 use deno_config::workspace::Workspace;
 use deno_config::workspace::WorkspaceMemberContext;
@@ -60,7 61,6 @@ use crate::tools::fmt::run_parallelized;
 use crate::util::file_watcher;
 use crate::util::fs::canonicalize_path;
 use crate::util::fs::specifier_from_file_path;
-use crate::util::fs::FileCollector;
 use crate::util::path::is_script_ext;
 use crate::util::sync::AtomicFlag;
 
@@ -401,7 401,7 @@ fn collect_lint_files(
  .ignore_git_folder()
  .ignore_node_modules()
  .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
- .collect_file_patterns(files)
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, files)
 }
 
 #[allow(clippy::print_stdout)]

diff --git a/cli/tools/registry/paths.rs b/cli/tools/registry/paths.rs
@@ -8,12 8,12 @@ use std::path::PathBuf;
 
 use deno_ast::MediaType;
 use deno_ast::ModuleSpecifier;
 use deno_config::glob::FileCollector;
 use deno_config::glob::FilePatterns;
 use deno_core::error::AnyError;
 use thiserror::Error;
 
 use crate::args::CliOptions;
-use crate::util::fs::FileCollector;
 
 use super::diagnostics::PublishDiagnostic;
 use super::diagnostics::PublishDiagnosticsCollector;
@@ -319,14 319,14 @@ fn collect_paths(
  file_patterns: FilePatterns,
 ) -> Result<Vec<PathBuf>, AnyError> {
  FileCollector::new(|e| {
- if !e.file_type.is_file() {
  if !e.metadata.is_file {
  if let Ok(specifier) = ModuleSpecifier::from_file_path(e.path) {
  diagnostics_collector.push(PublishDiagnostic::UnsupportedFileType {
  specifier,
- kind: if e.file_type.is_symlink() {
- "symlink".to_owned()
  kind: if e.metadata.is_symlink {
  "symlink".to_string()
  } else {
- format!("{:?}", e.file_type)
  "Unknown".to_string()
  },
  });
  }
@@ -341,5 341,5 @@ fn collect_paths(
  .ignore_node_modules()
  .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
  .use_gitignore()
- .collect_file_patterns(file_patterns)
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, file_patterns)
 }
diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs
@@ -15,7 15,6 @@ use crate::graph_util::has_graph_root_local_dependent_changed;
 use crate::ops;
 use crate::util::file_watcher;
 use crate::util::fs::collect_specifiers;
-use crate::util::fs::WalkEntry;
 use crate::util::path::get_extension;
 use crate::util::path::is_script_ext;
 use crate::util::path::mapped_specifier_for_tsc;
@@ -27,6 26,7 @@ use deno_ast::swc::common::comments::CommentKind;
 use deno_ast::MediaType;
 use deno_ast::SourceRangedForSpanned;
 use deno_config::glob::FilePatterns;
 use deno_config::glob::WalkEntry;
 use deno_core::anyhow;
 use deno_core::anyhow::bail;
 use deno_core::anyhow::Context as _;