update

Author: SilverRainZ

src/sphinxnotes/data/render.py

@@ -21,11 +21,10 @@
 from .template import Template, Phase, MarkupParser
 from . import extra_contexts
 from . import utils
-from .utils.freestyle import FreeStyleDirective, FreeStyleOptionSpec
 
 logger = logging.getLogger(__name__)
 
-class Node(nodes.Node):
+class BaseNode(nodes.Node):
     data: Data
     template: Template
     schema: Schema
@@ -34,7 +33,7 @@ class Node(nodes.Node):
 type Caller = SphinxDirective | SphinxRole | SphinxTransform
 
 
-class pending_node(Node, nodes.Invisible, nodes.meta):
+class pending_node(BaseNode, nodes.Invisible, nodes.meta):
     need_external_data: bool = False
 
     def render(self, caller: Caller, replace: bool = False) -> rendered_node:
@@ -106,7 +105,7 @@ def _caller_exception_hanlder(self, caller: Caller, e: ValueError) -> Exception:
         else:
             ... # TODO
 
-class rendered_node(Node, nodes.container):
+class rendered_node(BaseNode, nodes.container):
     anchor: nodes.Element | None
 
 
@@ -212,9 +211,6 @@ class FixedDataDirective(BaseDataDirective):
     @classmethod
     def derive(cls, name: str, tmpl: Template, schema: Schema) -> type[FixedDataDirective]:
         """Generate an AnyDirective child class for describing object."""
-        base_classes = []
-        base_classes.append(FixedDataDirective)
-
         if not schema.name:
             required_arguments = 0
             optional_arguments = 0
@@ -225,26 +221,20 @@ def derive(cls, name: str, tmpl: Template, schema: Schema) -> type[FixedDataDire
             required_arguments = 0
             optional_arguments = 1
 
-        if isinstance(schema.attrs, Field):
-            base_classes.append(FreeStyleDirective)
-            if schema.attrs.required:
-                option_spec = FreeStyleOptionSpec(directives.unchanged_required)
+        assert not isinstance(schema.attrs, Field):
+        option_spec = {}
+        for name, field in schema.attrs.items():
+            if field.required:
+                option_spec[name] = directives.unchanged_required
             else:
-                option_spec = FreeStyleOptionSpec(directives.unchanged)
-        else:
-            option_spec = {}
-            for name, field in schema.attrs.items():
-                if field.required:
-                    option_spec[name] = directives.unchanged_required
-                else:
-                    option_spec[name] = directives.unchanged
+                option_spec[name] = directives.unchanged
 
         has_content = schema.content is not None
 
         # Generate directive class
         return type(
-            'Any%sDirective' % name.title(),
-            tuple(base_classes),
+            '%sFixedDataDirective' % name.title(),
+            (FixedDataDirective, ),
             {
                 'schema': schema,
                 'template': tmpl,