refactor: move FileCollector to deno_config

denoland · dsherret · Jul 5, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024
commit f1e8b3f9ead60058327e763849aa25e33da1c947
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -376,3 376,6 @@ opt-level = 3
 opt-level = 3
 [profile.release.package.zstd-sys]
 opt-level = 3
 
 [patch.crates-io]
 deno_config = { path = "../deno_config" }
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
@@ -1966,9 1966,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]
@@ -2113,7 2112,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/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 _;