wip

simple_html/nodes.py

@@ -1,10 +1,10 @@
-from typing import Tuple, Union, Dict, List, Generator, Optional
+from typing import Tuple, Union, Dict, List, Generator, Optional, Literal
 
-SafeString = Tuple[str]
+SafeString = Tuple[Literal[":safe:"], str]
 
 
-def safe_string(x: str) -> SafeString:
-    return (x,)
+def safe_string(s: str) -> SafeString:
+    return ":safe:", s
 
 
 Node = Union[
@@ -45,7 +45,7 @@ def __call__(
             if children:
                 return f"{self.tag_start}{attrs}>", children, self.closing_tag
             else:
-                return f"{self.tag_start}{attrs}{self.no_children_close}",
+                return ":safe:", f"{self.tag_start}{attrs}{self.no_children_close}"
         return self.opening_tag, children, self.closing_tag
 
 

simple_html/render.py

@@ -10,17 +10,17 @@ def _render(node: Node, strs: List[str]) -> None:
     mutate a list instead of constantly rendering strings
     """
     if type(node) is tuple:
-        if len(node) == 3:
+        if node[0] == ":safe:":
+            if TYPE_CHECKING:
+                node = cast(SafeString, node)
+            strs.append(node[0])
+        else:
             if TYPE_CHECKING:
                 node = cast(TagTuple, node)
             strs.append(node[0])
             for child in node[1]:
                 _render(child, strs)
             strs.append(node[2])
-        else:
-            if TYPE_CHECKING:
-                node = cast(SafeString, node)
-            strs.append(node[0])
     elif isinstance(node, str):
         strs.append(escape(node))
     elif isinstance(node, Tag):