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

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

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

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

@@ -241,7 +241,7 @@ class ASTComponent:
     source_start: int = field(compare=False)
     source_end: int = field(compare=False)
 
-    name: str
+    name: "ASTComponentName"
     arguments: dict[str, "ASTComponentArgument"]
     children: Sequence["ASTHTMLChild"]
 
@@ -253,7 +253,8 @@ class ASTComponent:
 
     def transpile(self, transpiled_start: int) -> None:
         self.transpiled_start = transpiled_start
-        transpiled_start = transpiled_start + len(self.name) + 2
+        self.name.transpile(self.transpiled_start)
+        transpiled_start = self.name.transpiled_end + 2
         for child in self.children:
             child.transpile(transpiled_start)
             transpiled_start = child.transpiled_end + 1
@@ -262,7 +263,7 @@ class ASTComponent:
         children = ",".join(child.transpiled_content for child in self.children)
 
         if len(self.arguments) == 0:
-            self.transpiled_content = self.__template__.format(self.name, children, "")
+            self.transpiled_content = self.__template__.format(self.name.transpiled_content, children, "")
             self.transpiled_end = self.transpiled_start + len(self.transpiled_content)
             return
 
@@ -272,10 +273,13 @@ class ASTComponent:
             transpiled_start = attribute.transpiled_end + 1
 
         attributes = ",".join(attribute.transpiled_content for attribute in self.arguments.values())
-        self.transpiled_content = self.__template__.format(self.name, children, attributes)
+        self.transpiled_content = self.__template__.format(self.name.transpiled_content, children, attributes)
         self.transpiled_end = self.transpiled_start + len(self.transpiled_content)
 
     def map_offset(self, offset: int) -> int | None:
+        if self.name.source_start < offset < self.name.source_end:
+            return self.name.map_offset(offset)
+
         for attribute in self.arguments.values():
             if attribute.source_start <= offset <= attribute.source_end:
                 return attribute.map_offset(offset)
@@ -287,6 +291,9 @@ class ASTComponent:
         return None
 
     def unmap_offset(self, offset: int) -> int | None:
+        if self.name.transpiled_start < offset < self.name.transpiled_end:
+            return self.name.unmap_offset(offset)
+
         for attribute in self.arguments.values():
             if attribute.transpiled_start <= offset <= attribute.transpiled_end:
                 return attribute.unmap_offset(offset)
@@ -298,6 +305,37 @@ class ASTComponent:
         return None
 
 
+@dataclass(slots=True)
+class ASTComponentName:
+    source_start: int = field(compare=False)
+    source_end: int = field(compare=False)
+
+    name: str
+
+    transpiled_content: str = field(init=False)
+    transpiled_start: int = field(init=False)
+    transpiled_end: int = field(init=False)
+
+    def transpile(self, offset: int) -> None:
+        self.transpiled_start = offset
+        self.transpiled_content = self.name
+        self.transpiled_end = offset + len(self.name)
+
+    def map_offset(self, offset: int) -> int | None:
+        if self.source_start <= offset <= self.source_end:
+            specific_offset = offset - self.source_start
+            return self.transpiled_start + specific_offset
+
+        return None
+
+    def unmap_offset(self, offset: int) -> int | None:
+        if self.transpiled_start <= offset <= self.transpiled_end:
+            specific_offset = offset - self.transpiled_start
+            return self.source_start + specific_offset
+
+        return None
+
+
 @dataclass(slots=True)
 class ASTComponentArgument:
     source_start: int = field(compare=False)
@@ -327,6 +365,10 @@ class ASTComponentArgument:
         self.transpiled_end = self.transpiled_start + len(self.transpiled_content)
 
     def map_offset(self, offset: int) -> int | None:
+        if self.source_start <= offset <= self.source_start + len(self.name):
+            specific_offset = offset - self.source_start
+            return self.transpiled_start + specific_offset
+
         if self.interpolation is None:
             return None
 
@@ -336,6 +378,10 @@ class ASTComponentArgument:
         return None
 
     def unmap_offset(self, offset: int) -> int | None:
+        if self.transpiled_start <= offset <= self.transpiled_start + len(self.name):
+            specific_offset = offset - self.transpiled_start
+            return self.source_start + specific_offset
+
         if self.interpolation is None:
             return None
 

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

@@ -4,6 +4,7 @@ import re
 from fragments.ast_nodes import (
     ASTComponent,
     ASTComponentArgument,
+    ASTComponentName,
     ASTControlNode,
     ASTFragment,
     ASTHTMLAttribute,
@@ -140,7 +141,7 @@ def expect_component(source: Source) -> tuple[Source, ASTComponent | ASTControlN
     """An pseudo-element that actually resolves into a user-defined function call."""
     source_start = source.offset
     source = expect_string(source, "<")
-    source, name = expect_regex(source, r"[A-Z][a-zA-Z0-9_]*", "component name")
+    source, name = expect_component_name(source)
     source, _ = source.eat_whitespace()
 
     arguments: dict[str, ASTComponentArgument] = {}
@@ -170,12 +171,12 @@ def expect_component(source: Source) -> tuple[Source, ASTComponent | ASTControlN
     source = expect_string(source, ">")
     source, children = expect_children(source)
     source = expect_string(source, "</")
-    source, closing_name = expect_regex(source, r"[A-Z][a-zA-Z0-9_]*", "component name")
+    source, closing_name = expect_component_name(source)
     source, _ = source.eat_whitespace()
     source = expect_string(source, ">")
 
-    if name != closing_name:
-        raise ParsingError(f"Element closed ({closing_name!r}) is not the same as currently opened element ({name!r})", source.offset)
+    if name.name != closing_name.name:
+        raise ParsingError(f"Element closed ({closing_name.name}) is not the same as currently opened element ({name.name})", source.offset)
 
     return source, ASTControlNode[ASTComponent].wrap_child(
         ASTComponent(source_start=source_start, source_end=source.offset, name=name, arguments=arguments, children=children),
@@ -184,6 +185,13 @@ def expect_component(source: Source) -> tuple[Source, ASTComponent | ASTControlN
     )
 
 
+def expect_component_name(source: Source) -> tuple[Source, ASTComponentName]:
+    """An identifier corresponding with a Python function."""
+    source_start = source.offset
+    source, name = expect_regex(source, r"[A-Z][a-zA-Z0-9_]*", "component name")
+    return source, ASTComponentName(source_start, source.offset, name)
+
+
 def expect_html_comment(source: Source) -> tuple[Source, ASTHTMLComment]:
     source_start = source.offset
     source = expect_string(source, "<!--")
@@ -261,7 +269,9 @@ def expect_children(source: Source) -> tuple[Source, list[ASTHTMLChild]]:
     while not source.remaining().startswith("</"):
         source, child = expect_child(source)
         children.append(child)
-        source, _ = source.eat_whitespace()
+        source_after_whitespace, _ = source.eat_whitespace()
+        if not source_after_whitespace.remaining().startswith("{{"):
+            source = source_after_whitespace
     return source, children
 
 

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

@@ -1,6 +1,7 @@
 import json
 from typing import Any
 from fragments.types import Children
+import html
 
 
 def sequence(children: Children) -> str:
@@ -46,7 +47,7 @@ def attribute_to_string(name: str, value: Any) -> str:
         value = list(value)
 
     if isinstance(value, dict) or isinstance(value, list):
-        value = json.dumps(value)
+        value = html.escape(json.dumps(value))
 
     if isinstance(value, bool):
         value = str(value).lower()

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

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

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

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

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

@@ -4,6 +4,7 @@ from fragments import grammar
 from fragments.ast_nodes import (
     ASTComponent,
     ASTComponentArgument,
+    ASTComponentName,
     ASTControlNode,
     ASTFragment,
     ASTHTMLAttribute,
@@ -209,7 +210,7 @@ def test_component_self_closing():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {}, [])
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {}, [])
     ]))
 
 
@@ -218,7 +219,7 @@ def test_component_with_double_quote_argument():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {
             "name": ASTComponentArgument(-1, -1, "name", '"hello"', None)
         }, [])
     ]))
@@ -229,7 +230,7 @@ def test_component_with_single_quote_argument():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {
             "name": ASTComponentArgument(-1, -1, "name", "'hello'", None)
         }, [])
     ]))
@@ -240,7 +241,7 @@ def test_component_with_interpolation_argument():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {
             "value": ASTComponentArgument(-1, -1, "value", None, ASTInterpolation(-1, -1, "expr", 1, 1))
         }, [])
     ]))
@@ -251,7 +252,7 @@ def test_component_with_children():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {}, [
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {}, [
             ASTHTMLElement(-1, -1, "p", {}, [ASTHTMLText(-1, -1, "text")], False)
         ])
     ]))
@@ -262,7 +263,7 @@ def test_component_whitespace_stripped_from_children():
     source, fragment = grammar.expect_fragment(source)
     assert source.at_end()
     assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
-        ASTComponent(-1, -1, "MyComp", {}, [
+        ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {}, [
             ASTHTMLElement(-1, -1, "p", {}, [ASTHTMLText(-1, -1, "text")], False)
         ])
     ]))
@@ -276,7 +277,7 @@ def test_component_with_if():
         ASTControlNode(-1, -1,
             ASTInterpolation(-1, -1, "condition", 1, 1),
             None,
-            ASTComponent(-1, -1, "MyComp", {}, []),
+            ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {}, []),
         )
     ]))
 
@@ -289,7 +290,7 @@ def test_component_with_for():
         ASTControlNode(-1, -1,
             None,
             ASTInterpolation(-1, -1, "item in items", 1, 1),
-            ASTComponent(-1, -1, "MyComp", {}, []),
+            ASTComponent(-1, -1, ASTComponentName(-1, -1, "MyComp"), {}, []),
         )
     ]))
 
@@ -361,6 +362,19 @@ def test_html_text_multiline_before_child_element():
     ]))
 
 
+def test_whitespace_between_adjacent_interpolations_is_preserved():
+    source = Source.from_string("<><p>{{ a }} {{ b }}</p></>")
+    source, fragment = grammar.expect_fragment(source)
+    assert source.at_end()
+    assert _transpiled(fragment) == _transpiled(ASTFragment(-1, -1, [
+        ASTHTMLElement(-1, -1, "p", {}, [
+            ASTInterpolation(-1, -1, "a", 1, 1),
+            ASTHTMLText(-1, -1, " "),
+            ASTInterpolation(-1, -1, "b", 1, 1),
+        ], False)
+    ]))
+
+
 # ---------------------------------------------------------------------------
 # Full integration (updated for new AST structure)
 # ---------------------------------------------------------------------------