Add .treemapper/ config directory support for ignore and whitelist

Author: nikolay-e

.treemapperignore .treemapper/ignore.treemapperignore renamed to .treemapper/ignore

@@ -3,7 +3,6 @@
 .pytest_cache
 .coverage
 htmlcov
-.treemapperignore
 *.yaml
 *.yml
 tests

src/treemapper/cli.py

@@ -127,7 +127,12 @@ class ParsedArgs:
 
 Ignore files (hierarchical, like git):
   .gitignore            Standard git ignore patterns
-  .treemapperignore     TreeMapper-specific patterns
+  .treemapper/ignore    TreeMapper-specific patterns (preferred)
+  .treemapperignore     TreeMapper-specific patterns (legacy)
+
+Whitelist files (auto-discovered):
+  .treemapper/whitelist  Include-only filter (preferred)
+  .treemapperwhitelist   Include-only filter (legacy)
 """
 
 

src/treemapper/ignore.py

@@ -6,6 +6,10 @@
 
 import pathspec
 
+TREEMAPPER_CONFIG_DIR = ".treemapper"
+TREEMAPPER_DIR_IGNORE = "ignore"
+TREEMAPPER_DIR_WHITELIST = "whitelist"
+
 
 def read_ignore_file(file_path: Path) -> list[str]:
     ignore_patterns: list[str] = []
@@ -57,6 +61,7 @@ def _get_output_file_pattern(output_file: Path | None, root_dir: Path) -> str |
         ".git",
         ".svn",
         ".hg",
+        ".treemapper",
         "__pycache__",
         "node_modules",
         ".npm",
@@ -105,17 +110,19 @@ def _aggregate_all_ignore_patterns(root: Path, ignore_filenames: list[str]) -> l
     for dirpath, dirnames, filenames in os.walk(root, topdown=True):
         dirnames[:] = sorted(d for d in dirnames if d not in PRUNE_DIRS and not _is_cache_dir(d))
 
-        found_files = filenames_set & set(filenames)
-        if not found_files:
-            continue
-
         ignore_dir = Path(dirpath)
         rel = "" if ignore_dir == root else ignore_dir.relative_to(root).as_posix()
 
+        found_files = filenames_set & set(filenames)
         for ignore_filename in sorted(found_files):
             for line in read_ignore_file(ignore_dir / ignore_filename):
                 out.append(_process_ignore_line(line, rel))
 
+        config_ignore = ignore_dir / TREEMAPPER_CONFIG_DIR / TREEMAPPER_DIR_IGNORE
+        if config_ignore.is_file():
+            for line in read_ignore_file(config_ignore):
+                out.append(_process_ignore_line(line, rel))
+
     logging.debug("Aggregated %d ignore patterns from %s", len(out), root)
     return out
 
@@ -184,6 +191,9 @@ def _collect_parent_ignore_patterns(root: Path, ignore_filenames: list[str]) ->
         for filename in ignore_filenames:
             _process_parent_ignore_file(current / filename, resolved_root, current, out)
 
+        config_ignore = current / TREEMAPPER_CONFIG_DIR / TREEMAPPER_DIR_IGNORE
+        _process_parent_ignore_file(config_ignore, resolved_root, current, out)
+
         if is_git_root:
             break
 
@@ -232,7 +242,8 @@ def _collect_parent_ignore_patterns(root: Path, ignore_filenames: list[str]) ->
     # OS files
     "**/.DS_Store",
     "**/Thumbs.db",
-    # TreeMapper default output files
+    # TreeMapper config and output files
+    "**/.treemapper/",
     "**/tree.yaml",
     "**/tree.yml",
     "**/tree.json",
@@ -280,9 +291,13 @@ def should_ignore(relative_path_str: str, combined_spec: pathspec.PathSpec) -> b
 def get_whitelist_spec(whitelist_file: Path | None, root_dir: Path | None = None) -> pathspec.PathSpec | None:
     effective_file = whitelist_file
     if not effective_file and root_dir:
-        default = root_dir / DEFAULT_WHITELIST_FILENAME
-        if default.is_file():
-            effective_file = default
+        config_whitelist = root_dir / TREEMAPPER_CONFIG_DIR / TREEMAPPER_DIR_WHITELIST
+        if config_whitelist.is_file():
+            effective_file = config_whitelist
+        else:
+            default = root_dir / DEFAULT_WHITELIST_FILENAME
+            if default.is_file():
+                effective_file = default
     if not effective_file:
         return None
     patterns = read_ignore_file(effective_file)

tests/test_ignore.py

@@ -534,3 +534,138 @@ def test_parent_ignore_stops_at_git_root(tmp_path, run_mapper):
     assert find_node_by_path(result, ["beyond_git_root"]) is not None
     assert find_node_by_path(result, ["beyond_git_root", "visible.txt"]) is not None
     assert find_node_by_path(result, ["keep.txt"]) is not None
+
+
+# --- .treemapper/ config directory tests ---
+
+
+def test_treemapper_dir_ignore(temp_project, run_mapper):
+    from .utils import find_node_by_path
+
+    config_dir = temp_project / ".treemapper"
+    config_dir.mkdir(exist_ok=True)
+    (config_dir / "ignore").write_text("*.log\ndocs/\n")
+    (temp_project / "app.log").touch()
+    (temp_project / "keep.txt").touch()
+
+    output_path = temp_project / "dir_ignore_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+
+    assert find_node_by_path(result, ["app.log"]) is None
+    assert find_node_by_path(result, ["docs"]) is None
+    assert find_node_by_path(result, ["keep.txt"]) is not None
+
+
+def test_treemapper_dir_ignore_combined_with_legacy(temp_project, run_mapper):
+    from .utils import find_node_by_path
+
+    (temp_project / ".treemapperignore").write_text("*.tmp\n")
+    config_dir = temp_project / ".treemapper"
+    config_dir.mkdir(exist_ok=True)
+    (config_dir / "ignore").write_text("*.bak\n")
+    (temp_project / "file.tmp").touch()
+    (temp_project / "file.bak").touch()
+    (temp_project / "file.txt").touch()
+
+    output_path = temp_project / "combined_dir_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+
+    assert find_node_by_path(result, ["file.tmp"]) is None
+    assert find_node_by_path(result, ["file.bak"]) is None
+    assert find_node_by_path(result, ["file.txt"]) is not None
+
+
+def test_treemapper_dir_ignore_hierarchical(temp_project, run_mapper):
+    from .utils import find_node_by_path
+
+    subdir = temp_project / "subdir"
+    subdir.mkdir()
+    sub_config = subdir / ".treemapper"
+    sub_config.mkdir()
+    (sub_config / "ignore").write_text("*.secret\n")
+
+    (temp_project / "root.secret").touch()
+    (subdir / "nested.secret").touch()
+    (subdir / "keep.txt").touch()
+
+    output_path = temp_project / "hier_dir_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+
+    assert find_node_by_path(result, ["root.secret"]) is not None
+    assert find_node_by_path(result, ["subdir", "nested.secret"]) is None
+    assert find_node_by_path(result, ["subdir", "keep.txt"]) is not None
+
+
+def test_treemapper_dir_ignore_parent(tmp_path, run_mapper):
+    from .utils import find_node_by_path
+
+    parent = tmp_path / "parent_project"
+    parent.mkdir()
+    (parent / ".git").mkdir()
+    config_dir = parent / ".treemapper"
+    config_dir.mkdir()
+    (config_dir / "ignore").write_text("packages/app/secret_dir/\n")
+
+    child = parent / "packages" / "app"
+    child.mkdir(parents=True)
+    (child / "secret_dir").mkdir()
+    (child / "secret_dir" / "secret.txt").write_text("secret")
+    (child / "src").mkdir()
+    (child / "src" / "main.py").write_text("print('hello')")
+
+    output_path = tmp_path / "parent_dir_output.yaml"
+    assert run_mapper([str(child), "-o", str(output_path)])
+    result = load_yaml(output_path)
+
+    assert find_node_by_path(result, ["secret_dir"]) is None
+    assert find_node_by_path(result, ["src", "main.py"]) is not None
+
+
+def test_treemapper_dir_whitelist(temp_project, run_mapper):
+    config_dir = temp_project / ".treemapper"
+    config_dir.mkdir(exist_ok=True)
+    (config_dir / "whitelist").write_text("src/**/*.py\n")
+
+    output_path = temp_project / "dir_wl_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+    all_files = get_all_files_in_tree(result)
+
+    assert "main.py" in all_files
+    assert "test.py" in all_files
+    assert "readme.md" not in all_files
+
+
+def test_treemapper_dir_hidden_from_output(temp_project, run_mapper):
+    config_dir = temp_project / ".treemapper"
+    config_dir.mkdir(exist_ok=True)
+    (config_dir / "ignore").write_text("*.log\n")
+    (config_dir / "whitelist").write_text("src/**\n")
+    (temp_project / "keep.txt").touch()
+
+    output_path = temp_project / "hidden_dir_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+    all_files = get_all_files_in_tree(result)
+
+    assert ".treemapper" not in all_files
+    assert "ignore" not in all_files
+    assert "whitelist" not in all_files
+
+
+def test_treemapper_dir_whitelist_over_legacy(temp_project, run_mapper):
+    (temp_project / ".treemapperwhitelist").write_text("docs/**\n")
+    config_dir = temp_project / ".treemapper"
+    config_dir.mkdir(exist_ok=True)
+    (config_dir / "whitelist").write_text("src/**/*.py\n")
+
+    output_path = temp_project / "wl_precedence_output.yaml"
+    assert run_mapper([".", "-o", str(output_path)])
+    result = load_yaml(output_path)
+    all_files = get_all_files_in_tree(result)
+
+    assert "main.py" in all_files
+    assert "readme.md" not in all_files