Parser

BetterMD/__init__.py

@@ -1,4 +1,8 @@
 from .elements import *
-from .html import CustomHTML
-from .markdown import CustomMarkdown
-from .rst import CustomRst
+from .parse import Collection, HTMLParser, MDParser, RSTParser
+
+def from_html(html:'str'):
+    return Symbol.from_html(html)
+
+def from_md(md:'str'):
+    return Symbol.from_md(md)

BetterMD/elements/__init__.py

@@ -1,16 +1,21 @@
+from .symbol import Symbol
+
 from .a import A
+from .blockquote import Blockquote
+from .body import Body
+from .br import Br
+from .code import Code
+from .div import Div
 from .h import H1,H2,H3,H4,H5,H6
 from .head import Head
+from .hr import Hr
+from .html import HTML
+from .img import Img
+from .input import Input
 from .li import OL, UL, LI
-from .text import Text
-from .div import Div
 from .p import P
 from .span import Span
-from .img import Img
-from .text_formatting import Strong, Em, Code
-from .br import Br
-from .blockquote import Blockquote
-from .hr import Hr
-from .table import Table, Tr, Td, Th
-from .input import Input
-from .code import Code
+from .table import Table, Tr, Td, Th, THead, TBody
+from .text_formatting import Strong, Em, Strong as B, Em as I
+from .text import Text
+from .title import Title

BetterMD/elements/a.py

@@ -1,23 +1,52 @@
-from BetterMD.rst.custom_rst import CustomRst
 from .symbol import Symbol
+from ..rst import CustomRst
 from ..markdown import CustomMarkdown
-from ..html import CustomHTML
+import re
 import typing as t
 
-class MD(CustomMarkdown['A']):
+if t.TYPE_CHECKING:
+    from ..parse import Collection
+
+class MD(CustomMarkdown):
     def to_md(self, inner, symbol, parent):
         return f"[{" ".join([e.to_md() for e in inner])}]({symbol.get_prop("href")})"
+
+    def verify(self, text:'str'):
+        if re.findall("\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)", text):
+            # Case 1: Inline link
+            return True
+
+        elif re.findall("<(https?:\/\/[^\s>]+)>", text):
+            # Case 2: Automatic Links
+            return True
+
+        elif re.findall("\[([^\]]+)\]\[([^\]]+)\]\s*\n?\[([^\]]+)\]:\s*(https?:\/\/[^\s]+)", text):
+            # Case 3: Reference Links
+            return True
+
+        return False
 
-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>"
 
 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')}>`_"
 
 class A(Symbol):
     prop_list = ["href"]
+
+    refs = {}
     md = MD()
-    html = HTML()
-    rst = RST()
+    html = "a"
+    rst = RST()
+
+    @classmethod
+    def md_refs(cls, references: 'list[str]' = None):
+        pass
+
+    @classmethod
+    def rst_refs(cls, references: 'list[str]' = None):
+        pass
+
+    @classmethod
+    def html_refs(cls, references: 'list[str]' = None):
+        pass

BetterMD/elements/body.py

@@ -0,0 +1,7 @@
+from .symbol import Symbol
+
+
+class Body(Symbol):
+    html = "body"
+    md = ""
+    rst = ""

BetterMD/elements/code.py

@@ -2,6 +2,7 @@
 from .text import Text
 from ..markdown import CustomMarkdown
 from ..html import CustomHTML
+from ..rst import CustomRst
 
 class MD(CustomMarkdown):
     def to_md(self, inner, symbol, parent):
@@ -19,17 +20,50 @@ def to_md(self, inner, symbol, parent):
 class HTML(CustomHTML):
     def to_html(self, inner, symbol, parent):
         language = symbol.get_prop("language", "")
-        if isinstance(inner, Text):
-            inner = inner.to_html()
+        inner = "\n".join([i.to_html() for i in inner])
 
         if language:
-            return f'<pre><code class="language-{language}">{inner}</code></pre>'
+            return f'<code class="language-{language}">{inner}</code>'
 
         return f"<code>{inner}</code>"
+
+    def verify(self, text: str) -> bool:
+        return text.lower() == "code"
+
+class RST(CustomRst):
+    def to_rst(self, inner, symbol, parent):
+        language = symbol.get_prop("language", "")
+
+        # Handle inner content
+        if isinstance(inner, list):
+            content = "".join([
+                i.to_rst() if isinstance(i, Symbol) else str(i)
+                for i in inner
+            ])
+        else:
+            content = inner.to_rst() if isinstance(inner, Symbol) else str(inner)
+
+        # If it's a code block (has language or multiline)
+        if language or "\n" in content:
+            # Use code-block directive for language-specific blocks
+            if language:
+                # Indent the content by 3 spaces (RST requirement)
+                indented_content = "\n".join(f"   {line}" for line in content.strip().split("\n"))
+                return f".. code-block:: {language}\n\n{indented_content}\n\n"
+
+            # Use simple literal block for language-less blocks
+            # Indent the content by 3 spaces (RST requirement)
+            indented_content = "\n".join(f"   {line}" for line in content.strip().split("\n"))
+            return f"::\n\n{indented_content}\n\n"
+
+        # Inline code
+        # Escape backticks if they exist in content
+        if "`" in content:
+            return f"``{content}``"
+        return f"`{content}`"
 
 class Code(Symbol):
-    props = ["language"]
     html = HTML()
     md = MD()
-    rst = "``"
+    rst = RST()
     nl = True 

BetterMD/elements/h.py

@@ -15,36 +15,36 @@ def to_rst(self, inner: list[Symbol], symbol: Symbol, parent: Symbol) -> str:
 
 class H1(Symbol):
     html = "h1"
-    md = "#"
+    md = "# "
     rst = RST("=")
     nl = True
 
 class H2(Symbol):
     html = "h2"
-    md = "##"
+    md = "## "
     rst = RST("-")
     nl = True
 
 class H3(Symbol):
     html = "h3"
-    md = "###"
+    md = "### "
     rst = RST("~")
     nl = True
 
 class H4(Symbol):
     html = "h4"
-    md = "####"
+    md = "#### "
     rst = RST("+")
     nl = True
 
 class H5(Symbol):
     html = "h5"
-    md = "#####"
+    md = "##### "
     rst = RST("^")
     nl = True
 
 class H6(Symbol):
     html = "h6"
-    md = "######"
+    md = "###### "
     rst = RST('"')
     nl = True

BetterMD/elements/html.py

@@ -0,0 +1,6 @@
+from .symbol import Symbol
+
+class HTML(Symbol):
+    html = "html"
+    md = ""
+    rst = ""

BetterMD/elements/input.py

@@ -3,32 +3,16 @@
 from ..markdown import CustomMarkdown
 from ..rst import CustomRst
 
-class HTML(CustomHTML):
-    def to_html(self, inner, symbol, parent):
-        # Collect all input attributes
-        attrs = []
-        for prop in Input.props:
-            value = symbol.get_prop(prop)
-            if value:
-                # Handle boolean attributes like 'required', 'disabled', etc.
-                if isinstance(value, bool) and value:
-                    attrs.append(prop)
-                else:
-                    attrs.append(f'{prop}="{value}"')
-
-        attrs_str = " ".join(attrs)
-        return f"<input {attrs_str} />"
-
 class MD(CustomMarkdown):
     def to_md(self, inner, symbol, parent):
         if symbol.get_prop("type") == "checkbox":
-            return f"- [{'x' if symbol.get_prop('checked', '') else ''}] {inner.to_md()}"
+            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):
         if symbol.get_prop("type") == "checkbox":
-            return f"[ ] {inner.to_rst() if inner else ''}"
+            return f"[{'x' if symbol.get_prop('checked', '') else ' '}] {inner.to_rst() if inner else ''}"
         return ""  # Most input types don't have RST equivalents
 
 class Input(Symbol):
@@ -50,6 +34,6 @@ class Input(Symbol):
         "multiple",
         "step"
     ]
-    html = HTML()
+    html = "input"
     md = MD()
     rst = RST()

BetterMD/elements/p.py

@@ -4,4 +4,9 @@ class P(Symbol):
     html = "p"
     md = ""
     rst = "\n\n"
-    nl = True
+    nl = True
+
+class Pre(Symbol):
+    html = "pre"
+    md = ""
+    rst = ""