accept .gitignored and hidden files on publish

also affects the formatter

Author: PgBiel

compiler-cli/src/format.rs

@@ -79,7 +79,7 @@ pub fn unformatted_files(files: Vec<String>) -> Result<Vec<Unformatted>> {
         })?;
 
         if path.is_dir() {
-            for path in crate::fs::gleam_files_excluding_gitignore(&path) {
+            for path in crate::fs::gleam_files(&path) {
                 format_file(&mut problem_files, path)?;
             }
         } else {

compiler-cli/src/fs.rs

@@ -389,10 +389,14 @@ fn is_gleam_build_dir(e: &ignore::DirEntry) -> bool {
     parent_path.join("gleam.toml").exists()
 }
 
-pub fn gleam_files_excluding_gitignore(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
+/// Walks through all Gleam module files in the directory, even if ignored,
+/// except for those in the `build/` directory. Excludes any Gleam files within
+/// invalid module paths, for example if they or a folder they're in contain a
+/// dot or a hyphen within their names.
+pub fn gleam_files(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
     ignore::WalkBuilder::new(dir)
         .follow_links(true)
-        .require_git(false)
+        .standard_filters(false)
         .filter_entry(|e| !is_gleam_build_dir(e))
         .build()
         .filter_map(Result::ok)
@@ -402,10 +406,12 @@ pub fn gleam_files_excluding_gitignore(dir: &Utf8Path) -> impl Iterator<Item = U
         .filter(move |d| is_gleam_path(d, dir))
 }
 
-pub fn native_files_excluding_gitignore(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
+/// Walks through all native files in the directory, such as `.mjs` and `.erl`,
+/// even if ignored.
+pub fn native_files(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
     ignore::WalkBuilder::new(dir)
         .follow_links(true)
-        .require_git(false)
+        .standard_filters(false)
         .filter_entry(|e| !is_gleam_build_dir(e))
         .build()
         .filter_map(Result::ok)
@@ -418,19 +424,19 @@ pub fn native_files_excluding_gitignore(dir: &Utf8Path) -> impl Iterator<Item =
         })
 }
 
-pub fn private_files_excluding_gitignore(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
+/// Walks through all files in the directory, even if ignored.
+pub fn private_files(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
     ignore::WalkBuilder::new(dir)
         .follow_links(true)
-        .require_git(false)
+        .standard_filters(false)
         .build()
         .filter_map(Result::ok)
         .filter(|e| e.file_type().map(|t| t.is_file()).unwrap_or(false))
         .map(ignore::DirEntry::into_path)
         .map(|pb| Utf8PathBuf::from_path_buf(pb).expect("Non Utf-8 Path"))
 }
 
-/// Walks through Erlang files in the directory. Does not exclude files ignored
-/// through `.gitignore`.
+/// Walks through all `.erl` and `.hrl` files in the directory, even if ignored.
 pub fn erlang_files(dir: &Utf8Path) -> impl Iterator<Item = Utf8PathBuf> + '_ {
     ignore::WalkBuilder::new(dir)
         .follow_links(true)

compiler-cli/src/fs/tests.rs

@@ -73,7 +73,7 @@ fn exclude_build_dir() {
     let gleam_file = path.join("b/build/f.gleam").to_path_buf();
     super::write(&gleam_file, "").unwrap();
 
-    let files = super::gleam_files_excluding_gitignore(path).collect::<Vec<_>>();
+    let files = super::gleam_files(path).collect::<Vec<_>>();
 
     assert_eq!(files, vec![gleam_file]);
 }

compiler-cli/src/publish.rs

@@ -470,12 +470,11 @@ fn contents_tarball(
 
 fn project_files(base_path: &Utf8Path) -> Result<Vec<Utf8PathBuf>> {
     let src = base_path.join(Utf8Path::new("src"));
-    let mut files: Vec<Utf8PathBuf> = fs::gleam_files_excluding_gitignore(&src)
-        .chain(fs::native_files_excluding_gitignore(&src))
+    let mut files: Vec<Utf8PathBuf> = fs::gleam_files(&src)
+        .chain(fs::native_files(&src))
         .collect();
     let private = base_path.join(Utf8Path::new("priv"));
-    let mut private_files: Vec<Utf8PathBuf> =
-        fs::private_files_excluding_gitignore(&private).collect();
+    let mut private_files: Vec<Utf8PathBuf> = fs::private_files(&private).collect();
     files.append(&mut private_files);
     let mut add = |path| {
         let path = base_path.join(path);
@@ -789,22 +788,33 @@ fn exported_project_files_test() {
         "README.md",
         "README.txt",
         "gleam.toml",
+        "priv/ignored",
         "priv/wibble",
         "priv/wobble.js",
+        "src/.hidden/hidden_ffi.erl",
+        "src/.hidden/hidden_ffi.mjs",
+        "src/.hidden_ffi.erl",
+        "src/.hidden_ffi.mjs",
         "src/exported.gleam",
         "src/exported_ffi.erl",
         "src/exported_ffi.ex",
         "src/exported_ffi.hrl",
         "src/exported_ffi.js",
         "src/exported_ffi.mjs",
         "src/exported_ffi.ts",
+        "src/ignored.gleam",
+        "src/ignored_ffi.erl",
+        "src/ignored_ffi.mjs",
         "src/nested/exported.gleam",
         "src/nested/exported_ffi.erl",
         "src/nested/exported_ffi.ex",
         "src/nested/exported_ffi.hrl",
         "src/nested/exported_ffi.js",
         "src/nested/exported_ffi.mjs",
         "src/nested/exported_ffi.ts",
+        "src/nested/ignored.gleam",
+        "src/nested/ignored_ffi.erl",
+        "src/nested/ignored_ffi.mjs",
     ];
 
     let unexported_project_files = &[
@@ -813,20 +823,9 @@ fn exported_project_files_test() {
         ".gitignore",
         "build/",
         "ignored.txt",
-        "priv/ignored",
-        "src/.hidden/hidden.gleam",
-        "src/.hidden/hidden_ffi.erl",
-        "src/.hidden/hidden_ffi.mjs",
-        "src/.hidden.gleam",
-        "src/.hidden_ffi.erl",
-        "src/.hidden_ffi.mjs",
-        "src/also-ignored.gleam",
-        "src/ignored.gleam",
-        "src/ignored_ffi.mjs",
-        "src/ignored_ffi.erl",
-        "src/nested/ignored.gleam",
-        "src/nested/ignored_ffi.erl",
-        "src/nested/ignored_ffi.mjs",
+        "src/.hidden/hidden.gleam", // Not a valid Gleam module path
+        "src/.hidden.gleam",        // Not a valid Gleam module name
+        "src/also-ignored.gleam",   // Not a valid Gleam module name
         "test/exported_test.gleam",
         "test/exported_test_ffi.erl",
         "test/exported_test_ffi.ex",
@@ -847,6 +846,7 @@ fn exported_project_files_test() {
         "test/nested/ignored.gleam",
         "test/nested/ignored_test_ffi.erl",
         "test/nested/ignored_test_ffi.mjs",
+        "unrelated-file.txt",
     ];
 
     let gitignore = "ignored*