python-fragments 0.22__py3-none-any.whl → 0.26__py3-none-any.whl

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
 

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
 
 

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.dist-info → python_fragments-0.26.dist-info}/METADATA

@@ -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.dist-info → python_fragments-0.26.dist-info}/RECORD

@@ -1,13 +1,13 @@
 fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fragments/ast_nodes.py,sha256=t_P4MKJ915oC9oxUet_uKZc8fiYZRk6QKoGUfeHlFZ8,18268
+fragments/ast_nodes.py,sha256=LKj73eO04I01_po8F2vNT8yCziECt8bMS1Vfo12V70Y,19988
 fragments/cli.py,sha256=9P9fvurRlROstWUh-tjneFt9IrVvgxcBEd3pn0wL_CE,1292
-fragments/grammar.py,sha256=hfioDIbUr8r-2JRfF0bVG6nJ2UoMt_9QbrQZ13EEUh0,12455
+fragments/grammar.py,sha256=5JzDukLFxhyxWOWUJQFzKNsfm0RTtSjF678vOLjDLW4,12887
 fragments/loader.py,sha256=7nlsXVjCpRRmd939UJQqd9NWbE2-3ZtbO0aFfz3zCs8,980
 fragments/source.py,sha256=cbDzLOlFy2C6xZe-ZWcroieGG-7PLTdLJi003aIdegg,1000
 fragments/transpiler.py,sha256=O4pusCuv_Hbms2J0AP3tun-uNkXfb27RBUugr_0dIVA,316
 fragments/types.py,sha256=tPD0YHT5rOaZMfrXWDz6W0HEQwu4EJyfVNR-pd_CX0A,152
 fragments/html/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fragments/html/elements.py,sha256=3kJOWzR7YiYYnYHgx3EeQnsG54Xn9xndxE2wCdErRas,1873
+fragments/html/elements.py,sha256=admLd2C9hcxdSjAwA9XvS7BbxMfregzwb_4AuBtOF_0,1898
 fragments/lsp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fragments/lsp/based_proxy.py,sha256=pFH-70H7uvy8yqxmq2s3jOmHw_CrAUHzyqiQXmDpJEI,3746
 fragments/lsp/file_state.py,sha256=mghS-hcvZyPb8n9Ufypteu9DDZfv9Ktin-3C7GYxBh0,3292
@@ -32,8 +32,8 @@ fragments/lsp/pyright_notification_handlers/__init__.py,sha256=47DEQpj8HBSa-_TIm
 fragments/lsp/pyright_notification_handlers/capability.py,sha256=1xH6SttTtWKAovCfx8WeJApRI4rrVlZDGCWHtlyGTUE,868
 fragments/lsp/pyright_notification_handlers/configuration.py,sha256=Qomq8tCVcBg15MYDPby-PeRp4kJe7k8o6-2VRAYQ0hI,1009
 fragments/lsp/pyright_notification_handlers/diagnostics.py,sha256=n_YZ8k8PHKcpHrgmTYTU2-pKi0P_v_WC1irqtAcs_iI,1107
-python_fragments-0.22.dist-info/METADATA,sha256=bGTXQ-rRAFYMFbATYWyABTuJHGhpsUyPoLnJgpR1Rfo,1545
-python_fragments-0.22.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_fragments-0.22.dist-info/entry_points.txt,sha256=9xVMCpt9OucM3W3fh0UnEeErKEyI6CNIFqfQCIuGmi8,96
-python_fragments-0.22.dist-info/top_level.txt,sha256=4r1SNnHOK3BVhAT_KgV8MRq9kiV23yK_rnuTAEl5oRg,10
-python_fragments-0.22.dist-info/RECORD,,
+python_fragments-0.26.dist-info/METADATA,sha256=3es1e7oJTxa5wcarNEWlor8W4oRTuzz3zmAOFMwBnX0,1545
+python_fragments-0.26.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_fragments-0.26.dist-info/entry_points.txt,sha256=9xVMCpt9OucM3W3fh0UnEeErKEyI6CNIFqfQCIuGmi8,96
+python_fragments-0.26.dist-info/top_level.txt,sha256=4r1SNnHOK3BVhAT_KgV8MRq9kiV23yK_rnuTAEl5oRg,10
+python_fragments-0.26.dist-info/RECORD,,