Resolve output paths relative to plain file

Author: pedjaradenkovic

plain2code_arguments.py

@@ -19,6 +19,8 @@
 DEFAULT_LOG_FILE_NAME = "codeplain.log"
 PREPARE_ENVIRONMENT_SCRIPT_NAME = "prepare_environment_script"
 
+FOLDER_ARGS = ["build_folder", "conformance_tests_folder", "build_dest", "conformance_tests_dest", "base_folder"]
+
 
 def process_test_script_path(script_arg_name, config):
     """Resolve script paths in config."""
@@ -119,6 +121,22 @@ def resolve_config_file(config_name: str, plain_file_path: str):
     return None
 
 
+def resolve_output_paths(args):
+    """Resolve relative output folder paths to be relative to the plain file directory.
+
+    All relative paths (whether from command line, config file, or defaults) are anchored
+    to the directory of the plain file being rendered, not the current working directory.
+    """
+    plain_file_dir = os.path.dirname(os.path.abspath(args.filename))
+
+    for arg_name in FOLDER_ARGS:
+        value = getattr(args, arg_name, None)
+        if value and not os.path.isabs(value):
+            setattr(args, arg_name, os.path.normpath(os.path.join(plain_file_dir, value)))
+
+    return args
+
+
 def update_args_with_config(args, parser):
     try:
         resolved_config = resolve_config_file(args.config_name, args.filename)
@@ -350,6 +368,7 @@ def parse_arguments():
 
     args = parser.parse_args()
     args = update_args_with_config(args, parser)
+    args = resolve_output_paths(args)
 
     if args.build_folder == args.build_dest:
         parser.error("--build-folder and --build-dest cannot be the same")

tests/test_resolve_output_paths.py

@@ -0,0 +1,85 @@
+import os
+import tempfile
+from argparse import Namespace
+
+import pytest
+
+from plain2code_arguments import (
+    DEFAULT_BUILD_DEST,
+    DEFAULT_BUILD_FOLDER,
+    DEFAULT_CONFORMANCE_TESTS_DEST,
+    DEFAULT_CONFORMANCE_TESTS_FOLDER,
+    resolve_output_paths,
+)
+
+
+def _make_args(plain_file, **kwargs):
+    """Build a minimal Namespace mimicking parsed args."""
+    defaults = dict(
+        filename=plain_file,
+        build_folder=DEFAULT_BUILD_FOLDER,
+        conformance_tests_folder=DEFAULT_CONFORMANCE_TESTS_FOLDER,
+        build_dest=DEFAULT_BUILD_DEST,
+        conformance_tests_dest=DEFAULT_CONFORMANCE_TESTS_DEST,
+        base_folder=None,
+    )
+    defaults.update(kwargs)
+    return Namespace(**defaults)
+
+
+def test_default_folders_resolve_to_plain_file_dir():
+    with tempfile.TemporaryDirectory() as plain_dir:
+        plain_file = os.path.join(plain_dir, "module.plain")
+        args = resolve_output_paths(_make_args(plain_file))
+
+        assert args.build_folder == os.path.join(plain_dir, DEFAULT_BUILD_FOLDER)
+        assert args.conformance_tests_folder == os.path.join(plain_dir, DEFAULT_CONFORMANCE_TESTS_FOLDER)
+        assert args.build_dest == os.path.join(plain_dir, DEFAULT_BUILD_DEST)
+        assert args.conformance_tests_dest == os.path.join(plain_dir, DEFAULT_CONFORMANCE_TESTS_DEST)
+
+
+def test_relative_path_from_config_resolves_to_plain_file_dir():
+    """A relative build_folder set in config (e.g. '../build') resolves relative to the plain file."""
+    with tempfile.TemporaryDirectory() as plain_dir:
+        plain_file = os.path.join(plain_dir, "module.plain")
+        args = resolve_output_paths(_make_args(plain_file, build_folder="../build"))
+
+        assert args.build_folder == os.path.normpath(os.path.join(plain_dir, "../build"))
+        assert os.path.isabs(args.build_folder)
+
+
+def test_absolute_path_left_unchanged():
+    with tempfile.TemporaryDirectory() as plain_dir:
+        plain_file = os.path.join(plain_dir, "module.plain")
+        abs_path = "/some/absolute/path"
+        args = resolve_output_paths(_make_args(plain_file, build_folder=abs_path))
+
+        assert args.build_folder == abs_path
+
+
+def test_base_folder_none_stays_none():
+    with tempfile.TemporaryDirectory() as plain_dir:
+        plain_file = os.path.join(plain_dir, "module.plain")
+        args = resolve_output_paths(_make_args(plain_file, base_folder=None))
+
+        assert args.base_folder is None
+
+
+def test_base_folder_relative_resolves_to_plain_file_dir():
+    with tempfile.TemporaryDirectory() as plain_dir:
+        plain_file = os.path.join(plain_dir, "module.plain")
+        args = resolve_output_paths(_make_args(plain_file, base_folder="base"))
+
+        assert args.build_folder == os.path.join(plain_dir, DEFAULT_BUILD_FOLDER)
+        assert args.base_folder == os.path.join(plain_dir, "base")
+
+
+def test_plain_file_in_subdirectory():
+    """Plain file in a subdirectory — all defaults land next to it, not at CWD."""
+    with tempfile.TemporaryDirectory() as root:
+        sub = os.path.join(root, "b", "c")
+        os.makedirs(sub)
+        plain_file = os.path.join(sub, "example.plain")
+        args = resolve_output_paths(_make_args(plain_file))
+
+        assert args.build_folder == os.path.join(sub, DEFAULT_BUILD_FOLDER)