SVG2DrawIOLib 1.2.1__tar.gz → 1.2.2__tar.gz

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/.gitignore

@@ -38,3 +38,14 @@ debug/
 # Temporary test files
 /test_*.xml
 /test_*.py
+
+# web-ui (Next.js)
+web-ui/node_modules/
+web-ui/.next/
+web-ui/out/
+web-ui/.env.local
+web-ui/.env*.local
+
+# api (FastAPI)
+api/__pycache__/
+api/**/__pycache__/

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SVG2DrawIOLib
-Version: 1.2.1
+Version: 1.2.2
 Summary: Generate DrawIO shape libraries from SVGs
 Project-URL: Homepage, https://github.com/jamesbconner/SVG2DrawIOLib
 Project-URL: Documentation, https://github.com/jamesbconner/SVG2DrawIOLib#readme

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/src/SVG2DrawIOLib/__about__.py

@@ -1,3 +1,3 @@
 """Package version information."""
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/src/SVG2DrawIOLib/icon_analyzer.py

@@ -5,12 +5,12 @@ import binascii
 import logging
 import re
 import xml.etree.ElementTree as ET
-import zlib
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
 
 from SVG2DrawIOLib.models import DrawIOIcon
+from SVG2DrawIOLib.xml_utils import decode_drawio_xml
 
 logger = logging.getLogger(__name__)
 
@@ -51,7 +51,7 @@ class IconAnalyzer:
         """Extract SVG content and style information from icon data.
 
         Args:
-            xml_data: Base64-encoded, compressed mxGraphModel XML.
+            xml_data: Base64-encoded compressed mxGraphModel XML or URL-encoded plain text XML.
 
         Returns:
             Tuple of (svg_content, style_info).
@@ -60,11 +60,8 @@ class IconAnalyzer:
             ValueError: If the data cannot be decompressed or parsed.
         """
         try:
-            # Decode base64
-            compressed = base64.b64decode(xml_data)
-
-            # Decompress using raw DEFLATE (wbits=-15)
-            decompressed = zlib.decompress(compressed, wbits=-15)
+            # Decode XML data (handles both compressed and URL-encoded formats)
+            decompressed = decode_drawio_xml(xml_data)
 
             # Parse mxGraphModel XML
             root = ET.fromstring(decompressed)  # nosec B314 - User-provided library file
@@ -124,13 +121,16 @@ class IconAnalyzer:
             return svg_content, style_info
 
         except binascii.Error as e:
-            raise ValueError(f"Failed to decode base64: {e}") from e
-        except zlib.error as e:
-            raise ValueError(f"Failed to decompress icon data: {e}") from e
-        except ET.ParseError as e:
-            raise ValueError(f"Failed to parse mxGraphModel XML: {e}") from e
+            # This can occur during SVG base64 decoding (line 93)
+            raise ValueError(f"Failed to decode SVG base64: {e}") from e
         except UnicodeDecodeError as e:
+            # This can occur during SVG UTF-8 decoding (line 94)
             raise ValueError(f"Failed to decode SVG UTF-8: {e}") from e
+        except ET.ParseError as e:
+            raise ValueError(f"Failed to parse mxGraphModel XML: {e}") from e
+        except ValueError:
+            # Re-raise ValueError from decode_drawio_xml or other sources
+            raise
 
     def extract_to_file(
         self,

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/src/SVG2DrawIOLib/validator.py

@@ -6,10 +6,11 @@ import json
 import logging
 import re
 import xml.etree.ElementTree as ET
-import zlib
 from pathlib import Path
 from typing import Any
 
+from SVG2DrawIOLib.xml_utils import decode_drawio_xml
+
 logger = logging.getLogger(__name__)
 
 
@@ -165,7 +166,7 @@ class LibraryValidator:
                 }
             )
 
-        # Validate XML data (base64 encoded, compressed mxGraphModel)
+        # Validate XML data (can be base64+compressed or URL-encoded plain text)
         try:
             xml_data = item["xml"]
             if not isinstance(xml_data, str):
@@ -178,28 +179,15 @@ class LibraryValidator:
                 )
                 return issues
 
-            # Try to decode base64
+            # Decode XML data (handles both compressed and URL-encoded formats)
             try:
-                compressed = base64.b64decode(xml_data)
-            except Exception as e:
+                decompressed = decode_drawio_xml(xml_data.encode("utf-8"))
+            except ValueError as e:
                 issues.append(
                     {
                         "severity": "error",
                         "icon": icon_name,
-                        "message": f"Failed to decode base64: {e}",
-                    }
-                )
-                return issues
-
-            # Try to decompress
-            try:
-                decompressed = zlib.decompress(compressed, wbits=-15)
-            except zlib.error as e:
-                issues.append(
-                    {
-                        "severity": "error",
-                        "icon": icon_name,
-                        "message": f"Failed to decompress data: {e}",
+                        "message": str(e),
                     }
                 )
                 return issues
@@ -225,20 +213,8 @@ class LibraryValidator:
                 )
                 return issues
 
-            # Try to recompress to verify round-trip
-            try:
-                co = zlib.compressobj(level=9, wbits=-15)
-                _ = co.compress(decompressed) + co.flush()
-                # Note: Recompressed data may differ slightly due to compression settings
-                logger.debug(f"Icon '{icon_name}': round-trip compression successful")
-            except Exception as e:
-                issues.append(
-                    {
-                        "severity": "warning",
-                        "icon": icon_name,
-                        "message": f"Failed to recompress data: {e}",
-                    }
-                )
+            # For compressed format, verify round-trip (optional validation)
+            # Note: We can't easily detect format after decode, so skip this for now
 
             # Extract and validate SVG content
             svg_issues = self._validate_svg_content(root, icon_name)

svg2drawiolib-1.2.2/src/SVG2DrawIOLib/xml_utils.py

@@ -0,0 +1,55 @@
+"""XML utilities - Shared functions for handling DrawIO XML data."""
+
+import base64
+import binascii
+import html
+import logging
+import urllib.parse
+import zlib
+
+logger = logging.getLogger(__name__)
+
+
+def decode_drawio_xml(xml_data: bytes) -> bytes:
+    """Decode DrawIO XML data from either compressed or URL-encoded format.
+
+    DrawIO libraries can store XML in two formats:
+    1. Compressed: base64-encoded, zlib-compressed (used by svg2drawiolib create)
+    2. URL-encoded: HTML entity-escaped plain text (used by DrawIO native)
+
+    This function automatically detects the format and decodes accordingly.
+
+    Args:
+        xml_data: Raw XML data as bytes (either compressed or URL-encoded).
+
+    Returns:
+        Decompressed/decoded XML data as bytes.
+
+    Raises:
+        ValueError: If the data cannot be decoded in either format.
+    """
+    # Try compressed format first (base64 + zlib)
+    try:
+        compressed = base64.b64decode(xml_data)
+        decompressed = zlib.decompress(compressed, wbits=-15)
+        logger.debug("Detected compressed XML format")
+        return decompressed
+    except (binascii.Error, zlib.error):
+        # Not compressed format, try URL-encoded plain text
+        pass
+
+    # Try URL-encoded format (DrawIO native)
+    try:
+        # Decode from bytes to string
+        xml_str = xml_data.decode("utf-8")
+        # Unescape HTML entities (&lt; -> <, &gt; -> >, etc.)
+        unescaped = html.unescape(xml_str)
+        # URL decode if needed
+        decoded = urllib.parse.unquote(unescaped)
+        decompressed = decoded.encode("utf-8")
+        logger.debug("Detected URL-encoded XML format")
+        return decompressed
+    except Exception as e:
+        raise ValueError(
+            f"Failed to decode XML data (tried both compressed and URL-encoded formats): {e}"
+        ) from e

{svg2drawiolib-1.2.1 → svg2drawiolib-1.2.2}/tests/test_cli_validate.py

@@ -147,7 +147,8 @@ class TestValidateCommand:
 
         result = runner.invoke(cli, ["validate", str(library)])
         assert result.exit_code != 0
-        assert "Failed to decode base64" in result.output
+        # With fallback to URL-encoded format, this now fails at XML parsing
+        assert "Failed to parse mxGraphModel XML" in result.output
 
     def test_validate_invalid_compression(self, runner: CliRunner, tmp_path: Path) -> None:
         """Test validate with data that can't be decompressed."""
@@ -161,7 +162,8 @@ class TestValidateCommand:
 
         result = runner.invoke(cli, ["validate", str(library)])
         assert result.exit_code != 0
-        assert "Failed to decompress data" in result.output
+        # With fallback to URL-encoded format, this now fails at XML parsing
+        assert "Failed to parse mxGraphModel XML" in result.output
 
     def test_validate_invalid_mxgraphmodel(self, runner: CliRunner, tmp_path: Path) -> None:
         """Test validate with invalid mxGraphModel XML."""

svg2drawiolib-1.2.2/tests/test_xml_utils.py

@@ -0,0 +1,116 @@
+"""Tests for XML utilities module."""
+
+import base64
+import zlib
+
+from SVG2DrawIOLib.xml_utils import decode_drawio_xml
+
+
+class TestDecodeDrawIOXML:
+    """Tests for decode_drawio_xml function."""
+
+    def test_decode_compressed_format(self) -> None:
+        """Test decoding base64-encoded, zlib-compressed XML."""
+        # Create test XML
+        xml_content = b"<mxGraphModel><root><mxCell id='0'/></root></mxGraphModel>"
+
+        # Compress and encode
+        co = zlib.compressobj(level=9, wbits=-15)
+        compressed = co.compress(xml_content) + co.flush()
+        encoded = base64.b64encode(compressed)
+
+        # Decode
+        result = decode_drawio_xml(encoded)
+
+        assert result == xml_content
+
+    def test_decode_url_encoded_format(self) -> None:
+        """Test decoding URL-encoded plain text XML."""
+        # Create test XML with HTML entities
+        xml_content = "&lt;mxGraphModel&gt;&lt;root&gt;&lt;mxCell id='0'/&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;"
+        expected = b"<mxGraphModel><root><mxCell id='0'/></root></mxGraphModel>"
+
+        # Decode
+        result = decode_drawio_xml(xml_content.encode("utf-8"))
+
+        assert result == expected
+
+    def test_decode_url_encoded_with_special_chars(self) -> None:
+        """Test decoding URL-encoded XML with special characters."""
+        # XML with URL-encoded special characters
+        xml_content = "&lt;mxGraphModel&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;"
+        expected = b'<mxGraphModel><root><mxCell id="0"/></root></mxGraphModel>'
+
+        # Decode
+        result = decode_drawio_xml(xml_content.encode("utf-8"))
+
+        assert result == expected
+
+    def test_decode_invalid_data(self) -> None:
+        """Test that invalid data is decoded but may not be valid XML."""
+        # Data that's neither valid base64+compressed nor valid XML
+        # The function will decode it via URL-encoding fallback
+        invalid_data = b"this is not valid XML or compressed data!!!"
+
+        # Should decode without error (validation happens at XML parsing level)
+        result = decode_drawio_xml(invalid_data)
+        assert result == invalid_data  # URL-decode doesn't change this string
+
+    def test_decode_valid_base64_but_not_compressed(self) -> None:
+        """Test data that's valid base64 but not compressed."""
+        # Valid base64 but not compressed data
+        data = base64.b64encode(b"not compressed data")
+
+        # Should fall back to URL-encoded format and decode
+        result = decode_drawio_xml(data)
+        # The base64 string gets URL-decoded (no change in this case)
+        assert isinstance(result, bytes)
+
+    def test_decode_empty_data(self) -> None:
+        """Test that empty data is handled."""
+        # Empty data should decode to empty
+        result = decode_drawio_xml(b"")
+        assert result == b""
+
+    def test_decode_compressed_with_complex_xml(self) -> None:
+        """Test decoding compressed XML with complex structure."""
+        # Complex XML with attributes and nested elements
+        xml_content = b"""<mxGraphModel>
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="2" value="test" style="shape=image;image=data:image/svg+xml,PHN2Zz4=" vertex="1" parent="1">
+                    <mxGeometry width="100" height="100" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>"""
+
+        # Compress and encode
+        co = zlib.compressobj(level=9, wbits=-15)
+        compressed = co.compress(xml_content) + co.flush()
+        encoded = base64.b64encode(compressed)
+
+        # Decode
+        result = decode_drawio_xml(encoded)
+
+        assert result == xml_content
+
+    def test_decode_url_encoded_with_complex_xml(self) -> None:
+        """Test decoding URL-encoded XML with complex structure."""
+        # Complex XML with HTML entities
+        xml_content = (
+            "&lt;mxGraphModel&gt;"
+            "&lt;root&gt;"
+            "&lt;mxCell id=&quot;0&quot;/&gt;"
+            "&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;"
+            "&lt;/root&gt;"
+            "&lt;/mxGraphModel&gt;"
+        )
+        expected = (
+            b'<mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/></root></mxGraphModel>'
+        )
+
+        # Decode
+        result = decode_drawio_xml(xml_content.encode("utf-8"))
+
+        assert result == expected