mkdocs2confluence 0.8.1__tar.gz → 0.8.3__tar.gz

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.1
+Version: 0.8.3
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -326,7 +326,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -335,7 +335,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/README.md

@@ -286,7 +286,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -295,7 +295,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.8.1"
+version = "0.8.3"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.1
+Version: 0.8.3
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -326,7 +326,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -335,7 +335,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/src/mkdocs_to_confluence/cli.py

@@ -548,25 +548,33 @@ def _cmd_publish(args: argparse.Namespace) -> None:
     print(str(report))
 
     # Write page map so sync-comments can match source files to Confluence pages.
-    if not (getattr(args, "page", None) or getattr(args, "section", None)):
-        import json as _json_pm
+    # Always merge into the existing map so partial runs (--page/--section) and
+    # multiple configs pointing to the same repo root all accumulate correctly.
+    import json as _json_pm
+    try:
+        repo_root = config_path.parent
         try:
-            repo_root = config_path.parent
+            docs_rel = config.docs_dir.relative_to(repo_root)
+        except ValueError:
+            docs_rel = Path("docs")
+        new_entries = {
+            str(docs_rel / action.node.docs_path): action.page_id
+            for action in plan
+            if action.node.docs_path and action.page_id and not action.is_folder
+        }
+        pm_path = repo_root / ".mk2conf-pages.json"
+        existing: dict[str, str] = {}
+        if pm_path.exists():
             try:
-                docs_rel = config.docs_dir.relative_to(repo_root)
-            except ValueError:
-                docs_rel = Path("docs")
-            page_map = {
-                str(docs_rel / action.node.docs_path): action.page_id
-                for action in plan
-                if action.node.docs_path and action.page_id and not action.is_folder
-            }
-            pm_path = repo_root / ".mk2conf-pages.json"
-            pm_path.write_text(_json_pm.dumps(page_map, indent=2), encoding="utf-8")
-            if not getattr(args, "quiet", False):
-                print(f"Page map: {len(page_map)} page(s) → {pm_path.name}")
-        except Exception as exc:
-            print(f"  [warn] could not write page map: {exc}", file=sys.stderr)
+                existing = _json_pm.loads(pm_path.read_text(encoding="utf-8"))
+            except Exception:
+                pass
+        existing.update(new_entries)
+        pm_path.write_text(_json_pm.dumps(existing, indent=2), encoding="utf-8")
+        if not getattr(args, "quiet", False):
+            print(f"Page map: {len(existing)} page(s) → {pm_path.name}")
+    except Exception as exc:
+        print(f"  [warn] could not write page map: {exc}", file=sys.stderr)
 
     if getattr(args, "report", None):
         import json as _json

{mkdocs2confluence-0.8.1 → mkdocs2confluence-0.8.3}/tests/test_cli.py

@@ -27,7 +27,7 @@ def _minimal_config(tmp_path: Path, *, extra: str = "") -> Path:
         """),
         encoding="utf-8",
     )
-    (tmp_path / "docs").mkdir()
+    (tmp_path / "docs").mkdir(exist_ok=True)
     return yml
 
 
@@ -237,3 +237,59 @@ class TestWatchFlag:
             main(["preview", "--config", str(yml), "--page", "index.md", "--watch"])
 
         mock_render.assert_called_once()
+
+
+class TestPageMap:
+    """The page map (.mk2conf-pages.json) should merge on every publish run."""
+
+    def _run_publish(self, tmp_path: Path, plan_actions: list) -> None:
+        yml = _minimal_config(tmp_path)
+        (tmp_path / "docs").mkdir(exist_ok=True)
+        (tmp_path / "docs" / "index.md").write_text("# Home\n", encoding="utf-8")
+        mock_client = MagicMock()
+        mock_client.__enter__ = MagicMock(return_value=mock_client)
+        mock_client.__exit__ = MagicMock(return_value=False)
+        mock_client.get_space_id.return_value = "~SPACE"
+        with patch("mkdocs_to_confluence.publisher.client.ConfluenceClient", return_value=mock_client), \
+             patch("mkdocs_to_confluence.publisher.pipeline.plan_publish", return_value=plan_actions), \
+             patch("mkdocs_to_confluence.publisher.pipeline.execute_publish", return_value=MagicMock(
+                 __str__=lambda s: "0 created",
+                 errors=[],
+             )), \
+             patch("sys.stdout.isatty", return_value=False):
+            main(["publish", "--config", str(yml), "--quiet"])
+
+    def _make_action(self, docs_path: str, page_id: str) -> MagicMock:
+        action = MagicMock()
+        action.node.docs_path = docs_path
+        action.page_id = page_id
+        action.is_folder = False
+        return action
+
+    def test_page_map_written_on_full_publish(self, tmp_path: Path) -> None:
+        action = self._make_action("index.md", "111")
+        self._run_publish(tmp_path, [action])
+        import json
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        assert "docs/index.md" in pm
+        assert pm["docs/index.md"] == "111"
+
+    def test_page_map_merges_on_second_publish(self, tmp_path: Path) -> None:
+        import json
+        # First publish: index.md
+        self._run_publish(tmp_path, [self._make_action("index.md", "111")])
+        # Second publish: overview.md only
+        self._run_publish(tmp_path, [self._make_action("overview.md", "222")])
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        # Both entries should be present
+        assert pm.get("docs/index.md") == "111"
+        assert pm.get("docs/overview.md") == "222"
+
+    def test_page_map_merge_updates_existing_entry(self, tmp_path: Path) -> None:
+        import json
+        # First publish: index.md with page_id 111
+        self._run_publish(tmp_path, [self._make_action("index.md", "111")])
+        # Second publish: same file, new page_id (e.g. recreated)
+        self._run_publish(tmp_path, [self._make_action("index.md", "999")])
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        assert pm["docs/index.md"] == "999"