edwh-editorjs 2.5.0a3__py3-none-any.whl → 2.6.0__py3-none-any.whl

editorjs/__about__.py

@@ -1 +1 @@
-__version__ = "2.5.0a3"
+__version__ = "2.6.0"

editorjs/blocks.py

@@ -5,15 +5,16 @@ mdast to editorjs
 import abc
 import re
 import typing as t
-from html.parser import HTMLParser
 from urllib.parse import urlparse
 
+import html2markdown
 import humanize
+import lxml.html
 import markdown2
 
 from .exceptions import TODO, Unreachable
 from .types import EditorChildData, MDChildNode
-import html2markdown
+
 
 class EditorJSBlock(abc.ABC):
     @classmethod
@@ -53,6 +54,7 @@ def process_styled_content(item: MDChildNode, strict: bool = True) -> str:
         A formatted HTML string based on the item type.
     """
     _type = item.get("type")
+
     html_wrappers = {
         "text": "{value}",
         "html": "{value}",
@@ -82,9 +84,16 @@ def process_styled_content(item: MDChildNode, strict: bool = True) -> str:
 
 
 def default_to_text(node: MDChildNode):
-    return "".join(
-        process_styled_content(child) for child in node.get("children", [])
-    ) or process_styled_content(node)
+    if node["type"] == "paragraph":
+        return "".join(
+            process_styled_content(child) for child in node.get("children", [])
+        )
+    else:
+        return process_styled_content(node)
+
+    # return "".join(
+    #     process_styled_content(child) for child in node.get("children", [])
+    # ) or process_styled_content(node)
 
 
 @block("heading", "header")
@@ -248,8 +257,7 @@ class ParagraphBlock(EditorJSBlock):
 
     @classmethod
     def to_text(cls, node: MDChildNode) -> str:
-        return process_styled_content(node)
-        # return default_to_text(node)
+        return default_to_text(node)
 
 
 @block("list")
@@ -388,7 +396,7 @@ class CodeBlock(EditorJSBlock):
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         code = data.get("code", "")
-        return f"```\n" f"{code}" f"\n```\n"
+        return f"```\n{code}\n```\n"
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
@@ -447,9 +455,9 @@ class ImageBlock(EditorJSBlock):
         border = node.get("border") or ""
 
         return f"""
-        <div class="ce-block {stretched and 'ce-block--stretched'}">
+        <div class="ce-block {stretched and "ce-block--stretched"}">
             <div class="ce-block__content">
-            <div class="cdx-block image-tool image-tool--filled {background and 'image-tool--withBackground'} {stretched and 'image-tool--stretched'} {border and 'image-tool--withBorder'}">
+            <div class="cdx-block image-tool image-tool--filled {background and "image-tool--withBackground"} {stretched and "image-tool--stretched"} {border and "image-tool--withBorder"}">
                 <div class="image-tool__image">
                     <figure>
                         <img class="image-tool__image-picture" src="{url}" title="{caption}" alt="{caption}">
@@ -471,7 +479,7 @@ class QuoteBlock(EditorJSBlock):
         result = f"> {text}\n"
         if caption := data.get("caption", ""):
             result += f"> <cite>{caption}</cite>\n"
-        return result
+        return result + "\n"
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
@@ -497,12 +505,13 @@ class QuoteBlock(EditorJSBlock):
 
     @classmethod
     def to_text(cls, node: MDChildNode) -> str:
-        return default_to_text(node)
+        return "".join(
+            process_styled_content(child) for child in node.get("children", [])
+        )
 
 
 @block("raw", "html")
 class RawBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         text = data.get("html", "")
@@ -525,7 +534,6 @@ class RawBlock(EditorJSBlock):
 
 @block("table")
 class TableBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         """
@@ -644,7 +652,6 @@ class LinkBlock(EditorJSBlock):
 
 @block("attaches")
 class AttachmentBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         title = data.get("title", "")
@@ -709,7 +716,7 @@ class AttachmentBlock(EditorJSBlock):
                 </div>
                 {file_size}
             </div>
-            <a class="cdx-attaches__download-button" href="{node.get('file', '')}" target="_blank" rel="nofollow noindex noreferrer" title="{node.get('name', '')}">
+            <a class="cdx-attaches__download-button" href="{node.get("file", "")}" target="_blank" rel="nofollow noindex noreferrer" title="{node.get("name", "")}">
                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M7 10L11.8586 14.8586C11.9367 14.9367 12.0633 14.9367 12.1414 14.8586L17 10"></path></svg>
             </a>
         </div>
@@ -761,7 +768,6 @@ class AlignmentBlock(EditorJSBlock):
 
 @block("embed")
 class EmbedBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         service = data.get("service", "")
@@ -790,20 +796,6 @@ class EmbedBlock(EditorJSBlock):
 ### end blocks
 
 
-class AttributeParser(HTMLParser):
-    def __init__(self):
-        super().__init__()
-        self.attributes = {}
-        self.data = None
-
-    def handle_starttag(self, tag, attrs):
-        # Collect attributes when the tag is encountered
-        self.attributes = dict(attrs)
-
-    def handle_data(self, data):
-        self.data = data
-
-
 class EditorJSCustom(EditorJSBlock, markdown2.Extra):
     """
     Special type of block to deal with custom attributes.
@@ -816,10 +808,29 @@ class EditorJSCustom(EditorJSBlock, markdown2.Extra):
 
     @classmethod
     def parse_html(cls, html: str):
-        parser = AttributeParser()
-        parser.feed(html)
+        """
+        Extract attributes from the outermost HTML element and return its inner HTML.
+
+        This function parses the provided markup, identifies the root element,
+        returns its attributes as a dictionary, and serializes all direct child
+        nodes back into an HTML string.
+
+        Args:
+            html: A string containing a single root HTML element.
+
+        Returns:
+            A tuple of:
+                - dict[str, str]: Attributes of the root element
+                - str: Inner HTML of the root element
+        """
+        root = lxml.html.fromstring(html)
+
+        attributes = dict(root.attrib)
+        inner_html = "".join(
+            lxml.html.tostring(child, encoding="unicode") for child in root
+        )
 
-        return parser.attributes, parser.data
+        return attributes, inner_html
 
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
@@ -834,6 +845,7 @@ class EditorJSCustom(EditorJSBlock, markdown2.Extra):
         handler = BLOCKS.get(_type)
 
         if not handler:
+            raise ValueError(f"debug: {attrs = } {body = }")  # fixme
             raise ValueError(f"Unknown custom type {_type}")
 
         return handler, attrs

{edwh_editorjs-2.5.0a3.dist-info → edwh_editorjs-2.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: edwh-editorjs
-Version: 2.5.0a3
+Version: 2.6.0
 Summary: EditorJS.py
 Project-URL: Homepage, https://github.com/educationwarehouse/edwh-EditorJS
 Author-email: SKevo <skevo.cw@gmail.com>, Robin van der Noord <robin.vdn@educationwarehouse.nl>
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Requires-Dist: html2markdown
 Requires-Dist: humanize
+Requires-Dist: lxml
 Requires-Dist: markdown2
 Requires-Dist: mdast
 Provides-Extra: dev

edwh_editorjs-2.6.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+editorjs/__about__.py,sha256=OEib63e0yPEGlhEXyrWE1OwRnleR0cHI7KSX7oZEQLs,22
+editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
+editorjs/blocks.py,sha256=QWua1EMZ1dnaIMHw_nY1T4FjNsvCdpa_uVqZsdxdFqk,29454
+editorjs/core.py,sha256=4igv2l8Rm1S92kxKrIXGIUlNHh6pnjq8F28XQr91I9o,4510
+editorjs/exceptions.py,sha256=oKuWqi4CSnFGZfVZWtTZ2XZeHXm5xF-nAtX_1YLm6sI,230
+editorjs/helpers.py,sha256=q861o5liNibMTp-Ozay17taF7CTNsRe901lYhhxdwHg,73
+editorjs/types.py,sha256=W7IZWMWgzJaQulybIt0Gx5N63rVj4mEy73VJWo4VAQA,1029
+edwh_editorjs-2.6.0.dist-info/METADATA,sha256=a_7OrfF1yVNADyKGr03a9H7ek_coxp3decstPniHbSM,1045
+edwh_editorjs-2.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+edwh_editorjs-2.6.0.dist-info/RECORD,,

{edwh_editorjs-2.5.0a3.dist-info → edwh_editorjs-2.6.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

edwh_editorjs-2.5.0a3.dist-info/RECORD

@@ -1,10 +0,0 @@
-editorjs/__about__.py,sha256=_Fi21vxW1-XrA5cHGBb0PFyoSSWodIDwtSp_YSMc2l8,24
-editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
-editorjs/blocks.py,sha256=g8doq2Fykv78Z8Vytgz5IT0cdhTDvadaSDUTAq97iRA,28822
-editorjs/core.py,sha256=4igv2l8Rm1S92kxKrIXGIUlNHh6pnjq8F28XQr91I9o,4510
-editorjs/exceptions.py,sha256=oKuWqi4CSnFGZfVZWtTZ2XZeHXm5xF-nAtX_1YLm6sI,230
-editorjs/helpers.py,sha256=q861o5liNibMTp-Ozay17taF7CTNsRe901lYhhxdwHg,73
-editorjs/types.py,sha256=W7IZWMWgzJaQulybIt0Gx5N63rVj4mEy73VJWo4VAQA,1029
-edwh_editorjs-2.5.0a3.dist-info/METADATA,sha256=6uJqNbhmqS6w0Y50xPOCA1J2lVJUDvOvs6yNDsY7tSE,1027
-edwh_editorjs-2.5.0a3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-edwh_editorjs-2.5.0a3.dist-info/RECORD,,