update

Author: SilverRainZ

src/sphinxnotes/data/__init__.py

@@ -88,17 +88,17 @@ def current_schema(self) -> Schema:
         return cast(Schema, schema)
 
 
-class AutoFreeDataDirective(FreeDataDirective):
-    @override
-    def process_pending_node(self, n: pending_node) -> None:
-        n.name_external = n.content_external = True
-
-    @override
-    def current_template(self) -> Template:
-        tmpl = super().current_template()
-        tmpl.debug = True
-        tmpl.phase = Phase.Parsed
-        return tmpl
+# class AutoFreeDataDirective(FreeDataDirective):
+#     @override
+#     def process_pending_node(self, n: pending_node) -> None:
+#         n.name_external = n.content_external = True
+# 
+#     @override
+#     def current_template(self) -> Template:
+#         tmpl = super().current_template()
+#         tmpl.debug = True
+#         tmpl.phase = Phase.Parsed
+#         return tmpl
 
 
 def setup(app: Sphinx):
@@ -112,12 +112,10 @@ def setup(app: Sphinx):
 
     app.add_config_value('data_template_debug', True, types=bool, rebuild='')
 
-    app.add_directive('data.obj', FreeDataDirective)
-    app.add_directive('data.autobj', AutoFreeDataDirective)
-
     app.add_directive('data.tmpl', TemplateDirective)
     app.add_directive('data.template', TemplateDirective)
     app.add_directive('data.schema', SchemaDirective)
+    app.add_directive('data.obj', FreeDataDirective)
 
     app.add_role('data', FreeDataRole())
 

src/sphinxnotes/data/data.py

@@ -1,28 +1,48 @@
 from __future__ import annotations
 import re
-from dataclasses import dataclass, asdict
-from typing import Any, Callable
+from dataclasses import dataclass, asdict, field as datacls_field
+from typing import Any, Callable, Generator
+import hashlib
+import pickle
 
 
-type Value = None | int | float | str | bool | list[Value]
-
+type SimpleValue = bool | int | float | str
+type Value = None | SimpleValue | list[SimpleValue]
 
 @dataclass
-class Data(object):
+class RawData:
     name: str | None
     attrs: dict[str, str]
     content: str | None
 
 
+def strify(val: Value) -> str | None:
+    if val is None:
+        return None
+    elif isinstance(val, list):
+        return str(val[0]) if len(val) > 0 else None
+    else:
+        return str(val)
+
+
 @dataclass
-class Parsed(object):
+class ParsedData:
     name: Value
     attrs: dict[str, Value]
     content: Value
 
     def ascontext(self) -> dict[str, Any]:
         return asdict(self)
 
+    @property
+    def title(self) -> str | None:
+        return strify(self.name)
+
+    @property
+    def hexdigest(self) -> str:
+        return hashlib.sha1(pickle.dumps(self)).hexdigest()[:7]
+
+
 
 @dataclass
 class Form:
@@ -72,15 +92,21 @@ def _bool_conv(v: str | None) -> bool:
         ),
     }
 
+    flags: set[str] = set()
+
 
 @dataclass
 class Field:
     # Type of element.
     etype: type = str
-    required: bool = False
     # Form of elements (if the field holds multiple values).
     form: Form | None = None
 
+    # Multiple flags.
+    required: bool = False
+    flags: set[str] = datacls_field(default_factory=set)
+
+
     @staticmethod
     def from_str(dsl: str) -> Field:
         """Parses the DSL string into a Field object."""
@@ -147,11 +173,6 @@ def _apply_modifier(self, mod: str):
             self.etype = Registry.etypes[lower_mod]
             return
 
-        # Match: Required flag
-        if lower_mod in ['required', 'req']:
-            self.required = True
-            return
-
         # Match: Custom separator (e.g., "sep by '|'")
         if match := re.match(r'^sep\s+by\s+(.+)$', clean_mod, re.IGNORECASE):
             rawsep = match.group(1).strip()
@@ -160,6 +181,18 @@ def _apply_modifier(self, mod: str):
             self.form = Form(form.rtype, self._strip_quotes(rawsep))
             return
 
+        # Match: Required flag
+        if lower_mod in ['required', 'req']:
+            self.required = True
+            return
+
+        # Match: Extras flags.
+        print('>>>>>>>>>>', Registry.flags, lower_mod)
+        if lower_mod in Registry.flags:
+            print('**********', Registry.flags, lower_mod)
+            self.flags.add(lower_mod)
+            return
+
         raise ValueError(f"unknown modifier: '{mod}'")
 
     def _strip_quotes(self, s: str) -> str:
@@ -169,6 +202,12 @@ def _strip_quotes(self, s: str) -> str:
             return content.replace(r'\n', '\n').replace(r'\t', '\t').replace(r'\,', ',')
         return s
 
+    def __getattr__(self, name: str) -> Any:
+        if name not in Registry.flags:
+            raise AttributeError(name)
+        return name in self.flags
+
+
     def parse(self, rawval: str | None) -> Value:
         """
         Parses the raw input string into the target Value.
@@ -240,7 +279,7 @@ def _parse_single(
         except Exception as e:
             raise ValueError(f'parsing {field[0]}: {e}')
 
-    def parse(self, data: Data) -> Parsed:
+    def parse(self, data: RawData) -> ParsedData:
         if data.name:
             name = self._parse_single(('name', self.name), data.name)
         else:
@@ -263,4 +302,23 @@ def parse(self, data: Data) -> Parsed:
         else:
             content = None
 
-        return Parsed(name, attrs, content)
+        return ParsedData(name, attrs, content)
+
+    def items(self, data: ParsedData, pred=Callable[[Field], bool]) -> Generator[tuple[str, Field, Value]]:
+        def ok(f: Field) -> bool:
+            return not pred or pred(f)
+
+        if self.name and ok(self.name):
+            yield 'name', self.name, data.name
+
+        if isinstance(self.attrs, Field) and ok(self.attrs):
+            for name, val in data.attrs.items():
+                yield name, self.attrs, val
+        else: 
+            for name, field in self.attrs.items():
+                if not ok(field):
+                    continue
+                yield name, field, data.attrs.get(name)
+
+        if self.content and ok(self.content):
+            yield 'content', self.content, data.content

src/sphinxnotes/data/render.py

@@ -9,15 +9,19 @@
 from __future__ import annotations
 from typing import override
 from abc import abstractmethod, ABC
+from dataclasses import dataclass
 
 from docutils import nodes
-from docutils.parsers.rst import directives
+from docutils.nodes import fully_normalize_name
 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, Data
+
+from .data import Field, Schema, RawData, ParsedData
 from .template import Template, Phase, MarkupParser
 from . import extra_contexts
 from . import utils
@@ -26,7 +30,6 @@
 
 
 class BaseNode(nodes.Node):
-    data: Data
     template: Template
     schema: Schema
 
@@ -35,6 +38,7 @@ class BaseNode(nodes.Node):
 
 
 class pending_node(BaseNode, nodes.Invisible, nodes.meta):
+    data: RawData
     name_external: bool = False
     content_external: bool = False
 
@@ -58,6 +62,7 @@ def render(self, caller: Caller, replace: bool = False) -> rendered_node:
 
         renderer = self._get_caller_markup_parser(caller)
         rendered = rendered_node()
+        rendered.data = parsed
         rendered += self.template.render(
             renderer,
             parsed,
@@ -68,6 +73,7 @@ def render(self, caller: Caller, replace: bool = False) -> rendered_node:
             },
         )
         rendered.update_all_atts(self)
+        # TODO: check tmpl schema line no
 
         if replace:
             self.replace_self(rendered)
@@ -120,9 +126,44 @@ def _get_caller_reporter(self, caller: Caller, e: ValueError) -> Exception:
             ...  # TODO
 
 
+@dataclass
+class _Caller:
+    v: Caller
+
+    @property
+    def env(self) -> BuildEnvironment:
+        return self.v.env
+
+    @property
+    def doctree(self) -> nodes.document:
+        if isinstance(self.v, SphinxDirective):
+            return self.v.state.document
+        elif isinstance(self.v, SphinxRole):
+            return self.v.inliner.document
+        elif isinstance(self.v, SphinxTransform):
+            return self.v.document
+        else:
+            raise NotImplemented
+
+
 class rendered_node(BaseNode, nodes.container):
-    anchor: nodes.Element | None
+    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
 
 class BaseDataMarkup(ABC):
     """Methods to be overrided."""
@@ -133,13 +174,14 @@ def current_template(self) -> Template: ...
     @abstractmethod
     def current_schema(self) -> Schema: ...
 
-    def process_data(self, data: Data) -> None: ...
+    def process_raw_data(self, data: RawData) -> None: ...
+
+    def process_paresd_data(self, data: ParsedData) -> None: ...
 
     def process_pending_node(self, n: pending_node) -> None: ...
 
     def process_rendered_node(self, n: rendered_node) -> None: ...
 
-
 class BaseDataDirective(BaseDataMarkup, SphinxDirective):
     """Methods overridden from parent."""
 
@@ -153,12 +195,12 @@ def run(self) -> list[nodes.Node]:
     """Methods used internal."""
 
     def build_pending_node(self) -> pending_node:
-        data = Data(
+        data = RawData(
             self.arguments[0] if self.arguments else None,
             self.options.copy(),
             '\n'.join(self.content) if self.has_content else None,
         )
-        self.process_data(data)
+        self.process_raw_data(data)
 
         tmpl = self.current_template()
         schema = self.current_schema()
@@ -172,9 +214,13 @@ def build_pending_node(self) -> pending_node:
 
     def render_pending_node(self, pending: pending_node) -> rendered_node:
         rendered = pending.render(self)
+        self.process_paresd_data(rendered.data)
         self.process_rendered_node(rendered)
+
         return rendered
 
+    """Helper methods to be subclasses."""
+
 
 class BaseDataRole(BaseDataMarkup, SphinxRole):
     """Methods overridden from parent."""
@@ -190,8 +236,8 @@ def run(self) -> tuple[list[nodes.Node], list[nodes.system_message]]:
 
     def build_pending_node(self) -> pending_node:
         # TODO: self.content. self.options
-        data = Data(None, {}, self.text)
-        self.process_data(data)
+        data = RawData(None, {}, self.text)
+        self.process_raw_data(data)
 
         tmpl = self.current_template()
         schema = self.current_schema()

src/sphinxnotes/data/template.py

@@ -12,7 +12,7 @@
 
 from jinja2.sandbox import SandboxedEnvironment
 
-from .data import Parsed
+from .data import ParsedData
 from .utils import Reporter
 
 logger = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ class Template(object):
     debug: bool
 
     def render(
-        self, parser: MarkupParser, data: Parsed, extractx: dict[str, Any]
+        self, parser: MarkupParser, data: ParsedData, extractx: dict[str, Any]
     ) -> list[nodes.Node]:
         ctx = data.ascontext()
         ctx.update(**extractx)