swap order of classes around

Author: joshuadavidthomas

src/django_bird/params.py

@@ -14,33 +14,44 @@
 
 
 @dataclass
-class Value:
-    raw: str | bool | None
-    quoted: bool = False
+class Params:
+    attrs: list[Param] = field(default_factory=list)
+    props: list[Param] = field(default_factory=list)
 
-    def resolve(self, context: Context | dict[str, Any]) -> str | bool | None | Any:
-        match (self.raw, self.quoted):
-            # Handle special string values and None
-            case (None, _) | ("False", _):
-                return None
-            case ("True", _):
-                return True
+    @classmethod
+    def with_attrs(cls, attrs: list[Param] | None) -> Params:
+        """Create a Params instance with a copy of the provided attrs."""
+        return cls(attrs=attrs.copy() if attrs is not None else [], props=[])
 
-            # Handle boolean values
-            case (bool(boolean), _):
-                return boolean
+    def render_props(self, nodelist: NodeList | None, context: Context):
+        if nodelist is None:
+            return
 
-            # Handle quoted strings as literals
-            case (str(quoted_string), True):
-                return quoted_string
+        attrs_to_remove = set()
 
-            # Handle everything else as template variables, falling back to raw
-            case _:
-                raw_string = str(self.raw)
-                try:
-                    return template.Variable(raw_string).resolve(context)
-                except template.VariableDoesNotExist:
-                    return raw_string
+        for node in nodelist:
+            if not isinstance(node, PropNode):
+                continue
+
+            value = Value(node.default, quoted=False)
+
+            for idx, attr in enumerate(self.attrs):
+                if node.name == attr.name:
+                    resolved = attr.value.resolve(context)
+                    if resolved is not None:
+                        value = attr.value
+                    attrs_to_remove.add(idx)
+
+            self.props.append(Param(name=node.name, value=value))
+
+        for idx in sorted(attrs_to_remove, reverse=True):
+            self.attrs.pop(idx)
+
+        return {prop.name: prop.render_prop(context) for prop in self.props}
+
+    def render_attrs(self, context: Context) -> SafeString:
+        rendered = " ".join(attr.render_attr(context) for attr in self.attrs)
+        return mark_safe(rendered)
 
 
 @dataclass
@@ -75,41 +86,20 @@ def from_bit(cls, bit: str) -> Param:
 
 
 @dataclass
-class Params:
-    attrs: list[Param] = field(default_factory=list)
-    props: list[Param] = field(default_factory=list)
-
-    @classmethod
-    def with_attrs(cls, attrs: list[Param] | None) -> Params:
-        """Create a Params instance with a copy of the provided attrs."""
-        return cls(attrs=attrs.copy() if attrs is not None else [], props=[])
-
-    def render_props(self, nodelist: NodeList | None, context: Context):
-        if nodelist is None:
-            return
-
-        attrs_to_remove = set()
-
-        for node in nodelist:
-            if not isinstance(node, PropNode):
-                continue
-
-            value = Value(node.default, quoted=False)
-
-            for idx, attr in enumerate(self.attrs):
-                if node.name == attr.name:
-                    resolved = attr.value.resolve(context)
-                    if resolved is not None:
-                        value = attr.value
-                    attrs_to_remove.add(idx)
-
-            self.props.append(Param(name=node.name, value=value))
-
-        for idx in sorted(attrs_to_remove, reverse=True):
-            self.attrs.pop(idx)
-
-        return {prop.name: prop.render_prop(context) for prop in self.props}
+class Value:
+    raw: str | bool | None
+    quoted: bool = False
 
-    def render_attrs(self, context: Context) -> SafeString:
-        rendered = " ".join(attr.render_attr(context) for attr in self.attrs)
-        return mark_safe(rendered)
+    def resolve(self, context: Context | dict[str, Any]) -> Any:
+        if self.raw is None or (isinstance(self.raw, str) and self.raw == "False"):
+            return None
+        if (isinstance(self.raw, bool) and self.raw) or (
+            isinstance(self.raw, str) and self.raw == "True"
+        ):
+            return True
+        if isinstance(self.raw, str) and not self.quoted:
+            try:
+                return template.Variable(str(self.raw)).resolve(context)
+            except template.VariableDoesNotExist:
+                return self.raw
+        return self.raw