edwh-editorjs 2.5.0a4__py3-none-any.whl → 2.6.1__py3-none-any.whl

editorjs/__about__.py

@@ -1 +1 @@
-__version__ = "2.5.0a4"
+__version__ = "2.6.1"

editorjs/blocks.py

@@ -5,15 +5,15 @@ 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):
@@ -55,8 +55,6 @@ def process_styled_content(item: MDChildNode, strict: bool = True) -> str:
     """
     _type = item.get("type")
 
-    print('process_styled_content', _type)
-
     html_wrappers = {
         "text": "{value}",
         "html": "{value}",
@@ -110,9 +108,9 @@ class HeadingBlock(EditorJSBlock):
             raise ValueError("Header level must be between 1 and 6.")
 
         if (
-                tunes.get("alignmentTune")
-                and (alignment := tunes["alignmentTune"].get("alignment"))
-                and (alignment != "left")
+            tunes.get("alignmentTune")
+            and (alignment := tunes["alignmentTune"].get("alignment"))
+            and (alignment != "left")
         ):
             # can't just return regular HTML because then it will turn into a raw block
             return AlignmentBlock.to_markdown(
@@ -172,9 +170,9 @@ class ParagraphBlock(EditorJSBlock):
         tunes = data.get("tunes", {})
 
         if (
-                tunes.get("alignmentTune")
-                and (alignment := tunes["alignmentTune"].get("alignment"))
-                and (alignment != "left")
+            tunes.get("alignmentTune")
+            and (alignment := tunes["alignmentTune"].get("alignment"))
+            and (alignment != "left")
         ):
             return AlignmentBlock.to_markdown(
                 {
@@ -189,6 +187,18 @@ class ParagraphBlock(EditorJSBlock):
 
         return f"{text}\n\n"
 
+    @staticmethod
+    def _find_closing_editorjs_tag(nodes: list, start_idx: int) -> int | None:
+        """Find index of closing </editorjs> tag."""
+        for idx, node in enumerate(nodes[start_idx:], start=start_idx):
+            if (
+                node.get("type") == "html"
+                and node.get("value", "").strip() == "</editorjs>"
+            ):
+                return idx
+
+        return None
+
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
         result = []
@@ -212,14 +222,17 @@ class ParagraphBlock(EditorJSBlock):
 
                 if child.get("value", "").endswith("/>"):
                     # self-closing
-                    result.append(EditorJSCustom.to_json(node))
+                    result.append(EditorJSCustom.to_json({"children": [child]}))
                 else:
-                    # <editorjs>something</editorjs> = 3 children
-                    result.extend(
-                        EditorJSCustom.to_json({"children": nodes[idx: idx + 2]})
+                    # <editorjs>...</editorjs> may include nested HTML; find the closing tag
+                    end_idx = cls._find_closing_editorjs_tag(nodes, idx + 1)
+                    children_slice = (
+                        nodes[idx : idx + 2]
+                        if end_idx is None
+                        else nodes[idx : end_idx + 1]
                     )
-
-                    skip = 2
+                    skip = 2 if end_idx is None else end_idx - idx
+                    result.extend(EditorJSCustom.to_json({"children": children_slice}))
 
                 continue
 
@@ -398,7 +411,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]:
@@ -457,9 +470,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}">
@@ -514,7 +527,6 @@ class QuoteBlock(EditorJSBlock):
 
 @block("raw", "html")
 class RawBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         text = data.get("html", "")
@@ -537,7 +549,6 @@ class RawBlock(EditorJSBlock):
 
 @block("table")
 class TableBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         """
@@ -656,7 +667,6 @@ class LinkBlock(EditorJSBlock):
 
 @block("attaches")
 class AttachmentBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         title = data.get("title", "")
@@ -721,7 +731,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>
@@ -773,7 +783,6 @@ class AlignmentBlock(EditorJSBlock):
 
 @block("embed")
 class EmbedBlock(EditorJSBlock):
-
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         service = data.get("service", "")
@@ -802,20 +811,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.
@@ -828,10 +823,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:
@@ -846,6 +860,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

editorjs/core.py

@@ -100,13 +100,11 @@ class EditorJS:
             try:
                 blocks.extend(block.to_json(child))
             except Exception as e:
-
                 warnings.warn(
                     "to_json: Oh oh, unexpected block failure!",
                     category=RuntimeWarning,
                     source=e,
                 )
-                raise e
                 # if isinstance(e, TODO):
                 #     raise e
 

{edwh_editorjs-2.5.0a4.dist-info → edwh_editorjs-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: edwh-editorjs
-Version: 2.5.0a4
+Version: 2.6.1
 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.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+editorjs/__about__.py,sha256=yv0wJuq7dd_PlBhLN8iuPUYVsoACKuk2R3Gg5WU-tHk,22
+editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
+editorjs/blocks.py,sha256=5FJwfky4QEiNPJxQ61O1D0nQ8eEVWu3a1Qhi79JJKco,30176
+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.1.dist-info/METADATA,sha256=pUeVwld9qEefDaWs0azSpu8mz-2FSq6HlrkZpvWqT-I,1045
+edwh_editorjs-2.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+edwh_editorjs-2.6.1.dist-info/RECORD,,

{edwh_editorjs-2.5.0a4.dist-info → edwh_editorjs-2.6.1.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.0a4.dist-info/RECORD

@@ -1,10 +0,0 @@
-editorjs/__about__.py,sha256=NsEXgGmZNz_m0FN93bP4ym1D0nmcEnCsVmXyWVDMaGI,24
-editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
-editorjs/blocks.py,sha256=Iq6JzxoD5a00ud3KsaUFacBD-zDf9wu1FL5ipxJI_h8,29140
-editorjs/core.py,sha256=9qYmKHr-Wp8TqmMQNfmk0ZCgeARPo0QRS1IV_sLPRag,4535
-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.0a4.dist-info/METADATA,sha256=iIPI5nHDiIjmqlXj3yhPe3AiEpIzGoIgxCGFr8oc3nk,1027
-edwh_editorjs-2.5.0a4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-edwh_editorjs-2.5.0a4.dist-info/RECORD,,