fix: add support for temlpate values in mod.toml

Author: Yarden-zamir

README.md

@@ -40,6 +40,7 @@ curseforge_slug = "your-mod-slug"
 ```
 
 `loader` must be `forge`.
+Template placeholders like `${...}` are not allowed in `[mc-publish]` values.
 
 Dependencies are read directly from `mods.toml` by mc-publish. No `dependencies.txt` is used.
 Only Forge is supported; `mods.toml` is required and is the single source of metadata.

scripts/mods_toml.py

@@ -40,6 +40,39 @@ def find_mods_toml(root: Path) -> Path:
     return paths[0]
 
 
+def strip_inline_comment(line: str) -> str:
+    return line.split("#", 1)[0].strip()
+
+
+def is_table_header(line: str) -> bool:
+    stripped = strip_inline_comment(line)
+    return stripped.startswith("[") and stripped.endswith("]")
+
+
+def is_mc_publish_header(line: str) -> bool:
+    stripped = strip_inline_comment(line)
+    return stripped.startswith("[mc-publish") or stripped.startswith("[[mc-publish")
+
+
+def extract_mc_publish_block(text: str) -> str:
+    lines = text.splitlines()
+    header_indices = [index for index, line in enumerate(lines) if strip_inline_comment(line) == "[mc-publish]"]
+    if not header_indices:
+        fail("Missing [mc-publish] table in mods.toml")
+    if len(header_indices) > 1:
+        fail("Multiple [mc-publish] tables found in mods.toml")
+
+    start_index = header_indices[0]
+    end_index = len(lines)
+    for index in range(start_index + 1, len(lines)):
+        if is_table_header(lines[index]) and not is_mc_publish_header(lines[index]):
+            end_index = index
+            break
+
+    block_lines = lines[start_index:end_index]
+    return "\n".join(block_lines) + "\n"
+
+
 def normalize_value(value: object | None) -> str | None:
     if value is None:
         return None
@@ -51,7 +84,8 @@ def normalize_value(value: object | None) -> str | None:
 
 def read_metadata(mods_toml: Path) -> dict[str, str]:
     try:
-        data = tomllib.loads(mods_toml.read_text())
+        block_text = extract_mc_publish_block(mods_toml.read_text())
+        data = tomllib.loads(block_text)
     except tomllib.TOMLDecodeError as exc:
         fail(f"Invalid TOML in {mods_toml}: {exc}")
 
@@ -70,6 +104,8 @@ def read_metadata(mods_toml: Path) -> dict[str, str]:
         if value is None:
             missing.append(key)
             continue
+        if "${" in value:
+            fail(f"[mc-publish].{key} contains a template placeholder: {value}")
         values[key] = value
 
     if missing:

setup.py

@@ -93,7 +93,10 @@ def find_mods_toml() -> Path:
 
 def read_mc_publish_table(mods_toml: Path) -> dict[str, str]:
     try:
-        data = tomllib.loads(mods_toml.read_text())
+        block_text = extract_mc_publish_block(mods_toml.read_text())
+        if block_text is None:
+            return {}
+        data = tomllib.loads(block_text)
     except tomllib.TOMLDecodeError as exc:
         sys.exit(f"ERROR: Invalid TOML in {mods_toml}: {exc}")
     table = data.get("mc-publish")
@@ -107,6 +110,8 @@ def read_mc_publish_table(mods_toml: Path) -> dict[str, str]:
 def validate_file_value(name: str, value: str) -> tuple[bool, str]:
     if not value.strip():
         return False, "value cannot be empty"
+    if "${" in value:
+        return False, "value contains a template placeholder"
     if name == "loader" and value not in ALLOWED_LOADERS:
         allowed_list = ", ".join(sorted(ALLOWED_LOADERS))
         return False, f"loader must be one of: {allowed_list}"
@@ -129,6 +134,30 @@ def is_table_header(line: str) -> bool:
     return stripped.startswith("[") and stripped.endswith("]")
 
 
+def is_mc_publish_header(line: str) -> bool:
+    stripped = strip_inline_comment(line)
+    return stripped.startswith("[mc-publish") or stripped.startswith("[[mc-publish")
+
+
+def extract_mc_publish_block(text: str) -> str | None:
+    lines = text.splitlines()
+    header_indices = [index for index, line in enumerate(lines) if strip_inline_comment(line) == "[mc-publish]"]
+    if not header_indices:
+        return None
+    if len(header_indices) > 1:
+        sys.exit("ERROR: Multiple [mc-publish] tables found in mods.toml")
+
+    start_index = header_indices[0]
+    end_index = len(lines)
+    for index in range(start_index + 1, len(lines)):
+        if is_table_header(lines[index]) and not is_mc_publish_header(lines[index]):
+            end_index = index
+            break
+
+    block_lines = lines[start_index:end_index]
+    return "\n".join(block_lines) + "\n"
+
+
 def build_mc_publish_block(values: dict[str, str], ordered_keys: list[str]) -> list[str]:
     lines = ["[mc-publish]"]
     for key in ordered_keys:
@@ -148,7 +177,7 @@ def update_mc_publish_block(mods_toml: Path, values: dict[str, str], ordered_key
     if start_index is not None:
         end_index = len(lines)
         for index in range(start_index + 1, len(lines)):
-            if is_table_header(lines[index]):
+            if is_table_header(lines[index]) and not is_mc_publish_header(lines[index]):
                 end_index = index
                 break
         block_lines = lines[start_index + 1 : end_index]