update

Author: SilverRainZ

src/sphinxnotes/data/data.py

@@ -359,7 +359,7 @@ def _apply_modifier(self, mod: str):
 @dataclass(frozen=True)
 class Schema(object):
     name: Field | None
-    attrs: dict[str, Field]
+    attrs: dict[str, Field] | Field
     content: Field | None
 
     @classmethod
@@ -414,34 +414,30 @@ def parse(self, data: RawData) -> Data:
 
         return Data(name, attrs, content)
 
-    def fields(self, pred: Callable[[Field], bool] | None = None) -> Generator[tuple[str, Field]]:
-        def ok(f: Field) -> bool:
-            return not pred or pred(f)
-
-        if self.name and ok(self.name):
+    def fields(self,) -> Generator[tuple[str, Field]]:
+        if self.name:
             yield 'name', self.name
 
-        for name, field in self.attrs.items():
-            if ok(field):
+        if isinstance(self.attrs, Field):
+            yield 'attrs', self.attrs # FIXME:
+        else:
+            for name, field in self.attrs.items():
                 yield name, field
 
-        if self.content and ok(self.content):
+        if self.content:
             yield 'content', self.content
 
 
-    def items(
-        self, data: Data, pred: Callable[[Field], bool] | None = None
-    ) -> Generator[tuple[str, Field, Value]]:
-        def ok(f: Field) -> bool:
-            return not pred or pred(f)
-
-        if self.name and ok(self.name):
+    def items(self, data: Data) -> Generator[tuple[str, Field, Value]]:
+        if self.name:
             yield 'name', self.name, data.name
 
-        for name, field in self.attrs.items():
-            if not ok(field):
-                continue
-            yield name, field, data.attrs.get(name)
+        if isinstance(self.attrs, Field):
+            for name, val in data.attrs:
+                yield name, self.attrs, val
+        else:
+            for name, field in self.attrs.items():
+                yield name, field, data.attrs.get(name)
 
-        if self.content and ok(self.content):
+        if self.content:
             yield 'content', self.content, data.content

src/sphinxnotes/data/render.py

@@ -15,15 +15,17 @@
 from docutils.parsers.rst import directives
 from sphinx.util import logging
 from sphinx.util.docutils import SphinxDirective, SphinxRole
-from sphinx.application import Sphinx
 from sphinx.transforms import SphinxTransform
+from sphinx.transforms.post_transforms import ReferencesResolver
+
 
 from .data import Field, Schema, RawData, Data
 from .template import Template, Phase
 from . import extra_contexts
 from . import utils
 
 if TYPE_CHECKING:
+    from sphinx.application import Sphinx
     from sphinx.environment import BuildEnvironment
     from .template import MarkupParser
 
@@ -85,9 +87,7 @@ def reporter(self, e: ValueError) -> Exception:
 # Nodes definitons
 # ===============
 
-class BaseNode(nodes.Node):
-    template: Template
-    schema: Schema
+class BaseNode(nodes.Element): ...
 
 class RenderedNode(BaseNode):
     data: Data
@@ -99,6 +99,9 @@ class rendered_inline_node(RenderedNode, nodes.inline): ...
 
 class pending_node(BaseNode, nodes.Invisible, nodes.Element):
     data: RawData
+    template: Template
+    schema: Schema
+
     inline: bool = False
     need_external_name: bool = False
     need_external_content: bool = False
@@ -164,7 +167,7 @@ def _resolve_external_content(self) -> list[nodes.Node]:
 
 class BaseDataDefiner(ABC):
     """
-    A abstract class that can defines :cls:`RawData` and support
+    A abstract class that owns :cls:`RawData` and support
     validating and rendering the data at the appropriate time.
 
     The subclasses *MUST* be subclass of :cls:`SphinxDirective` or
@@ -210,7 +213,7 @@ def build_pending_node(self) -> pending_node:
 
     @final
     def render_pending_node(self, pending: pending_node) -> RenderedNode:
-        rendered = pending.render(self) # type: ignore
+        rendered = pending.render(self) # FIXME: type hint
         self.process_paresd_data(rendered.data)
         self.process_rendered_node(rendered)
 
@@ -278,7 +281,7 @@ def current_schema(self) -> Schema:
 
     @classmethod
     def derive(
-        cls, name: str, tmpl: Template, schema: Schema
+        cls, name: str, schema: Schema, tmpl: Template
     ) -> type[StrictDataDefineDirective]:
         """Generate an AnyDirective child class for describing object."""
         if not schema.name:
@@ -354,7 +357,8 @@ def _insert_parsed_hook(app, docname, content):
 
 
 class _ResolvingHook(SphinxTransform):
-    default_priority = 210  # TODO: before xref
+    # After resolving pending_xref.
+    default_priority = (ReferencesResolver.default_priority or 10) + 1
 
     def apply(self, **kwargs):
         logger.warning(f'running resolving hook for doc {self.env.docname}...')