Merge pull request #5 from R5dan/pandas

Redo tables, adding pandas

Author: R5dan

BetterMD/elements/a.py

@@ -5,16 +5,16 @@
 import typing as t
 
 class MD(CustomMarkdown['A']):
-    def to_md(self, inner, symbol, parent):
-        return f"[{" ".join([e.to_md() for e in inner])}]({symbol.get_prop("href")})"
+    def to_md(self, inner, symbol, parent, **kwargs):
+        return f"[{" ".join([e.to_md(**kwargs) for e in inner])}]({symbol.get_prop("href")})"
 
 class HTML(CustomHTML['A']):
-    def to_html(self, inner, symbol, parent):
-        return f"<a href={symbol.get_prop('href')}>{" ".join([e.to_html() for e in inner])}</a>"
+    def to_html(self, inner, symbol, parent, **kwargs):
+        return f"<a href={symbol.get_prop('href')}>{" ".join([e.to_html(**kwargs) for e in inner])}</a>"
 
 class RST(CustomRst['A']):
-    def to_rst(self, inner, symbol, parent):
-        return f"`{' '.join([e.to_rst() for e in inner])} <{symbol.get_prop('href')}>`_"
+    def to_rst(self, inner, symbol, parent, **kwargs):
+        return f"`{' '.join([e.to_rst(**kwargs) for e in inner])} <{symbol.get_prop('href')}>`_"
 
 class A(Symbol):
     prop_list = ["href"]

BetterMD/elements/blockquote.py

@@ -2,8 +2,8 @@
 from .symbol import Symbol
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent):
-        return "    \n".join([e.to_rst() for e in inner])
+    def to_rst(self, inner, symbol, parent, **kwargs):
+        return "    \n".join([e.to_rst(**kwargs) for e in inner])
 
 
 class Blockquote(Symbol):

BetterMD/elements/br.py

@@ -3,11 +3,15 @@
 from ..rst import CustomRst
 
 class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+    def to_md(self, inner, symbol, parent, **kwargs):
+        if inner:
+            raise ValueError("Br element must not have any children")
         return "\n\n"
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent):
+    def to_rst(self, inner, symbol, parent, **kwargs):
+        if inner:
+            raise ValueError("Br element must not have any children")
         return "\n\n"
 
 class Br(Symbol):

BetterMD/elements/code.py

@@ -3,32 +3,32 @@
 from ..markdown import CustomMarkdown
 from ..html import CustomHTML
 
-class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+class MD(CustomMarkdown['Code']):
+    def to_md(self, inner, symbol, parent, **kwargs):
         language = symbol.get_prop("language", "")
-        if isinstance(inner, Text):
-            inner = inner.to_md()
+        
+        content = " ".join([e.to_md(**kwargs) for e in inner])
 
         # If it's a code block (has language or multiline)
         if language or "\n" in inner:
-            return f"```{language}\n{inner}\n```\n"
+            return f"```{language}\n{content}\n```\n"
 
         # Inline code
-        return f"`{inner}`"
+        return f"`{content}`"
 
 class HTML(CustomHTML):
-    def to_html(self, inner, symbol, parent):
+    def to_html(self, inner, symbol, parent, **kwargs):
         language = symbol.get_prop("language", "")
-        if isinstance(inner, Text):
-            inner = inner.to_html()
+        
+        content = " ".join([e.to_html(**kwargs) for e in inner])
 
         if language:
-            return f'<pre><code class="language-{language}">{inner}</code></pre>'
+            return f'<pre><code class="language-{language}">{content}</code></pre>'
 
-        return f"<code>{inner}</code>"
+        return f"<code>{content}</code>"
 
 class Code(Symbol):
-    props = ["language"]
+    prop_list = ["language"]
     html = HTML()
     md = MD()
     rst = "``"

BetterMD/elements/h.py

@@ -6,8 +6,8 @@ def __init__(self, character:'str') -> None:
         self.character = character
         super().__init__()
 
-    def to_rst(self, inner: list[Symbol], symbol: Symbol, parent: Symbol) -> str:
-        list_rst = [e.to_rst() for e in inner]
+    def to_rst(self, inner: list[Symbol], symbol: Symbol, parent: Symbol, **kwargs) -> str:
+        list_rst = [e.to_rst(**kwargs) for e in inner]
         content = "\n".join(list_rst)
         max_length = len(max(list_rst, key=lambda l: len(l)))
 

BetterMD/elements/hr.py

@@ -3,11 +3,15 @@
 from ..markdown import CustomMarkdown
 
 class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+    def to_md(self, inner, symbol, parent, **kwargs):
+        if inner:
+            raise ValueError("Hr element must not have any children")
         return f"---\n"
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent):
+    def to_rst(self, inner, symbol, parent, **kwargs):
+        if inner:
+            raise ValueError("Hr element must not have any children")
         return "----\n"
 
 class Hr(Symbol):

BetterMD/elements/img.py

@@ -4,20 +4,20 @@
 from ..rst import CustomRst
 
 class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+    def to_md(self, inner, symbol, parent, **kwargs):
         alt = symbol.get_prop("alt", "")
         return f"![{alt}]({symbol.get_prop('src')})"
 
 class HTML(CustomHTML):
-    def to_html(self, inner, symbol, parent):
+    def to_html(self, inner, symbol, parent, **kwargs):
         return f"<img src={symbol.get_prop('src')} alt={symbol.get_prop('alt', '')} />"
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent):
+    def to_rst(self, inner, symbol, parent, **kwargs):
         return f".. image:: {symbol.get_prop('src')}\n   :alt: {symbol.get_prop("alt", "")}\n"
 
 class Img(Symbol):
-    props = ["src", "alt"]
+    prop_list = ["src", "alt"]
     md = MD()
     html = HTML()
-    rst = RST() 
+    rst = RST()

BetterMD/elements/input.py

@@ -4,7 +4,7 @@
 from ..rst import CustomRst
 
 class HTML(CustomHTML):
-    def to_html(self, inner, symbol, parent):
+    def to_html(self, inner, symbol, parent, **kwargs):
         # Collect all input attributes
         attrs = []
         for prop in Input.props:
@@ -20,13 +20,13 @@ def to_html(self, inner, symbol, parent):
         return f"<input {attrs_str} />"
 
 class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+    def to_md(self, inner, symbol, parent, **kwargs):
         if symbol.get_prop("type") == "checkbox":
             return f"- [{'x' if symbol.get_prop('checked', '') else ''}] {inner.to_md()}"
         return symbol.to_html()
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent):
+    def to_rst(self, inner, symbol, parent, **kwargs):
         if symbol.get_prop("type") == "checkbox":
             return f"[ ] {inner.to_rst() if inner else ''}"
         return ""  # Most input types don't have RST equivalents

BetterMD/elements/li.py

@@ -3,13 +3,13 @@
 from ..markdown import CustomMarkdown
 
 class MD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent):
+    def to_md(self, inner, symbol, parent, **kwargs):
         if isinstance(parent, OL):
             return f"\n1. {" ".join([e.to_md() for e in inner])}"
         return f"\n- {" ".join([e.to_md() for e in inner])}"
 
 class RST(CustomRst):
-    def to_rst(self, inner, symbol, parent) -> str:
+    def to_rst(self, inner, symbol, parent, **kwargs) -> str:
         content = " ".join([e.to_rst() for e in inner])
         if isinstance(parent, OL):
             if v := symbol.props.get("value", None):
@@ -18,13 +18,13 @@ def to_rst(self, inner, symbol, parent) -> str:
         return f"* {content}"
 
 class LMD(CustomMarkdown):
-    def to_md(self, inner, symbol, parent) -> str:
+    def to_md(self, inner, symbol, parent, **kwargs) -> str:
         if isinstance(parent, LI):
             return "    \n".join([e.to_md() for e in inner])
         return " ".join([e.to_md() for e in inner])
 
 class LRST(CustomRst):
-    def to_rst(self, inner, symbol, parent) -> str:
+    def to_rst(self, inner, symbol, parent, **kwargs) -> str:
         if isinstance(parent, LI):
             return "    \n".join([e.to_rst() for e in inner])
         return " ".join([e.to_rst() for e in inner])

BetterMD/elements/symbol.py

@@ -6,6 +6,7 @@
 from ..rst import CustomRst
 
 T = t.TypeVar("T", default=t.Any)
+T2 = t.TypeVar("T2", default=t.Any)
 logger = logging.getLogger("BetterMD")
 
 class List(list, t.Generic[T]):
@@ -17,10 +18,22 @@ def on_ammend(self, object: 'T'): ...
     def append(self, object: 'T') -> 'None':
         self.on_ammend(object)
         return super().append(object)
+    
+    def get(self, index, default:'T2'=None) -> 't.Union[T, T2]':
+        try:
+            return self[index]
+        except IndexError:
+            return default
 
     def __setitem__(self, key, value):
         self.on_set(key, value)
         return super().__setitem__(key, value)
+    
+    def __getitem__(self, item) -> 'T':
+        return super().__getitem__(item)
+    
+    def __iter__(self) -> 't.Iterator[T]':
+        return super().__iter__()
 
 class Symbol:
     styles: 'dict[str, str]' = {}
@@ -74,11 +87,11 @@ def has_child(self, child:'type[Symbol]'):
 
         return False
 
-    def prepare(self, parent:'t.Union[Symbol, None]'=None):
+    def prepare(self, parent:'t.Union[Symbol, None]'=None, *args, **kwargs):
         self.prepared = True
         self.parent = parent
-        for symbol in self.children:
-            symbol.prepare(self)
+        
+        [symbol.prepare(self, *args, **kwargs) for symbol in self.children]
 
         return self
 
@@ -90,6 +103,9 @@ def replace_child(self, old:'Symbol', new:'Symbol'):
 
 
     def to_html(self) -> 'str':
+        if not self.prepared:
+            self.prepare()
+        
         if isinstance(self.html, CustomHTML):
             return self.html.to_html(self.children, self, self.parent)
 
@@ -106,17 +122,23 @@ def to_html(self) -> 'str':
         logger.debug(f"{inner_HTML=} {self.html=} {self.classes=} {self.styles=} {props=}")
         return f"<{self.html} class={'"'}{' '.join(self.classes) or ''}{'"'} style={'"'}{' '.join([f'{k}:{v}' for k,v in self.styles.items()]) or ''}{'"'} {' '.join(props)}>{inner_HTML}</{self.html}>"
 
-    def to_md(self) -> 'str':
+    def to_md(self, **kwargs) -> 'str':
+        if not self.prepared:
+            self.prepare(**kwargs)
+        
         if isinstance(self.md, CustomMarkdown):
-            return self.md.to_md(self.children, self, self.parent)
+            return self.md.to_md(self.children, self, self.parent, **kwargs)
 
         if self.md == None:
-            return self.to_html()
+            return self.to_html(**kwargs)
 
         inner_md = " ".join([e.to_md() for e in self.children])
         return f"{self.md} {inner_md}" + ("\n" if self.nl else "")
 
-    def to_rst(self) -> 'str':
+    def to_rst(self, **kwargs) -> 'str':
+        if not self.prepared:
+            self.prepare(**kwargs)
+
         if isinstance(self.rst, CustomRst):
             return self.rst.to_rst(self.children, self, self.parent)