feat: Add ability to read from file and find start point

sphinxext_altair/altairplot.py

@@ -69,6 +69,7 @@
 from docutils import nodes
 from docutils.parsers.rst import Directive
 from docutils.parsers.rst.directives import flag, unchanged
+from sphinx.directives.code import LiteralIncludeReader
 from sphinx.locale import _
 
 import altair as alt
@@ -156,6 +157,9 @@ def validate_output(output: str) -> str:
 
 class AltairPlotDirective(Directive):
     has_content: ClassVar[bool] = True
+    required_arguments: ClassVar[int] = 0
+    optional_arguments: ClassVar[int] = 1
+    final_argument_whitespace: ClassVar[bool] = True
     option_spec: ClassVar[dict[str, Callable[[str], Any]]] = {
         "hide-code": flag,
         "remove-code": flag,
@@ -167,8 +171,45 @@ class AltairPlotDirective(Directive):
         "chart-var-name": unchanged,
         "strict": flag,
         "div_class": strip_lower,
+        "start-after": unchanged,
     }
 
+    _code_source_file: str | None = None
+
+    def _read_code(self, env: BuildEnvironment) -> str:
+        self._code_source_file = None
+        has_file_arg = False
+        if len(self.arguments) == 1 and not self.content:
+            candidate = self.arguments[0]
+            if "\n" not in candidate:
+                _, filename = env.relfn2path(candidate)
+                if Path(filename).is_file():
+                    has_file_arg = True
+        if has_file_arg:
+            rel_filename, filename = env.relfn2path(self.arguments[0])
+            env.note_dependency(rel_filename)
+            self._code_source_file = rel_filename
+            include_options: dict[str, Any] = {}
+            if "start-after" in self.options:
+                include_options["start-after"] = self.options["start-after"]
+            code, _ = LiteralIncludeReader(
+                filename, include_options, env.app.config
+            ).read(location=(self.state_machine.document["source"], self.lineno))
+            return code
+
+        if "start-after" in self.options and not has_file_arg:
+            msg = ":start-after: can only be used with a file path argument"
+            raise ValueError(msg)
+
+        if self.arguments:
+            # Keep backwards compatibility when no blank line appears after
+            # ``.. altair-plot::`` by treating parsed arguments as code text.
+            prefix = " ".join(self.arguments)
+            lines = [prefix, *self.content]
+            return "\n".join(lines)
+
+        return "\n".join(self.content)
+
     def run(self) -> list[nodes.Element]:
         env = t.cast("BuildEnvironment", self.state.document.settings.env)
         app = env.app
@@ -183,7 +224,7 @@ def run(self) -> list[nodes.Element]:
         )
 
         # Show code
-        code = "\n".join(self.content)
+        code = self._read_code(env)
         source_literal = nodes.literal_block(code, code)
         source_literal["language"] = "python"
 
@@ -209,6 +250,7 @@ def run(self) -> list[nodes.Element]:
             relpath=os.path.relpath(rst_fp.parent, env.srcdir),
             rst_source=rst_source,
             rst_lineno=self.lineno,
+            code_source_file=self._code_source_file,
             links=self.options.get("links", app.builder.config.altairplot_links),
             output=self.options.get("output", "plot"),
             strict="strict" in self.options,

tests/roots/test-altairplot-filearg/conf.py

@@ -0,0 +1,2 @@
+project = "test-altairplot-filearg"
+extensions = ["sphinxext_altair.altairplot"]

tests/roots/test-altairplot-filearg/from_file_source.py

@@ -0,0 +1,3 @@
+print("before-marker")
+# START-AFTER-MARKER
+print("after-marker")

tests/roots/test-altairplot-filearg/index.rst

@@ -0,0 +1,10 @@
+File argument test
+==================
+
+.. altair-plot:: from_file_source.py
+    :output: stdout
+
+
+.. altair-plot:: from_file_source.py
+    :output: stdout
+    :start-after: # START-AFTER-MARKER

tests/test_altairplot.py

@@ -252,3 +252,12 @@ def test_altairplotdirective(app: Sphinx) -> None:
 </script>
 </div>"""
     assert block_plot_7 in result
+
+
+@pytest.mark.sphinx(testroot="altairplot-filearg", freshenv=True)
+def test_altairplotdirective_file_argument(app: Sphinx) -> None:
+    app.builder.build_all()
+    result = (app.outdir / "index.html").read_text(encoding="utf8")
+    assert result.count("before-marker") == 2
+    assert result.count("after-marker") == 4
+    assert result.count("# START-AFTER-MARKER") == 1