edwh-editorjs 2.0.0__tar.gz → 2.0.0b2__tar.gz

{edwh_editorjs-2.0.0 → edwh_editorjs-2.0.0b2}/CHANGELOG.md

@@ -2,30 +2,6 @@
 
 <!--next-version-placeholder-->
 
-## v2.0.0 (2024-11-18)
-
-### Fix
-
-* Rendered attachment should not be content-editable ([`58ab562`](https://github.com/educationwarehouse/edwh-editorjs/commit/58ab562daaca233455b3fe66b773af61f1abb0ad))
-
-## v2.0.0-beta.5 (2024-11-07)
-
-### Feature
-
-* Add markdown2 extra to deal with custom `<editorjs />` blocks ([`31d8647`](https://github.com/educationwarehouse/edwh-editorjs/commit/31d8647b7275e245dabf27a99c43d400217705be))
-
-## v2.0.0-beta.4 (2024-11-07)
-
-### Feature
-
-* Support (basic) tables, custom editorjs blocks like linkTool via <editorjs> ([`a6dfadf`](https://github.com/educationwarehouse/edwh-editorjs/commit/a6dfadf21ec008fe714704a056b9ffec751d731c))
-
-## v2.0.0-beta.3 (2024-11-06)
-
-### Fix
-
-* Various fixes with nested lists ([`52a7773`](https://github.com/educationwarehouse/edwh-editorjs/commit/52a7773470dce3eee6a2d17d46b594551ed043a5))
-
 ## v2.0.0-beta.2 (2024-11-06)
 
 ### Feature

{edwh_editorjs-2.0.0 → edwh_editorjs-2.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: edwh-editorjs
-Version: 2.0.0
+Version: 2.0.0b2
 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>

edwh_editorjs-2.0.0b2/editorjs/__about__.py

@@ -0,0 +1 @@
+__version__ = "2.0.0-beta.2"

{edwh_editorjs-2.0.0 → edwh_editorjs-2.0.0b2}/editorjs/blocks.py

@@ -5,10 +5,6 @@ mdast to editorjs
 import abc
 import re
 import typing as t
-from html.parser import HTMLParser
-from urllib.parse import urlparse
-
-import markdown2
 
 from .exceptions import TODO
 from .types import EditorChildData, MDChildNode
@@ -60,7 +56,7 @@ def process_styled_content(item: MDChildNode, strict: bool = True) -> str:
         "strongEmphasis": "<b><i>{value}</i></b>",
         "link": '<a href="{url}">{value}</a>',
         "inlineCode": '<code class="inline-code">{value}</code>',
-        # todo: <mark>, linktool
+        # todo: <mark>
     }
 
     if _type in BLOCKS:
@@ -142,52 +138,16 @@ class ParagraphBlock(EditorJSBlock):
         result = []
         current_text = ""
 
-        skip = 0
-        nodes = node.get("children", [])
-
-        for idx, child in enumerate(nodes):
-            if skip:
-                skip -= 1
-                continue
-
+        for child in node.get("children"):
             _type = child.get("type")
-
-            # deal with custom types
-            if _type == "html" and child.get("value", "").startswith("<editorjs"):
-                # special type, e.g. <editorjs type="linkTool" href=...>...</editorjs>
-
-                if child.get("value", "").endswith("/>"):
-                    # self-closing
-                    result.append(EditorJSCustom.to_json(node))
-                    continue
-                else:
-                    # <editorjs>something</editorjs> = 3 children
-                    result.extend(
-                        EditorJSCustom.to_json({"children": nodes[idx : idx + 2]})
-                    )
-
-                    skip = 2
-                    continue
-
-            elif _type == "image":
+            if _type == "image":
                 if current_text:
                     result.append({"data": {"text": current_text}, "type": "paragraph"})
                     current_text = ""
 
                 result.extend(ImageBlock.to_json(child))
             else:
-                child_text = cls.to_text(child)
-                _child_text = child_text.strip()
-                if _child_text.startswith("|") and _child_text.endswith("|"):
-                    # note: this just supports text-only tables.
-                    # tables with more complex elements break into multiple children.
-                    # and mdast DOES support converting into a Table/TableCell structure
-                    # via the GFM exttension
-                    # but their default mdast->md converter does NOT implement these functionalities.
-                    result.extend(TableBlock.to_json(child))
-                    continue
-
-                current_text += child_text
+                current_text += cls.to_text(child)
 
         # final text after image:
         if current_text:
@@ -211,7 +171,7 @@ class ListBlock(EditorJSBlock):
             markdown_items = []
             for index, item in enumerate(subitems):
                 prefix = f"{index + 1}." if style == "ordered" else "-"
-                line = f"{'\t' * depth}{prefix} {item['content']}"
+                line = f"{'  ' * depth}{prefix} {item['content']}"
                 markdown_items.append(line)
 
                 # Recurse if there are nested items
@@ -220,7 +180,7 @@ class ListBlock(EditorJSBlock):
 
             return "\n".join(markdown_items)
 
-        return "\n" + parse_items(items) + "\n\n"
+        return "\n" + parse_items(items) + "\n"
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
@@ -314,7 +274,7 @@ class ChecklistBlock(ListBlock):
             char = "x" if item.get("checked", False) else " "
             markdown_items.append(f"- [{char}] {text}")
 
-        return "\n" + "\n".join(markdown_items) + "\n\n"
+        return "\n" + "\n".join(markdown_items) + "\n"
 
 
 @block("thematicBreak", "delimiter")
@@ -420,251 +380,3 @@ class QuoteBlock(EditorJSBlock):
     @classmethod
     def to_text(cls, node: MDChildNode) -> str:
         return default_to_text(node)
-
-
-@block("raw")
-class RawBlock(EditorJSBlock):
-
-    @classmethod
-    def to_markdown(cls, data: EditorChildData) -> str:
-        return data.get("html", "")
-
-    @classmethod
-    def to_json(cls, node: MDChildNode) -> list[dict]:
-        raise TODO(node)
-
-    @classmethod
-    def to_text(cls, node: MDChildNode) -> str:
-        raise TODO(node)
-
-
-@block("table")
-class TableBlock(EditorJSBlock):
-
-    @classmethod
-    def to_markdown(cls, data: EditorChildData) -> str:
-        """
-        | Script | Interpreter | User | System |   |
-        |--------|-------------|------|--------|---|
-        |        |             |      |        |   |
-        |        |             |      |        |   |
-        |        |             |      |        |   |
-        """
-
-        table = ""
-        rows = data.get("content", [])
-
-        # Add an empty header row if no headings are provided
-        if not data.get("withHeadings", False) and rows:
-            table += "| " + " | ".join([""] * len(rows[0])) + " |\n"
-            table += "|" + " - |" * len(rows[0]) + "\n"
-
-        # Populate rows
-        for idx, tr in enumerate(rows):
-            table += "| " + " | ".join(tr) + " |\n"
-
-            # Add separator if headings are enabled and it's the first row
-            if not idx and data.get("withHeadings", False):
-                table += "|" + " - |" * len(tr) + "\n"
-
-        return f"\n{table}\n"
-
-    @classmethod
-    def to_json(cls, node: MDChildNode) -> list[dict]:
-        # content":[["Yeah","Okay"],["<i>1</i>","<code class=\"inline-code\">2</code>"]]}}]
-        table = []
-        with_headings = False
-
-        # first row is headings or empty. If not empty, withHeadings is True
-        # second row must be ignored
-        for idx, row in enumerate(node.get("value", "").strip().split("\n")):
-            tr = [_.strip() for _ in row.split("|")[1:-1]]
-            if not idx:
-                # first
-                if any(tr):
-                    with_headings = True
-                    table.append(tr)
-
-            elif idx == 1:
-                continue
-            else:
-                table.append(tr)
-
-        return [
-            {
-                "type": "table",
-                "content": table,
-                "withHeadings": with_headings,
-            }
-        ]
-
-    @classmethod
-    def to_text(cls, node: MDChildNode) -> str:
-        raise TODO(node)
-
-
-@block("linkTool")
-class LinkBlock(EditorJSBlock):
-    @classmethod
-    def to_markdown(cls, data: EditorChildData) -> str:
-        link = data.get("link", "")
-        meta = data.get("meta", {})
-        title = meta.get("title", "")
-        description = meta.get("description", "")
-        image = meta.get("image", {}).get("url", "")
-        return f"""<editorjs type="linkTool" href="{link}" title="{title}" image="{image}">{description}</editorjs>"""
-
-    @classmethod
-    def to_json(cls, node: MDChildNode) -> list[dict]:
-        return [
-            {
-                "type": "linkTool",
-                "data": {
-                    "link": node.get("href", ""),
-                    "meta": {
-                        "title": node.get("title", ""),
-                        "description": node.get("body", ""),
-                        "image": {
-                            "url": node.get("image", ""),
-                        },
-                    },
-                },
-            }
-        ]
-
-    @classmethod
-    def to_text(cls, node: MDChildNode) -> str:
-        url = node.get("href", "")
-        image = node.get("image", "")
-        title = node.get("title", "")
-        body = node.get("body", "")
-        domain = urlparse(url).netloc
-
-        return f"""
-        <div class="link-tool">
-            <a class="link-tool__content link-tool__content--rendered" target="_blank"
-               rel="nofollow noindex noreferrer" href="{url}">
-                <div class="link-tool__image"
-                     style="background-image: url(&quot;{image}&quot;);"></div>
-                <div class="link-tool__title">{title}</div>
-                <p class="link-tool__description">{body}</p>
-                <span class="link-tool__anchor">{domain}</span>
-            </a>
-        </div>
-        """
-
-
-@block("attaches")
-class AttachmentBlock(EditorJSBlock):
-
-    @classmethod
-    def to_markdown(cls, data: EditorChildData) -> str:
-        file = data.get("file", {}).get("url", "")
-        title = data.get("title", "")
-        return f"""<editorjs type="attaches" file="{file}">{title}</editorjs>"""
-
-    @classmethod
-    def to_json(cls, node: MDChildNode) -> list[dict]:
-        return [
-            {
-                "type": "attaches",
-                "data": {
-                    "file": {"url": node.get("file", "")},
-                    "title": node.get("body", ""),
-                },
-            }
-        ]
-
-    @classmethod
-    def to_text(cls, node: MDChildNode) -> str:
-        return f"""
-        <div class="cdx-attaches cdx-attaches--with-file">
-            <div class="cdx-attaches__file-icon">
-                <div class="cdx-attaches__file-icon-background">
-                    <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-linejoin="round" stroke-width="2" d="M13.3236 8.43554L9.49533 12.1908C9.13119 12.5505 8.93118 13.043 8.9393 13.5598C8.94741 14.0767 9.163 14.5757 9.53862 14.947C9.91424 15.3182 10.4191 15.5314 10.9422 15.5397C11.4653 15.5479 11.9637 15.3504 12.3279 14.9908L16.1562 11.2355C16.8845 10.5161 17.2845 9.53123 17.2682 8.4975C17.252 7.46376 16.8208 6.46583 16.0696 5.72324C15.3184 4.98066 14.3086 4.55425 13.2624 4.53782C12.2162 4.52138 11.2193 4.91627 10.4911 5.63562L6.66277 9.39093C5.57035 10.4699 4.97032 11.9473 4.99467 13.4979C5.01903 15.0485 5.66578 16.5454 6.79264 17.6592C7.9195 18.7731 9.43417 19.4127 11.0034 19.4374C12.5727 19.462 14.068 18.8697 15.1604 17.7907L18.9887 14.0354"></path></svg>
-                </div>
-            </div>
-            <div class="cdx-attaches__file-info">
-                <div class="cdx-attaches__title" data-placeholder="File title" data-empty="false">
-                {node.get("body", "")}
-                </div>
-            </div>
-            <a class="cdx-attaches__download-button" href="{node.get('file', '')}" target="_blank" rel="nofollow noindex noreferrer">
-                <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>
-        """
-
-
-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
-    """
-
-    name = "editorjs"
-    order = (), (markdown2.Stage.POSTPROCESS,)
-
-    @classmethod
-    def parse_html(cls, html: str):
-        parser = AttributeParser()
-        parser.feed(html)
-
-        return parser.attributes, parser.data
-
-    @classmethod
-    def to_markdown(cls, data: EditorChildData) -> str:
-        raise TODO()
-
-    @classmethod
-    def to_json(cls, node: MDChildNode) -> list[dict]:
-        html = "".join(_["value"] for _ in node.get("children", []))
-        attrs, body = cls.parse_html(html)
-        _type = attrs.get("type", "")
-        attrs.setdefault("body", body)  # only if there is no such attribute yet
-
-        if not (handler := BLOCKS.get(_type)):
-            raise ValueError(f"Unknown custom type {_type}")
-
-        return handler.to_json(attrs)
-
-    @classmethod
-    def to_text(cls, node: MDChildNode) -> str:
-        raise TODO()
-
-    # markdown2:
-    re_short = re.compile(r"<editorjs.*?/>")
-    re_long = re.compile(r"<editorjs.*?>.*?</editorjs>")
-
-    def run(self, text: str) -> str:
-        def replace_html(match):
-            attrs, body = self.parse_html(match.group())
-            _type = attrs.get("type", "")
-            attrs.setdefault("body", body)  # only if there is no such attribute yet
-
-            if not (handler := BLOCKS.get(_type)):
-                raise ValueError(f"Unknown custom type {_type}")
-
-            return handler.to_text(attrs)
-
-        # Substitute using the replacement functions
-        text = self.re_long.sub(replace_html, text)
-        text = self.re_short.sub(replace_html, text)
-
-        return text
-
-
-EditorJSCustom.register()

{edwh_editorjs-2.0.0 → edwh_editorjs-2.0.0b2}/editorjs/core.py

@@ -6,6 +6,7 @@ import mdast
 from typing_extensions import Self
 
 from .blocks import BLOCKS
+from .exceptions import TODO
 from .helpers import unix_timestamp
 from .types import MDRootNode
 
@@ -15,12 +16,9 @@ EDITORJS_VERSION = "2.30.6"
 class EditorJS:
     # internal representation is mdast, because we can convert to other types
     _mdast: MDRootNode
+    _md = markdown2.Markdown(extras=["task_list"])  # todo: striketrough, table, ...
 
-    def __init__(
-        self,
-        _mdast: str | dict,
-        extras: list = ("task_list", "fenced-code-blocks", "tables", "editorjs"),
-    ):
+    def __init__(self, _mdast: str | dict):
         if not isinstance(_mdast, str | dict):
             raise TypeError("Only `str` or `dict` is supported!")
 
@@ -28,8 +26,6 @@ class EditorJS:
             MDRootNode, json.loads(_mdast) if isinstance(_mdast, str) else _mdast
         )
 
-        self._md = markdown2.Markdown(extras=extras)  # todo: striketrough, ?
-
     @classmethod
     def from_json(cls, data: str | dict) -> Self:
         """
@@ -52,7 +48,6 @@ class EditorJS:
         """
         Load from markdown string
         """
-
         return cls(mdast.md_to_json(data))
 
     @classmethod
@@ -83,11 +78,7 @@ class EditorJS:
         """
         Export Markdown string
         """
-        md = mdast.json_to_md(self.to_mdast())
-        # idk why this happens:
-        md = md.replace(r"\[ ]", "[ ]")
-        md = md.replace(r"\[x]", "[x]")
-        return md
+        return mdast.json_to_md(self.to_mdast())
 
     def to_mdast(self) -> str:
         """
@@ -100,7 +91,6 @@ class EditorJS:
         Export HTML string
         """
         md = self.to_markdown()
-        # todo: deal with custom elements like linktool, attaches
         return self._md.convert(md)
 
     def __repr__(self):

edwh_editorjs-2.0.0b2/tests/test_core.py

@@ -0,0 +1,74 @@
+import textwrap
+
+from editorjs import EditorJS
+
+EXAMPLE_MD = textwrap.dedent("""
+    # Heading
+
+    Paragraph with *special* content __yeah__ such as *[links](https://g.co)!*
+
+    - list (unordered)
+    - with
+        - *nested* lvl 1.0
+        - __nested__ lvl 1.1
+            - nested lvl 2.0
+    - [items](https://g.co)
+
+    1. another
+    2. list (ordered)
+        2.1. with 
+        2.2. nesting
+    3. *and styling*
+
+    ***
+
+    Checkbox:
+    - [ ] unchecked
+    - [ ] *unchecked*
+    - [x] checked
+    - [x] *checked*
+
+    Inline `code`
+
+    ```python
+    def real_code(example: str): 
+        pass
+    ```
+
+    Image: ![Caption](https://py4web.leiden.dockers.local/img/upload/16.txt?hash=3f4b66f9be3306fa7f42c0bcf6238d1101d9c75f "Caption"); post image
+
+
+    > The secret to creativity is knowing how to hide your sources.
+    > Regel 2
+    > <cite>Albert Einstein</cite>
+    """)
+
+EXAMPLE_JSON = r"""{"time":1730905327104,"blocks":[{"id":"1pY2hYfB1A","type":"header","data":{"text":"Heading","level":1}},{"id":"akvQa8k7ne","type":"paragraph","data":{"text":"Paragraph with special content yeah such as <a href=\"https://g.co\">links</a>!"}},{"id":"mtXTKYuP8k","type":"list","data":{"style":"unordered","items":[{"content":"list (unordered)","items":[]},{"content":"with","items":[{"content":"<i>nested</i> lvl 1.0","items":[]},{"content":"<b>nested</b> lvl 1.1","items":[{"content":"nested lvl 2.0","items":[]}]}]},{"content":"<a href=\"https://g.co\">items</a>","items":[]}]}},{"id":"CwdqcNPGp2","type":"list","data":{"style":"ordered","items":[{"content":"another","items":[]},{"content":"list (ordered)\n2.1. with\n2.2. nesting","items":[]},{"content":"<i>and styling</i>","items":[]}]}},{"id":"4aavopqblu","type":"delimiter","data":{}},{"id":"GgTUixlCYO","type":"paragraph","data":{"text":"Checkbox:"}},{"id":"E12TkYu5E_","type":"checklist","data":{"items":[{"text":"unchecked","checked":false},{"text":"<i>unchecked</i>","checked":false},{"text":"checked","checked":true},{"text":"<i>checked</i>","checked":true}]}},{"id":"I-HNbkhXE-","type":"paragraph","data":{"text":"Inline <code class=\"inline-code\">code</code>"}},{"id":"fNKmTrZvXn","type":"code","data":{"code":"def real_code(example: str): \n    pass"}},{"id":"bfHSwu6hjy","type":"paragraph","data":{"text":"Image: "}},{"id":"gClWIHSnxn","type":"image","data":{"caption":"Caption","withBorder":false,"withBackground":false,"stretched":false,"file":{"url":"https://py4web.leiden.dockers.local/img/upload/16.txt?hash=3f4b66f9be3306fa7f42c0bcf6238d1101d9c75f"}}},{"id":"NZ_ruz2mXL","type":"paragraph","data":{"text":"; post image"}},{"id":"Nn7p_3Whpy","type":"quote","data":{"text":"The secret to creativity is knowing how to hide your sources.<br>\nRegel 2<br>\n","caption":"Albert Einstein","alignment":"left"}}],"version":"2.30.6"}"""
+
+def test_md():
+    e = EditorJS.from_markdown(EXAMPLE_MD)
+
+    print(e.to_mdast())
+    print(e.to_markdown())
+    print(e.to_json())
+    print(e.to_html())
+
+
+def test_json():
+    e = EditorJS.from_json(EXAMPLE_JSON)
+
+    print(e.to_mdast())
+    print(e.to_json())
+    print(e.to_markdown())
+    print(e.to_html())
+
+# def test_lossless():
+#     e = EditorJS.from_markdown(EXAMPLE_MD)
+#     assert e == EditorJS.from_mdast(e.to_mdast())
+#     assert e == EditorJS.from_json(e.to_json())
+#     assert e == EditorJS.from_markdown(e.to_markdown())
+#
+#     e = EditorJS.from_json(EXAMPLE_JSON)
+#     assert e == EditorJS.from_mdast(e.to_mdast())
+#     assert e == EditorJS.from_json(e.to_json())
+#     assert e == EditorJS.from_markdown(e.to_markdown())

edwh_editorjs-2.0.0/editorjs/__about__.py

@@ -1 +0,0 @@
-__version__ = "2.0.0"

edwh_editorjs-2.0.0/htmlcov/.gitignore

@@ -1,2 +0,0 @@
-# Created by coverage.py
-*