update

Author: SilverRainZ

src/sphinxnotes/data/data.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Any, Callable, Generator, Literal as Lit, TYPE_CHECKING
+from typing import Any, Callable, Generator, Literal as Lit, TYPE_CHECKING, Self
 import re
 from dataclasses import dataclass, asdict, field as datacls_field
 import hashlib
@@ -183,8 +183,8 @@ class Field:
         sep: str | None = None
 
     @classmethod
-    def from_dsl(cls, dsl: str) -> Field:
-        self = Field()
+    def from_dsl(cls, dsl: str) -> Self:
+        self = cls()
         DSLParser(self).parse(dsl)
         return self
 
@@ -356,26 +356,21 @@ def _apply_modifier(self, mod: str):
 @dataclass(frozen=True)
 class Schema(object):
     name: Field | None
-    attrs: dict[str, Field] | Field
+    attrs: dict[str, Field]
     content: Field | None
 
     @classmethod
     def from_dsl(
         cls,
         name: str | None = None,
-        attrs: str | dict[str, str] = {},
-        content=str | None,
-    ) -> Schema:
+        attrs: dict[str, str] = {},
+        content: str | None = None,
+    ) -> Self:
         name_field = Field.from_dsl(name) if name else None
+        attrs_field = {k: Field.from_dsl(v) for k, v in attrs.items()}
+        cont_field = Field.from_dsl(content) if content else None
 
-        if isinstance(attrs, str):
-            attrs_field = Field.from_dsl(attrs)
-        else:
-            attrs_field = {k: Field.from_dsl(v) for k, v in attrs.items()}
-
-        cont_field = Field.from_dsl(name) if name else None
-
-        return Schema(name_field, attrs_field, cont_field)
+        return cls(name_field, attrs_field, cont_field)
 
     def _parse_single(
         self, field: tuple[str, Field | None], rawval: str | None

src/sphinxnotes/data/render.py

@@ -12,16 +12,13 @@
 from dataclasses import dataclass
 
 from docutils import nodes
-from docutils.nodes import fully_normalize_name
 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.util.nodes import make_id
 from sphinx.environment import BuildEnvironment
 
-
 from .data import Field, Schema, RawData, ParsedData
 from .template import Template, Phase, MarkupParser
 from . import extra_contexts
@@ -149,28 +146,8 @@ def doctree(self) -> nodes.document:
 
 class rendered_node(BaseNode, nodes.container):
     data: ParsedData
-
-    def setup_anchor(
-        self,
-        caller: Caller,
-        ahrnode: nodes.Element,
-        prefix: str = '',
-        term: str | None = None,
-    ) -> str:
-        _caller = _Caller(caller)
-        ahrid = make_id(_caller.env, _caller.doctree, prefix=prefix, term=term)
-        ahrnode['ids'].append(ahrid)
-        _caller.doctree.note_explicit_target(ahrnode)
-
-        def append_name(name):
-            ahrnode['names'].append(fully_normalize_name(str(name)))
-
-        if isinstance(self.data.name, list):
-            [append_name(x) for x in self.data.name]
-        else:
-            append_name(self.data.name)
-
-        return ahrid
+    external_name: nodes.Element | None
+    external_content: nodes.Element | None
 
 
 class BaseDataMarkup(ABC):