move param parsing from BirdNode to Params constructor (#159)

Author: joshuadavidthomas

src/django_bird/params.py

@@ -10,11 +10,11 @@
 from django.utils.safestring import SafeString
 from django.utils.safestring import mark_safe
 
+from .templatetags.tags.bird import BirdNode
 from .templatetags.tags.prop import PropNode
 
 if TYPE_CHECKING:
     from django_bird.components import Component
-    from django_bird.templatetags.tags.bird import BirdNode
 
 
 @dataclass
@@ -54,7 +54,10 @@ def render_attrs(self, context: Context) -> SafeString:
 
     @classmethod
     def from_node(cls, node: BirdNode) -> Params:
-        return cls(attrs=node.attrs.copy(), props=[])
+        return cls(
+            attrs=[Param.from_bit(bit) for bit in node.attrs],
+            props=[],
+        )
 
 
 @dataclass

src/django_bird/templatetags/tags/bird.py

@@ -1,6 +1,8 @@
 # pyright: reportAny=false
 from __future__ import annotations
 
+from typing import final
+
 from django import template
 from django.template.base import NodeList
 from django.template.base import Parser
@@ -9,31 +11,29 @@
 
 from django_bird._typing import TagBits
 from django_bird._typing import override
-from django_bird.params import Param
 
 TAG = "bird"
 END_TAG = "endbird"
 
 
 def do_bird(parser: Parser, token: Token) -> BirdNode:
-    bits = token.split_contents()
-    if len(bits) == 1:
+    _tag, *bits = token.split_contents()
+    if not bits:
         msg = f"{TAG} tag requires at least one argument"
         raise template.TemplateSyntaxError(msg)
 
-    name = bits[1]
-    attrs = []
+    name = bits.pop(0)
+    attrs: TagBits = []
     isolated_context = False
 
-    for bit in bits[2:]:
+    for bit in bits:
         match bit:
             case "only":
                 isolated_context = True
             case "/":
                 continue
             case _:
-                param = Param.from_bit(bit)
-                attrs.append(param)
+                attrs.append(bit)
 
     nodelist = parse_nodelist(bits, parser)
     return BirdNode(name, attrs, nodelist, isolated_context)
@@ -50,11 +50,12 @@ def parse_nodelist(bits: TagBits, parser: Parser) -> NodeList | None:
     return nodelist
 
 
+@final
 class BirdNode(template.Node):
     def __init__(
         self,
         name: str,
-        attrs: list[Param],
+        attrs: TagBits,
         nodelist: NodeList | None,
         isolated_context: bool = False,
     ) -> None:

tests/templatetags/test_bird.py

@@ -12,8 +12,6 @@
 from django.template.exceptions import TemplateSyntaxError
 
 from django_bird.components import Component
-from django_bird.params import Param
-from django_bird.params import Value
 from django_bird.templatetags.tags.bird import END_TAG
 from django_bird.templatetags.tags.bird import TAG
 from django_bird.templatetags.tags.bird import BirdNode
@@ -55,36 +53,12 @@ def test_missing_name_do_bird(self):
     @pytest.mark.parametrize(
         "params,expected_attrs",
         [
-            (
-                'class="btn"',
-                [Param(name="class", value=Value('"btn"'))],
-            ),
-            (
-                'class="btn"',
-                [Param(name="class", value=Value('"btn"'))],
-            ),
-            (
-                'class="btn" id="my-btn"',
-                [
-                    Param(name="class", value=Value('"btn"')),
-                    Param(name="id", value=Value('"my-btn"')),
-                ],
-            ),
-            (
-                "disabled",
-                [Param(name="disabled", value=Value(True))],
-            ),
-            (
-                "class=dynamic",
-                [Param(name="class", value=Value("dynamic"))],
-            ),
-            (
-                "class=item.name id=user.id",
-                [
-                    Param(name="class", value=Value("item.name")),
-                    Param(name="id", value=Value("user.id")),
-                ],
-            ),
+            ('class="btn"', ['class="btn"']),
+            ("class='btn'", ["class='btn'"]),
+            ('class="btn" id="my-btn"', ['class="btn"', 'id="my-btn"']),
+            ("disabled", ["disabled"]),
+            ("class=dynamic", ["class=dynamic"]),
+            ("class=item.name id=user.id", ["class=item.name", "id=user.id"]),
         ],
     )
     def test_attrs_do_bird(self, params, expected_attrs):

tests/test_params.py

@@ -269,14 +269,11 @@ def test_render_attrs(self, params, context, expected):
         "attrs,expected",
         [
             (
-                [Param(name="class", value=Value('"btn"'))],
+                ['class="btn"'],
                 Params(attrs=[Param(name="class", value=Value('"btn"'))]),
             ),
             (
-                [
-                    Param(name="class", value=Value('"btn"')),
-                    Param(name="id", value=Value('"my-btn"')),
-                ],
+                ['class="btn"', 'id="my-btn"'],
                 Params(
                     attrs=[
                         Param(name="class", value=Value('"btn"')),
@@ -285,18 +282,15 @@ def test_render_attrs(self, params, context, expected):
                 ),
             ),
             (
-                [Param(name="disabled", value=Value(True))],
+                ["disabled"],
                 Params(attrs=[Param(name="disabled", value=Value(True))]),
             ),
             (
-                [Param(name="class", value=Value("dynamic"))],
+                ["class=dynamic"],
                 Params(attrs=[Param(name="class", value=Value("dynamic"))]),
             ),
             (
-                [
-                    Param(name="class", value=Value("item.name")),
-                    Param(name="id", value=Value("user.id")),
-                ],
+                ["class=item.name", "id=user.id"],
                 Params(
                     attrs=[
                         Param(name="class", value=Value("item.name")),