refactor: Simplify extra context API

- Remove REGISTRY.source property (decorators handle registration)
- Remove ExtraContextRegistry, ExtraContextGenerator, ExtraContext from __all__
- Change on_anytime to take env instead of app
- Simplify ExtraContextGenerator by extracting _generate method
- Fix 'Source' -> 'Extra Context' naming in comments and docs

Author: SilverRainZ

docs/api.rst

@@ -75,8 +75,8 @@ See :doc:`tmpl` for the higher-level guide.
 .. autoclass:: sphinxnotes.render.Phase
    :members:
 
-Sources
--------
+Extra Context
+-------------
 
 See :doc:`tmpl` for built-in extra-context names such as ``doc`` and
 ``sphinx``, plus usage examples.
@@ -97,9 +97,6 @@ See :doc:`tmpl` for built-in extra-context names such as ``doc`` and
 .. autoclass:: sphinxnotes.render.GlobalExtraContext
    :members: generate
 
-.. autoclass:: sphinxnotes.render.ExtraContextRegistry
-   :members:
-
 
 Base Roles and Directives
 -------------------------
@@ -163,12 +160,11 @@ Registry
 ========
 
 Developers can extend this extension (for example, to support more data types
-or add new sources) by adding new items to
+or add new extra context) by adding new items to
 :py:class:`sphinxnotes.render.REGISTRY`.
 
 .. autodata:: sphinxnotes.render.REGISTRY
 
 .. autoclass:: sphinxnotes.render.Registry
 
    .. autoproperty:: data
-   .. autoproperty:: source

src/sphinxnotes/render/__init__.py

@@ -30,9 +30,6 @@
 from .ctx import PendingContext, ResolvedContext
 from .ctxnodes import pending_node
 from .extractx import (
-    ExtraContextRegistry,
-    ExtraContextGenerator,
-    ExtraContext,
     ParsingPhaseExtraContext,
     ParsedPhaseExtraContext,
     ResolvingPhaseExtraContext,
@@ -66,14 +63,11 @@
     'Host',
     'PendingContext',
     'ResolvedContext',
-    'ExtraContext',
     'ParsingPhaseExtraContext',
     'ParsedPhaseExtraContext',
     'ResolvingPhaseExtraContext',
     'GlobalExtraContext',
     'extra_context',
-    'ExtraContextRegistry',
-    'ExtraContextGenerator',
     'pending_node',
     'BaseContextRole',
     'BaseContextDirective',
@@ -91,12 +85,6 @@ class Registry:
     def data(self) -> DataRegistry:
         return DATA_REGISTRY
 
-    @property
-    def source(self) -> ExtraContextRegistry:
-        from .extractx import REGISTRY as SOURCE_REGISTRY
-
-        return SOURCE_REGISTRY
-
 
 REGISTRY = Registry()
 

src/sphinxnotes/render/extractx.py

@@ -208,41 +208,32 @@ def __init__(self, node: pending_node) -> None:
         )
         Reporter(node).append(self.report)
 
-    def on_anytime(self, app: Sphinx) -> None:
+    def on_anytime(self, env: BuildEnvironment) -> None:
         """Generate global extra context for requested names."""
-        env = app.env
-        for name in self.node.template.extra:
-            ctx = REGISTRY.get(name)
-            if ctx is not None and isinstance(ctx, GlobalExtraContext):
-                self._safegen(name, lambda c=ctx: c.generate(env))
+        self._generate(GlobalExtraContext, lambda ctx: ctx.generate(env))
 
     def on_parsing(self, directive: SphinxDirective | SphinxRole) -> None:
         """Generate parsing phase extra context for requested names."""
-        for name in self.node.template.extra:
-            ctx = REGISTRY.get(name)
-            if ctx is not None and isinstance(ctx, ParsingPhaseExtraContext):
-                self._safegen(name, lambda c=ctx: c.generate(directive))
+        self._generate(ParsingPhaseExtraContext, lambda ctx: ctx.generate(directive))
 
     def on_parsed(self, transform: SphinxTransform) -> None:
         """Generate parsed phase extra context for requested names."""
-        for name in self.node.template.extra:
-            ctx = REGISTRY.get(name)
-            if ctx is not None and isinstance(ctx, ParsedPhaseExtraContext):
-                self._safegen(name, lambda c=ctx: c.generate(transform))
+        self._generate(ParsedPhaseExtraContext, lambda ctx: ctx.generate(transform))
 
     def on_resolving(self, transform: SphinxTransform) -> None:
         """Generate resolving phase extra context for requested names."""
+        self._generate(ResolvingPhaseExtraContext, lambda ctx: ctx.generate(transform))
+
+    def _generate(self, cls: type, gen: Callable[[ExtraContext], Any]) -> None:
+        """Generate extra context of the given type for all requested names."""
         for name in self.node.template.extra:
             ctx = REGISTRY.get(name)
-            if ctx is not None and isinstance(ctx, ResolvingPhaseExtraContext):
-                self._safegen(name, lambda c=ctx: c.generate(transform))
-
-    def _safegen(self, name: str, gen: Callable[[], Any]):
-        try:
-            self.node.extra[name] = gen()
-        except Exception:
-            self.report.text(f'Failed to generate extra context "{name}":')
-            self.report.traceback()
+            if ctx is not None and isinstance(ctx, cls):
+                try:
+                    self.node.extra[name] = gen(ctx)
+                except Exception:
+                    self.report.text(f'Failed to generate extra context "{name}":')
+                    self.report.traceback()
 
 
 def setup(app: Sphinx):

src/sphinxnotes/render/pipeline.py

@@ -121,8 +121,8 @@ def render_queue(self, app: Sphinx) -> list[pending_node]:
                 ns.append(pending)
                 continue
 
-            # Generate global sources for later use.
-            ExtraContextGenerator(pending).on_anytime(app)
+            # Generate global extra context for later use.
+            ExtraContextGenerator(pending).on_anytime(app.env)
 
             host = cast(Host, self)
             pending.render(host)