`b3febff`

Allow next ordered root link seeds

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 week ago

SHA: b3febff98ddb626c6567c002f311afb2e5503e5d
Parents: 67643a7
Tree: b522f6f

2 changed files

Status	File	+	-
M	`src/loader/runtime/safeguard_services.py`	63	2
M	`tests/test_safeguard_services.py`	96	0

src/loader/runtime/safeguard_services.pymodified

  def _html_target_tokens(target: str) -> set[str]:
      stem = Path(target).stem.lower()
      return {token for token in re.split(r"[^a-z0-9]+", stem) if token}
++
++
 +def _ordered_html_target_number(target: str) -> int | None:
 +    match = re.match(r"(\d+)[-_]", Path(target).name)
 +    if match is None:
 +        return None
 +    try:
 +        return int(match.group(1))
 +    except ValueError:
 +        return None
++
++
  TEXT_REWRITE_FILENAMES = frozenset(
+     {
          "dockerfile",
          missing_after = self._collect_missing_local_html_targets(normalized, content)
          if not missing_after:
              return False
 -        if len(missing_after) > len(self._collect_existing_missing_local_html_targets(normalized)):
 +        existing_missing = self._collect_existing_missing_local_html_targets(normalized)
 +        if len(missing_after) > len(existing_missing):
 +            declared_targets, authoritative_root_graph = self._collect_declared_html_targets(
 +                root,
 +                normalized,
 +            )
 +            if not authoritative_root_graph:
 +                return False
 +            newly_missing = [
 +                href
 +                for href in missing_after
 +                if href not in existing_missing
 +            ]
 +            if not newly_missing:
 +                return False
 +            if any(
 +                not self._is_next_ordered_html_target(root, href, declared_targets)
 +                for href in newly_missing
 +            ):
                  return False
          for href in missing:
                  return False
          return True
 +    def _is_next_ordered_html_target(
 +        self,
 +        root: Path,
 +        href: str,
 +        declared_targets: set[str],
 +    ) -> bool:
 +        relative_href = self._relative_html_target(root, (root / href).resolve(strict=False))
 +        if relative_href is None:
 +            return False
++
 +        expected_number = _ordered_html_target_number(relative_href)
 +        if expected_number is None:
 +            return False
++
 +        parent = Path(relative_href).parent
 +        sibling_numbers = sorted(
 +            number
 +            for target in declared_targets
 +            if Path(target).parent == parent
 +            if (number := _ordered_html_target_number(target)) is not None
 +        )
 +        if not sibling_numbers:
 +            return False
++
 +        min_number = sibling_numbers[0]
 +        max_number = sibling_numbers[-1]
 +        if expected_number != max_number + 1:
 +            return False
++
 +        return sibling_numbers == list(range(min_number, max_number + 1))
++
      def _collect_existing_missing_local_html_targets(self, file_path: Path) -> list[str]:
          try:
              current = file_path.read_text()

tests/test_safeguard_services.pymodified

      assert result.valid is True
 +def test_pre_action_validator_allows_root_index_to_add_next_ordered_missing_sibling(
 +    tmp_path: Path,
 +) -> None:
 +    validator = PreActionValidator()
 +    guide = tmp_path / "guide"
 +    chapters = guide / "chapters"
 +    chapters.mkdir(parents=True)
 +    index = guide / "index.html"
 +    index.write_text(
 +        "\n".join(
 +            [
 +                '<li><a href="chapters/01-introduction.html">Chapter 1: Introduction</a></li>',
 +                '<li><a href="chapters/02-installation.html">Chapter 2: Installation</a></li>',
 +                '<li><a href="chapters/03-configuration.html">Chapter 3: Configuration</a></li>',
 +                '<li><a href="chapters/04-usage.html">Chapter 4: Usage</a></li>',
 +                '<li><a href="chapters/05-advanced-topics.html">Chapter 5: Advanced Topics</a></li>',
 +                "",
 +            ]
 +        )
 +    )
 +    for name in [
 +        "01-introduction.html",
 +        "02-installation.html",
 +        "03-configuration.html",
 +        "04-usage.html",
 +        "05-advanced-topics.html",
 +    ]:
 +        (chapters / name).write_text("<html></html>\n")
++
 +    result = validator.validate(
 +        "edit",
 +        {
 +            "file_path": str(index),
 +            "old_string": (
 +                '<li><a href="chapters/05-advanced-topics.html">'
 +                "Chapter 5: Advanced Topics</a></li>"
 +            ),
 +            "new_string": (
 +                '<li><a href="chapters/05-advanced-topics.html">'
 +                "Chapter 5: Advanced Topics</a></li>\n"
 +                '<li><a href="chapters/06-troubleshooting.html">'
 +                "Chapter 6: Troubleshooting</a></li>"
 +            ),
 +        },
 +    )
++
 +    assert result.valid is True
++
++
 +def test_pre_action_validator_blocks_root_index_from_skipping_to_far_missing_sibling(
 +    tmp_path: Path,
 +) -> None:
 +    validator = PreActionValidator()
 +    guide = tmp_path / "guide"
 +    chapters = guide / "chapters"
 +    chapters.mkdir(parents=True)
 +    index = guide / "index.html"
 +    index.write_text(
 +        "\n".join(
 +            [
 +                '<li><a href="chapters/01-introduction.html">Chapter 1: Introduction</a></li>',
 +                '<li><a href="chapters/02-installation.html">Chapter 2: Installation</a></li>',
 +                '<li><a href="chapters/03-configuration.html">Chapter 3: Configuration</a></li>',
 +                "",
 +            ]
 +        )
 +    )
 +    for name in [
 +        "01-introduction.html",
 +        "02-installation.html",
 +        "03-configuration.html",
 +    ]:
 +        (chapters / name).write_text("<html></html>\n")
++
 +    result = validator.validate(
 +        "edit",
 +        {
 +            "file_path": str(index),
 +            "old_string": (
 +                '<li><a href="chapters/03-configuration.html">'
 +                "Chapter 3: Configuration</a></li>"
 +            ),
 +            "new_string": (
 +                '<li><a href="chapters/03-configuration.html">'
 +                "Chapter 3: Configuration</a></li>\n"
 +                '<li><a href="chapters/08-troubleshooting.html">'
 +                "Chapter 8: Troubleshooting</a></li>"
 +            ),
 +        },
 +    )
++
 +    assert result.valid is False
 +    assert result.reason == "Edited HTML links point to files that do not exist"
 +    assert "chapters/08-troubleshooting.html" in result.suggestion
++
++
  def test_pre_action_validator_blocks_index_edit_with_title_mismatch(tmp_path) -> None:
      validator = PreActionValidator()
      index = tmp_path / "index.html"