MDit 0.0.0.dev12__tar.gz → 0.0.0.dev14__tar.gz

{mdit-0.0.0.dev12/src/MDit.egg-info → mdit-0.0.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev12
+Version: 0.0.0.dev14
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-nb<2,>1
@@ -23,9 +23,9 @@ Requires-Dist: rich>=13.8
 Requires-Dist: pydantic>=2.9
 Requires-Dist: referencing>=0.35.1
 Requires-Dist: PkgData==0.0.0.dev4
-Requires-Dist: PySerials==0.0.0.dev15
+Requires-Dist: PySerials==0.0.0.dev17
 Requires-Dist: PyBadger==0.0.0.dev11
 Requires-Dist: PyColorIT==0.0.0.dev7
 Requires-Dist: ProtocolMan==0.0.0.dev2
 Requires-Dist: HTMP==0.0.0.dev5
-Requires-Dist: JSONSchemata==0.0.0.dev11
+Requires-Dist: JSONSchemata==0.0.0.dev13

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14}/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev12"
+version = "0.0.0.dev14"
 name = "MDit"
 requires-python = ">=3.10"
 dependencies = [
@@ -42,10 +42,10 @@ dependencies = [
     "pydantic >= 2.9",
     "referencing >= 0.35.1",
     "PkgData == 0.0.0.dev4",
-    "PySerials == 0.0.0.dev15",
+    "PySerials == 0.0.0.dev17",
     "PyBadger == 0.0.0.dev11",
     "PyColorIT == 0.0.0.dev7",
     "ProtocolMan == 0.0.0.dev2",
     "HTMP == 0.0.0.dev5",
-    "JSONSchemata == 0.0.0.dev11",
+    "JSONSchemata == 0.0.0.dev13",
 ]

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14/src/MDit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev12
+Version: 0.0.0.dev14
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-nb<2,>1
@@ -23,9 +23,9 @@ Requires-Dist: rich>=13.8
 Requires-Dist: pydantic>=2.9
 Requires-Dist: referencing>=0.35.1
 Requires-Dist: PkgData==0.0.0.dev4
-Requires-Dist: PySerials==0.0.0.dev15
+Requires-Dist: PySerials==0.0.0.dev17
 Requires-Dist: PyBadger==0.0.0.dev11
 Requires-Dist: PyColorIT==0.0.0.dev7
 Requires-Dist: ProtocolMan==0.0.0.dev2
 Requires-Dist: HTMP==0.0.0.dev5
-Requires-Dist: JSONSchemata==0.0.0.dev11
+Requires-Dist: JSONSchemata==0.0.0.dev13

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14}/src/MDit.egg-info/requires.txt

@@ -19,9 +19,9 @@ rich>=13.8
 pydantic>=2.9
 referencing>=0.35.1
 PkgData==0.0.0.dev4
-PySerials==0.0.0.dev15
+PySerials==0.0.0.dev17
 PyBadger==0.0.0.dev11
 PyColorIT==0.0.0.dev7
 ProtocolMan==0.0.0.dev2
 HTMP==0.0.0.dev5
-JSONSchemata==0.0.0.dev11
+JSONSchemata==0.0.0.dev13

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14}/src/mdit/document.py

@@ -29,7 +29,7 @@ class Document(_Renderable):
         toctree_args: dict[str, str] | None = None,
         toctree_dirhtml: bool = True,
         target_configs: TargetConfigs = None,
-        target_default: TargetConfigs = "sphinx",
+        target_default: str = "sphinx",
         deep_section_generator: Callable[[Document], str] | None = None,
     ):
         super().__init__(target_configs=target_configs, target_default=target_default)
@@ -61,6 +61,10 @@ class Document(_Renderable):
     def current_section_key(self) -> tuple[str | int, ...]:
         return tuple(self._current_section_key)
 
+    @property
+    def current_section_level(self) -> int:
+        return len(self._current_section_key) + 1
+
     def open_section(
         self,
         heading: Heading | MDContainer | ContainerContentInputType,
@@ -73,13 +77,16 @@ class Document(_Renderable):
         self._current_section = new_section
         return
 
-    def close_section(self):
-        if not self._current_section_key:
-            return
-        self._current_section_key.pop()
-        if not self._current_section_key:
-            self._current_section = self
-            return
+    def close_section(self, target_level: int | None = None):
+        curr_level = self.current_section_level
+        if not target_level:
+            target_level = curr_level - 1
+        if not (0 < target_level < curr_level):
+            raise ValueError(
+                f"Target level must be between 1 and the current section level ({curr_level}), "
+                f"but got {target_level}."
+            )
+        self._current_section_key = self._current_section_key[:target_level - 1]
         section = self
         for key in self._current_section_key:
             section = section.section[key].content

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14}/src/mdit/render.py

@@ -6,9 +6,10 @@ from typing import TYPE_CHECKING as _TYPE_CHECKING
 from pathlib import Path as _Path
 import logging as _logging
 import io as _io
+import copy as _copy
 import warnings as _warnings
-
 from functools import partial as _partial
+
 import cmarkgfm as _gfm_pypi
 from readme_renderer import markdown as _readme_renderer_md, clean as _readme_renderer_clean
 from sphinx.application import Sphinx as _Sphinx
@@ -28,16 +29,66 @@ from mdit_py_plugins.myst_role import myst_role_plugin as _mdit_plugin_myst_role
 from mdit_py_plugins.substitution import substitution_plugin as _mdit_plugin_substitution
 from mdit_py_plugins.tasklists import tasklists_plugin as _mdit_plugin_tasklists
 from mdit_py_plugins.wordcount import wordcount_plugin as _mdit_plugin_wordcount
+import pyserials as _ps
 
 if _TYPE_CHECKING:
     from typing import IO, Literal, Callable
 
 
+def get_sphinx_config(
+    config: dict | None = None,
+    append_list: bool = True,
+    append_dict: bool = True,
+):
+    config_default = {
+        "extensions": [
+            'myst_nb',
+            'sphinx_design',
+            'sphinx_togglebutton',
+            'sphinx_copybutton',
+            'sphinxcontrib.mermaid',
+            'sphinx_tippy',
+        ],
+        "myst_enable_extensions": [
+            "amsmath",
+            "attrs_inline",
+            "colon_fence",
+            "deflist",
+            "dollarmath",
+            "fieldlist",
+            "html_admonition",
+            "html_image",
+            "linkify",
+            "replacements",
+            "smartquotes",
+            "strikethrough",
+            "substitution",
+            "tasklist",
+        ],
+        "html_theme": "pydata_sphinx_theme",
+        "html_theme_options": {
+            "pygments_light_style": "default",
+            "pygments_dark_style": "monokai",
+        },
+        "html_title": "",
+    }
+    config_final = _copy.deepcopy(config) or {}
+    _ps.update.dict_from_addon(
+        data=config_final,
+        addon=config_default,
+        append_list=append_list,
+        append_dict=append_dict,
+        raise_duplicates=False,
+        raise_type_mismatch=False,
+    )
+    return config_final
+
+
 def sphinx(
     content: str | dict[str, str],
     config: dict | None = None,
-    status: IO[str] | None = _sys.stdout,
-    warning: IO[str] | None = _sys.stderr,
+    status: IO[str] | None = None,
+    warning: IO[str] | None = None,
     warnings_are_errors: bool = False,
     fresh_env: bool = True,
     tags: list[str] = (),
@@ -48,6 +99,8 @@ def sphinx(
 ):
     if isinstance(content, str):
         content = {"index": content}
+    if config is None:
+        config = get_sphinx_config()
     with _tempfile.TemporaryDirectory() as temp_dir:
         temp_dir = _Path(temp_dir)
         src_dir = temp_dir / "source"
@@ -67,8 +120,8 @@ def sphinx(
                 doctreedir=temp_dir / "doctrees",
                 buildername="zundler",
                 confoverrides=config,
-                status=status,
-                warning=warning,
+                status=status or _io.StringIO(),
+                warning=warning or _io.StringIO(),
                 freshenv=fresh_env,
                 warningiserror=warnings_are_errors,
                 tags=tags,

{mdit-0.0.0.dev12 → mdit-0.0.0.dev14}/src/mdit/target/__init__.py

@@ -124,41 +124,7 @@ def sphinx(
     directive_dropdown: bool = True,
     alerts: bool = False,
     picture_theme: bool = True,
-    renderer: Callable[[dict | str], str] = _partial(
-        _render.sphinx,
-        config={
-            "extensions": [
-                'myst_nb',
-                'sphinx_design',
-                'sphinx_togglebutton',
-                'sphinx_copybutton',
-                'sphinxcontrib.mermaid',
-                'sphinx_tippy',
-            ],
-            "myst_enable_extensions": [
-                "amsmath",
-                "attrs_inline",
-                "colon_fence",
-                "deflist",
-                "dollarmath",
-                "fieldlist",
-                "html_admonition",
-                "html_image",
-                "linkify",
-                "replacements",
-                "smartquotes",
-                "strikethrough",
-                "substitution",
-                "tasklist",
-            ],
-            "html_theme": "pydata_sphinx_theme",
-            "html_theme_options": {
-                "pygments_light_style": "default",
-                "pygments_dark_style": "monokai",
-            },
-            "html_title": "",
-        }
-    ),
+    renderer: Callable[[dict | str], str] = _render.sphinx,
     rich_export: dict
         | md.RichExportHTMLConfig
         | md.RichExportSVGConfig