python-fragments 0.26__tar.gz → 0.28__tar.gz

{python_fragments-0.26 → python_fragments-0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.26
+Version: 0.28
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary

{python_fragments-0.26 → python_fragments-0.28}/fragments/ast_nodes.py

@@ -91,7 +91,8 @@ class ASTFragment:
         for child in self.children:
             child.transpile(transpiled_start)
             transpiled_start = child.transpiled_end + 1
-        transpiled_start -= 1
+        if len(self.children) > 0:
+            transpiled_start -= 1
 
         self.transpiled_content = self.__template__.format(",".join(child.transpiled_content for child in self.children))
         self.transpiled_end = self.transpiled_start + len(self.transpiled_content)
@@ -133,7 +134,7 @@ class ASTHTMLElement:
         for child in self.children:
             child.transpile(transpiled_start)
             transpiled_start = child.transpiled_end + 1
-        if self.children:
+        if len(self.children) > 0:
             transpiled_start -= 1
         children = ",".join(child.transpiled_content for child in self.children)
         oneline_offset = len(str(self.one_line))
@@ -406,7 +407,8 @@ class ASTHTMLComment:
 
     def transpile(self, transpiled_start: int) -> None:
         self.transpiled_start = transpiled_start
-        self.transpiled_content = self.__template__.format(self.content)
+        escaped_content = self.content.replace("\n", "\\n").replace("\t", "\\t").replace("\r", "\\r").replace('"', '\\"')
+        self.transpiled_content = self.__template__.format(escaped_content)
         self.transpiled_end = self.transpiled_start + len(self.transpiled_content)
 
     def map_offset(self, offset: int) -> None:

{python_fragments-0.26 → python_fragments-0.28}/fragments/grammar.py

@@ -277,7 +277,7 @@ def expect_children(source: Source) -> tuple[Source, list[ASTHTMLChild]]:
 
 def expect_interpolation(source: Source) -> tuple[Source, ASTInterpolation]:
     """An interpolation block."""
-    INTERPOLATION_EXPRESSION = r"([\s\S]*?)(?= }})"
+    INTERPOLATION_EXPRESSION = r"([\s\S]*?)(?=\s*}})"
     source_start = source.offset
     source = expect_string(source, "{{")
     source, leading_whitespace = source.eat_whitespace()

{python_fragments-0.26 → python_fragments-0.28}/fragments/html/elements.py

@@ -18,7 +18,7 @@ def el(
         name,
         className_to_string(attributes.pop("className")) if "className" in attributes else None,
         style_to_string(attributes.pop("style")) if "style" in attributes else None,
-        attributes_to_string(attributes) if attributes is not None else None,
+        attributes_to_string(attributes) if attributes else None,
     ]
     tag_contents = [item for item in tag_contents if item is not None]
     tag_contents_string = " ".join(tag_contents)

{python_fragments-0.26 → python_fragments-0.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-fragments"
-version = "0.26"
+version = "0.28"
 description = "Modern HTML template rendering in Python"
 authors = [{ name = "The Running Algorithm", email = "services@therunningalgorithm.info" }]
 readme = "README.md"

{python_fragments-0.26 → python_fragments-0.28}/python_fragments.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.26
+Version: 0.28
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary

{python_fragments-0.26 → python_fragments-0.28}/python_fragments.egg-info/SOURCES.txt

@@ -41,4 +41,5 @@ python_fragments.egg-info/entry_points.txt
 python_fragments.egg-info/requires.txt
 python_fragments.egg-info/top_level.txt
 tests/test_grammar.py
+tests/test_html_elements.py
 tests/test_source_map.py

{python_fragments-0.26 → python_fragments-0.28}/tests/test_grammar.py

@@ -46,6 +46,16 @@ def test_comment_multiline():
     ]))
 
 
+def test_comment_multiline_escaped_in_transpile():
+    source = Source.from_string("<><!-- line one\nline two --></>")
+    _, fragment = grammar.expect_fragment(source)
+    fragment.transpile(0)
+    comment = fragment.children[0]
+    assert isinstance(comment, ASTHTMLComment)
+    assert "\\n" in comment.transpiled_content
+    assert "\n" not in comment.transpiled_content
+
+
 def test_comment_inside_element():
     source = Source.from_string("<><div><!-- note --></div></>")
     source, fragment = grammar.expect_fragment(source)
@@ -375,6 +385,39 @@ def test_whitespace_between_adjacent_interpolations_is_preserved():
     ]))
 
 
+def test_interpolation_no_trailing_whitespace():
+    source = Source.from_string("<><NotificationBar user={{ user}} /></>")
+    source, fragment = grammar.expect_fragment(source)
+    assert source.at_end()
+    assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "NotificationBar"), {
+            "user": ASTComponentArgument(-1, -1, "user", None, ASTInterpolation(-1, -1, "user", 1, 0))
+        }, [])
+    ]))
+
+
+def test_interpolation_no_leading_whitespace():
+    source = Source.from_string("<><NotificationBar user={{user }} /></>")
+    source, fragment = grammar.expect_fragment(source)
+    assert source.at_end()
+    assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "NotificationBar"), {
+            "user": ASTComponentArgument(-1, -1, "user", None, ASTInterpolation(-1, -1, "user", 0, 1))
+        }, [])
+    ]))
+
+
+def test_interpolation_no_whitespace():
+    source = Source.from_string("<><NotificationBar user={{user}} /></>")
+    source, fragment = grammar.expect_fragment(source)
+    assert source.at_end()
+    assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "NotificationBar"), {
+            "user": ASTComponentArgument(-1, -1, "user", None, ASTInterpolation(-1, -1, "user", 0, 0))
+        }, [])
+    ]))
+
+
 # ---------------------------------------------------------------------------
 # Full integration (updated for new AST structure)
 # ---------------------------------------------------------------------------

python_fragments-0.28/tests/test_html_elements.py

@@ -0,0 +1,31 @@
+from fragments.html.elements import el, className_to_string
+
+
+def test_className_list_joined_with_spaces():
+    result = className_to_string(["foo", "bar", "baz"])
+    assert result == 'class="foo bar baz"'
+
+
+def test_className_empty_list():
+    result = className_to_string([])
+    assert result == 'class=""'
+
+
+def test_className_single_item_list():
+    result = className_to_string(["only"])
+    assert result == 'class="only"'
+
+
+def test_className_string_passthrough():
+    result = className_to_string("already-a-string")
+    assert result == 'class="already-a-string"'
+
+
+def test_el_className_list_attribute():
+    result = el("div", ["content"], False, {"className": ["foo", "bar"]})
+    assert result == '<div class="foo bar">content</div>'
+
+
+def test_el_className_empty_list():
+    result = el("div", [], True, {"className": []})
+    assert result == '<div class="" />'