adapted new output model

Author: juiwenchen

pyproject.toml

@@ -77,7 +77,7 @@ codelinks = "sphinx_codelinks.cmd:app"
 "docs" = "sphinx-build -nW --keep-going -b html -T -c docs docs/source docs/_build/html"
 "docs:clean" = { chain = ["docs:rm", "docs"] }
 # needextend demo
-"analyse" = "codelinks analyse tests/data/analyse/default_config.toml"
+"analyse" = "codelinks analyse tests/data/configs/minimum_config.toml"
 "analyse:rm" = "rm -rf output/marked_content.json"
 "bridge" = "codelinks bridge output/marked_content.json --outdir tests/data/needextend_demo"
 "bridge:rm" = "rm -rf tests/data/needextend_demo/needextend.rst"

src/sphinx_codelinks/cmd.py

@@ -216,6 +216,49 @@ def discover(
         typer.echo(file_path)
 
 
+@app.command(no_args_is_help=True)
+def bridge(
+    jsonpath: Annotated[
+        Path,
+        typer.Argument(
+            ...,
+            help="Path of the JSON file which contains the extracted markers",
+            show_default=False,
+            dir_okay=False,
+            file_okay=True,
+            exists=True,
+            resolve_path=True,
+        ),
+    ],
+    outdir: Annotated[
+        Path,
+        typer.Option(
+            "--outdir",
+            "-o",
+            help="The output directory for needextend.rst",
+            show_default=True,
+            dir_okay=True,
+            file_okay=False,
+            exists=True,
+        ),
+    ] = Path.cwd(),  # noqa: B008  # to show default value in this CLI
+    remote_url_field: Annotated[
+        str,
+        typer.Option(
+            "--remote-url-field",
+            "-r",
+            help="The field name for the remote url",
+            show_default=True,
+        ),
+    ] = "remote_url",  # to show default value in this CLI
+    verbose: OptVerbose = False,
+    quiet: OptQuiet = False,
+) -> None:
+    """Generate needextend.rst from the extracted obj in JSON."""
+    logger.configure(verbose, quiet)
+    convert_marked_content(jsonpath, outdir, remote_url_field)
+
+
 def load_config_from_toml(toml_file: Path) -> CodeLinksConfigType:
     try:
         with toml_file.open("rb") as f:

src/sphinx_codelinks/needextend_bridge.py

@@ -168,10 +168,15 @@ def convert_marked_content(
 ) -> None:
     """Convert marked objects extracted by anaylse CLI to needextend in RST"""
     with jsonpath.open("r") as f:
-        marked_objs = json.load(f)
+        marked_content = json.load(f)
 
     warnings = []
 
+    # flatten objects
+    marked_objs: list[MarkedObjType] = [
+        obj for objs in marked_content.values() for obj in objs
+    ]
+
     need_id_refs = [
         obj
         for obj in marked_objs