fix: revert load_file to dict return, cache literal-dotted keys per path

- load_file() returns dict again (check/scan callers expect dict not tuple)
- New module-level _literal_dotted_cache keyed by resolved path
- get_literal_dotted_keys(path) retrieves cached set for fix command
- Restore baseline_path = Path(files[0]) before load in fix command
- Eliminates NameError on baseline_path and AttributeError on tuple.keys()

Author: Coding-Dev-Tools

src/configdrift/cli.py

@@ -45,7 +45,7 @@ def _json_null_handler(obj: Any) -> Any:
     Severity,
     diff_environments,
 )
-from configdrift.loader import load_file
+from configdrift.loader import get_literal_dotted_keys, load_file
 
 app = typer.Typer(
     name="configdrift",
@@ -322,14 +322,15 @@ def fix(
         False, "--dry-run", "-n", help="Show what would change without modifying files."
     ),
 ) -> None:
+    baseline_path = Path(files[0])
+    if not baseline_path.exists():
+        console.print(f"[red]ERROR: Baseline file not found: {baseline_path}[/red]")
+        raise typer.Exit(code=1)
     try:
-        baseline_data, baseline_literal_dotted = load_file(str(baseline_path))
+        baseline_data = load_file(str(baseline_path))
     except Exception as e:
         console.print(f"[red]Error loading baseline config: {e}[/red]")
         raise typer.Exit(code=1) from e
-    if not baseline_path.exists():
-        console.print(f"[red]ERROR: Baseline file not found: {baseline_path}[/red]")
-        raise typer.Exit(code=1)
 
 
     # Track targets that could not be fixed so the command returns a
@@ -346,7 +347,7 @@ def fix(
             continue
 
         try:
-            target_data, target_literal_dotted = load_file(str(target_path))
+            target_data = load_file(str(target_path))
         except Exception as e:
             console.print(f"[red]Error loading target config {target_path}: {e}[/red]")
             failed_targets.append(str(target_path))
@@ -488,7 +489,7 @@ def fix(
                 # source document are kept as single mapping keys rather
                 # than being re-split into nested levels.
                 # Merge literal dotted keys from both baseline and target
-                all_literal_dotted = baseline_literal_dotted | target_literal_dotted
+                all_literal_dotted = get_literal_dotted_keys(str(baseline_path)) | get_literal_dotted_keys(str(target_path))
                 nested: dict[str, Any] = {}
                 for k, v in target_data.items():
                     if "." not in k or k in all_literal_dotted:
@@ -504,7 +505,7 @@ def fix(
                 atomic_write_text(target_path, _json.dumps(nested, indent=2, default=_json_null_handler) + "\n")
             elif ext in (".yaml", ".yml"):
                 # Reconstruct nested structure from flat keys for YAML output
-                all_literal_dotted = baseline_literal_dotted | target_literal_dotted
+                all_literal_dotted = get_literal_dotted_keys(str(baseline_path)) | get_literal_dotted_keys(str(target_path))
                 nested: dict[str, Any] = {}
                 for k, v in target_data.items():
                     if "." not in k or k in all_literal_dotted:
@@ -542,7 +543,7 @@ def _has_null(val: Any) -> bool:
                         )
                         failed_targets.append(str(target_path))
                         continue
-                    all_literal_dotted = baseline_literal_dotted | target_literal_dotted
+                    all_literal_dotted = get_literal_dotted_keys(str(baseline_path)) | get_literal_dotted_keys(str(target_path))
                     nested_toml: dict[str, Any] = {}
                     for k, v in target_data.items():
                         if "." not in k or k in all_literal_dotted:

src/configdrift/loader.py

@@ -6,36 +6,56 @@
 from pathlib import Path
 from typing import Any
 
+_literal_dotted_cache: dict[str, set[str]] = {}
+
+
+def get_literal_dotted_keys(path: str) -> set[str]:
+    """Retrieve literal dotted keys stored by the most recent load_file(path) call."""
+    return _literal_dotted_cache.get(str(Path(path).resolve()), set())
+
+
 _toml = importlib.import_module("tomllib" if __import__("sys").version_info >= (3, 11) else "tomli")
 
 
-def load_file(path: str) -> tuple[dict[str, Any], set[str]]:
+def load_file(path: str) -> dict[str, Any]:
     """Load a config file based on its extension.
 
-    Returns a tuple of (flat_data, literal_dotted_keys) where
-    literal_dotted_keys is the set of top-level keys that already
-    contained dots in the original document.
+    Returns flat data with dot-separated keys for nested values.
+    Literal dotted keys (top-level keys already containing dots in the
+    source document) are stored internally and can be retrieved via
+    ``get_literal_dotted_keys(path)`` — used by the ``fix`` command to
+    avoid re-splitting them during reconstruction.
     """
     p = Path(path)
     ext = p.suffix.lower()
+    resolved = str(p.resolve())
     if ext in (".yaml", ".yml"):
-        return _load_yaml(p)
+        result, literal = _load_yaml(p)
+        _literal_dotted_cache[resolved] = literal
+        return result
     elif ext == ".json":
-        return _load_json(p)
+        result, literal = _load_json(p)
+        _literal_dotted_cache[resolved] = literal
+        return result
     elif ext == ".toml":
-        return _load_toml(p)
+        result, literal = _load_toml(p)
+        _literal_dotted_cache[resolved] = literal
+        return result
     elif ext == ".env":
-        return _load_dotenv(p), set()
+        _literal_dotted_cache[resolved] = set()
+        return _load_dotenv(p)
     else:
-        # Try known parsers in order
         for loader in [_load_yaml, _load_json, _load_toml]:
             try:
-                return loader(p)
+                result, literal = loader(p)
+                _literal_dotted_cache[resolved] = literal
+                return result
             except Exception:
                 continue
         # Last resort: try dotenv
         try:
-            return _load_dotenv(p), set()
+            _literal_dotted_cache[resolved] = set()
+            return _load_dotenv(p)
         except Exception:
             pass
         raise ValueError(f"Unsupported file format: {ext}") from None