rewrite style prop + other fixes

Author: rmorshea

src/idom/_console/ast_utils.py

@@ -101,10 +101,9 @@ def find_element_constructor_usages(
             continue
 
         func = node.func
-        if (
-            isinstance(func, ast.Attribute)
-            and isinstance(func.value, ast.Name)
-            and func.value.id == "html"
+        if isinstance(func, ast.Attribute) and (
+            (isinstance(func.value, ast.Name) and func.value.id == "html")
+            or (isinstance(func.value, ast.Attribute) and func.value.attr == "html")
         ):
             name = func.attr
         elif isinstance(func, ast.Name):

src/idom/_console/rewrite_camel_case_props.py

@@ -3,8 +3,10 @@
 import ast
 import re
 import sys
+from copy import copy
 from keyword import kwlist
 from pathlib import Path
+from typing import Callable
 
 import click
 
@@ -46,43 +48,66 @@ def generate_rewrite(file: Path, source: str) -> str | None:
 def find_nodes_to_change(tree: ast.AST) -> list[ChangedNode]:
     changed: list[ChangedNode] = []
     for el_info in find_element_constructor_usages(tree):
-        if isinstance(el_info.props, ast.Dict):
-            did_change = False
-            keys: list[ast.expr | None] = []
-            for k in el_info.props.keys:
-                if isinstance(k, ast.Constant) and isinstance(k.value, str):
-                    new_prop_name = conv_attr_name(k.value)
-                    if new_prop_name != k.value:
-                        did_change = True
-                        keys.append(ast.Constant(new_prop_name))
-                    else:
-                        keys.append(k)
-                else:
-                    keys.append(k)
-            if not did_change:
-                continue
-            el_info.props.keys = keys
-        else:
-            did_change = False
-            keywords: list[ast.keyword] = []
-            for kw in el_info.props.keywords:
-                if kw.arg is not None:
-                    new_prop_name = conv_attr_name(kw.arg)
-                    if new_prop_name != kw.arg:
-                        did_change = True
-                        keywords.append(ast.keyword(arg=new_prop_name, value=kw.value))
-                    else:
-                        keywords.append(kw)
-                else:
-                    keywords.append(kw)
-            if not did_change:
-                continue
-            el_info.props.keywords = keywords
-
-        changed.append(ChangedNode(el_info.call, el_info.parents))
+        if _rewrite_props(el_info.props, _construct_prop_item):
+            changed.append(ChangedNode(el_info.call, el_info.parents))
     return changed
 
 
 def conv_attr_name(name: str) -> str:
     new_name = CAMEL_CASE_SUB_PATTERN.sub("_", name).lower()
     return f"{new_name}_" if new_name in kwlist else new_name
+
+
+def _construct_prop_item(key: str, value: ast.expr) -> tuple[str, ast.expr]:
+    if key == "style" and isinstance(value, (ast.Dict, ast.Call)):
+        new_value = copy(value)
+        if _rewrite_props(
+            new_value,
+            lambda k, v: (
+                (k, v)
+                # avoid infinite recursion
+                if k == "style"
+                else _construct_prop_item(k, v)
+            ),
+        ):
+            value = new_value
+    else:
+        key = conv_attr_name(key)
+    return key, value
+
+
+def _rewrite_props(
+    props_node: ast.Dict | ast.Call,
+    constructor: Callable[[str, ast.expr], tuple[str, ast.expr]],
+) -> bool:
+    if isinstance(props_node, ast.Dict):
+        did_change = False
+        keys: list[ast.expr | None] = []
+        values: list[ast.expr] = []
+        for k, v in zip(props_node.keys, props_node.values):
+            if isinstance(k, ast.Constant) and isinstance(k.value, str):
+                k_value, new_v = constructor(k.value, v)
+                if k_value != k.value or new_v is not v:
+                    did_change = True
+                k = ast.Constant(value=k_value)
+                v = new_v
+            keys.append(k)
+            values.append(v)
+        if not did_change:
+            return False
+        props_node.keys = keys
+        props_node.values = values
+    else:
+        did_change = False
+        keywords: list[ast.keyword] = []
+        for kw in props_node.keywords:
+            if kw.arg is not None:
+                kw_arg, kw_value = constructor(kw.arg, kw.value)
+                if kw_arg != kw.arg or kw_value is not kw.value:
+                    did_change = True
+                kw = ast.keyword(arg=kw_arg, value=kw_value)
+            keywords.append(kw)
+        if not did_change:
+            return
+        props_node.keywords = keywords
+    return True

tests/test__console/test_rewrite_camel_case_props.py

@@ -49,6 +49,18 @@ def test_rewrite_camel_case_props_declarations_no_files():
             "html.div(dict(camelCase='test'))",
             "html.div(dict(camel_case='test'))",
         ),
+        (
+            "idom.html.button({'onClick': block_forever})",
+            "idom.html.button({'on_click': block_forever})",
+        ),
+        (
+            "html.div(dict(style={'testThing': test}))",
+            "html.div(dict(style={'test_thing': test}))",
+        ),
+        (
+            "html.div(dict(style=dict(testThing=test)))",
+            "html.div(dict(style=dict(test_thing=test)))",
+        ),
         (
             "vdom('tag', dict(camelCase='test'))",
             "vdom('tag', dict(camel_case='test'))",