update

Author: SilverRainZ

src/sphinxnotes/data/__init__.py

@@ -7,6 +7,7 @@
 """
 
 from __future__ import annotations
+from logging import warning
 from typing import Any, cast
 from textwrap import dedent
 
@@ -59,10 +60,13 @@ class DataNode(nodes.Node):
     template: Template
     schema: Schema
 
-class pending_data_node(DataNode, nodes.Invisible, nodes.Element):
+class pending_data_node(DataNode, nodes.Invisible, nodes.meta):
     need_external_data: bool = False
 
     def render(self, caller: SphinxDirective | SphinxTransform, replace: bool = False) -> rendered_data_node:
+        if self.need_external_data:
+            self._complete_external_data()
+
         try:
             parsed = self.schema.parse(self.data)
         except ValueError as e:
@@ -91,6 +95,17 @@ def render(self, caller: SphinxDirective | SphinxTransform, replace: bool = Fals
 
         return rendered
 
+    def _complete_external_data(self):
+        if not self.data.name:
+            if title := find_titular_node_upward(self.parent):
+                self.data.name = title.astext()
+
+        if not self.data.content:
+            contnodes = []
+            for i, child in enumerate(self.parent):
+                if child == self:
+                    contnodes = self.parent[i:]
+            self.data.content = '\n\n'.join([n.astext() for n in contnodes])
 
 
 class rendered_data_node(DataNode, nodes.container): ...
@@ -168,7 +183,7 @@ class DefineDirective(SphinxDirective):
     optional_arguments = 1
     has_content = True
 
-    def extract_data(self) -> Data:
+    def _extract_data(self) -> Data:
         return Data(
             self.arguments[0] if self.arguments else None,
             self.options.copy(),
@@ -183,63 +198,55 @@ def current_schema(self) -> Schema:
         schema = self.env.current_document.get(SCHEMA_KEY, DEFAULT_SCHEMA)
         return cast(Schema, schema)
 
-    def run(self) -> list[nodes.Node]:
-        data = self.extract_data()
+    def new_pending_node(self) -> pending_data_node:
+        data = self._extract_data()
         tmpl = self.current_template()
         schema = self.current_schema()
 
         n = pending_data_node()
         self.set_source_info(n)
         n.data, n.template, n.schema = data, tmpl, schema
 
-        if tmpl.phase != Phase.Parsing:
+        return n
+
+    def run(self) -> list[nodes.Node]:
+        n = self.new_pending_node()
+        if n.template.phase != Phase.Parsing:
             return [n]
 
         return [n.render(self)]
 
-class FreeDefineDirective(DefineDirective, FreeStyleDirective): ...
-
-def complete_data(pending: pending_data_node):
-    data = pending.data
 
-    if data.content_missing: 
-        contnodes = []
-        for i, child in enumerate(pending.parent):
-            if child == pending:
-                contnodes = pending.parent[i:]
-        data.content = '\n\n'.join([n.astext() for n in contnodes])
-        data.content_missing = False
+class FreeDefineDirective(DefineDirective, FreeStyleDirective): ...
 
 
+class AutoDefineDirective(DefineDirective, FreeStyleDirective):
+    def new_pending_node(self) -> pending_data_node:
+        n = super().new_pending_node()
+        n.need_external_data = True
+        return n
 
 class ParsedHook(SphinxDirective):
     def run(self) -> list[nodes.Node]:
-
         # Save origin system_message method.
         orig_sysmsg = self.state_machine.reporter.system_message
 
         for pending in self.state.document.findall(pending_data_node):
+            if pending.template.phase != Phase.Parsed:
+                continue
+
             # Hook system_message method to let it report the
             # correct line number.
             def sysmsg_fixed_lineno(level, message, *children, **kwargs):
                 kwargs['line'] = pending.line
                 return orig_sysmsg(level, message, *children, **kwargs)
             self.state_machine.reporter.system_message = sysmsg_fixed_lineno
 
-            data = pending.data
-
-            if data.content_missing: 
-                contnodes = []
-                for i, child in enumerate(pending.parent):
-                    if child == pending:
-                        contnodes = pending.parent[i:]
-                data.content = '\n\n'.join([n.astext() for n in contnodes])
-                data.content_missing = False
-
             pending.render(self, replace=True)
 
         # Restore system_message method.
         self.state_machine.reporter.system_message = orig_sysmsg
+
         return []  # nothing to return
 
 def on_source_read(app, docname, content):
@@ -255,6 +262,9 @@ class ResolvingHook(SphinxTransform):
 
     def apply(self, **kwargs):
         for pending in self.document.findall(pending_data_node):
+            if pending.template.phase != Phase.Resolving:
+                continue
+
             pending.render(self, replace=True)
 
 
@@ -264,6 +274,7 @@ def setup(app: Sphinx):
     app.add_directive('data:tmpl', TemplateDirective, False)
     app.add_directive('data:schema', DataSchemaDirective, False)
     app.add_directive('data:def', FreeDefineDirective, False)
+    app.add_directive('data:autodef', AutoDefineDirective, False)
     app.add_directive('data:parsed-hook', ParsedHook, False)
 
     app.connect('source-read', on_source_read)