edwh-editorjs 2.2.0__tar.gz → 2.2.2__tar.gz

{edwh_editorjs-2.2.0 → edwh_editorjs-2.2.2}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v2.2.2 (2024-11-26)
+
+### Fix
+
+* Support 'html' as alias for 'raw' block ([`4627f90`](https://github.com/educationwarehouse/edwh-editorjs/commit/4627f900a30bf6d6b202790958a78d4ef745ee11))
+
+## v2.2.1 (2024-11-26)
+
+### Fix
+
+* Quick fix to prevent unlimited spaces being added by mdast ([`a196a22`](https://github.com/educationwarehouse/edwh-editorjs/commit/a196a221b623f7d4808aec64ef455197bdcfacaf))
+
 ## v2.2.0 (2024-11-26)
 
 ### Feature

{edwh_editorjs-2.2.0 → edwh_editorjs-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: edwh-editorjs
-Version: 2.2.0
+Version: 2.2.2
 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.2.2/editorjs/__about__.py

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

{edwh_editorjs-2.2.0 → edwh_editorjs-2.2.2}/editorjs/blocks.py

@@ -470,7 +470,7 @@ class QuoteBlock(EditorJSBlock):
         return default_to_text(node)
 
 
-@block("raw")
+@block("raw", "html")
 class RawBlock(EditorJSBlock):
 
     @classmethod
@@ -480,11 +480,11 @@ class RawBlock(EditorJSBlock):
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
-        raise TODO(node)
+        return [raw_block(cls.to_text(node))]
 
     @classmethod
     def to_text(cls, node: MDChildNode) -> str:
-        raise TODO(node)
+        return node.get("value", "")
 
 
 @block("table")

{edwh_editorjs-2.2.0 → edwh_editorjs-2.2.2}/editorjs/core.py

@@ -41,7 +41,7 @@ class EditorJS:
         for child in blocks:
             _type = child["type"]
             if not (block := BLOCKS.get(_type)):
-                raise TypeError(f"Unsupported block type `{_type}`")
+                raise TypeError(f"from_json: Unsupported block type `{_type}`")
 
             data = child.get("data", {})
             # forward any 'tunes' via data:
@@ -76,7 +76,7 @@ class EditorJS:
         for child in self._mdast["children"]:
             _type = child["type"]
             if not (block := BLOCKS.get(_type)):
-                raise TypeError(f"Unsupported block type `{_type}`")
+                raise TypeError(f"to_json: Unsupported block type `{_type}`")
 
             blocks.extend(block.to_json(child))
 
@@ -92,7 +92,9 @@ class EditorJS:
         # idk why this happens:
         md = md.replace(r"\[ ]", "[ ]")
         md = md.replace(r"\[x]", "[x]")
-        return md
+        return md.replace(
+            "  <", " <"
+        )  # replace double space (added by mdast) with single one
 
     def to_mdast(self) -> str:
         """

{edwh_editorjs-2.2.0 → edwh_editorjs-2.2.2}/tests/test_core.py

@@ -135,12 +135,43 @@ def test_raw_html():
     e = EditorJS.from_json(raw_html_json)
     blocks = json.loads(e.to_json())
 
-    print(blocks)
-
     assert blocks["blocks"][0]["type"] == "paragraph", blocks["blocks"][0]["type"]
     assert blocks["blocks"][1]["type"] == "raw", blocks["blocks"][1]["type"]
     assert blocks["blocks"][2]["type"] == "paragraph", blocks["blocks"][2]["type"]
 
+    raw_html_json = r"""[{"id":"xGbqrb40Uz","type":"raw","data":{"html":"<marquee><kaas>mannetje</kaas></marquee>"}}]"""
+
+    e = EditorJS.from_json(raw_html_json)
+
+    print(e.to_mdast(), e.to_markdown())
+    e = EditorJS.from_markdown(e.to_markdown())
+    print(e.to_mdast(), e.to_markdown())
+
+    e = EditorJS.from_markdown(e.to_markdown())
+    e = EditorJS.from_markdown(e.to_markdown())
+    e = EditorJS.from_markdown(e.to_markdown())
+    e = EditorJS.from_markdown(e.to_markdown())
+    e = EditorJS.from_markdown(e.to_markdown())
+
+    print(e.to_markdown())
+    assert "     " not in e.to_markdown(), "added too many whitespaces"
+
+    another_md = r"""<marquee> <kaas>mannetje </kaas> </marquee> <yep>pa
+
+</yep>
+
+sdafasdgasdgdsag
+
+asdfsadfsdf dsfasdf
+
+asdfsdajgdsjaklgkjds
+"""
+
+    e = EditorJS.from_markdown(another_md)
+    print(e.to_markdown())
+    print(e.to_json())
+    assert e.to_json()
+
 
 def test_code():
     e = EditorJS.from_markdown(textwrap.dedent("""

edwh_editorjs-2.2.0/editorjs/__about__.py

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