fix(css): retain Unicode and generic JSX component boundaries

Author: Coding-Dev-Tools

src/deadcode/_typescript.py

@@ -21,10 +21,11 @@ class _Token:
     expressions: tuple[tuple[int, int], ...] = ()
     complete: bool = True
     uncertain: bool = False
+    type_spans: tuple[tuple[int, int], ...] = ()
 
 
 _WORD = re.compile(r"[\w$]+", re.UNICODE)
-_JSX_OPENING = re.compile(r"<[a-zA-Z][\w:.-]*(?=[\s/>])(?!\s*(?:=|extends\b))")
+_JSX_OPENING = re.compile(r"<(?:[^\W\d]|\$)[\w$:.-]*(?=[\s/><])(?!\s*(?:=|extends\b))")
 _JSX_CLOSING = re.compile(r"</(?:[\w$][\w$:.-]*\s*)?>")
 _CLASS_VALUE_OPERATORS = {":", "=", "+=", "-=", "*=", "/=", "%=", "**=", "&=", "|=", "^=", "&&=", "||=", "??="}
 _PREFIX = {"keyof", "readonly", "unique", "typeof", "asserts", "abstract", "new"}
@@ -158,6 +159,7 @@ def _jsx_element(source: str, index: int, depth: int) -> _Token | None:
         return None
     start = index
     expressions = []
+    type_spans = []
     uncertain = False
     if source.startswith("<>", index):
         name = ""
@@ -168,10 +170,23 @@ def _jsx_element(source: str, index: int, depth: int) -> _Token | None:
             return None
         name = source[index + 1 : opening.end()]
         index = opening.end()
+        if index < len(source) and source[index] == "<":
+            arguments = _RuntimeView(source[index:], jsx=False)
+            end = arguments.angle_end(0)
+            if end is None:
+                return None
+            argument_end = index + arguments.tokens[end - 1].end
+            type_spans.append((index, argument_end))
+            index = argument_end
         while index < len(source):
             if source.startswith("/>", index):
                 return _Token(
-                    source[start : index + 2], start, index + 2, expressions=tuple(expressions), uncertain=uncertain
+                    source[start : index + 2],
+                    start,
+                    index + 2,
+                    expressions=tuple(expressions),
+                    uncertain=uncertain,
+                    type_spans=tuple(type_spans),
                 )
             if source[index] == ">":
                 index += 1
@@ -189,7 +204,7 @@ def _jsx_element(source: str, index: int, depth: int) -> _Token | None:
                 uncertain |= nested_uncertain
                 index = end + 1
             elif source[index] == "<":
-                return None  # Generic JSX arguments retain the existing token path.
+                return None
             else:
                 index += 1
         else:
@@ -200,13 +215,19 @@ def _jsx_element(source: str, index: int, depth: int) -> _Token | None:
             if not closing or source[index + 2 : closing.end() - 1].strip() != name:
                 return None
             return _Token(
-                source[start : closing.end()], start, closing.end(), expressions=tuple(expressions), uncertain=uncertain
+                source[start : closing.end()],
+                start,
+                closing.end(),
+                expressions=tuple(expressions),
+                uncertain=uncertain,
+                type_spans=tuple(type_spans),
             )
         if source[index] == "<":
             child = _jsx_element(source, index, depth + 1)
             if child is None:
                 return None
             expressions.extend(child.expressions)
+            type_spans.extend(child.type_spans)
             uncertain |= child.uncertain
             index = child.end
         elif source[index] == "{":
@@ -874,6 +895,11 @@ def render(self, path: str, depth: int) -> str:
         for token in self.tokens:
             for start, end in token.expressions:
                 output[start:end] = class_usage_source(self.source[start:end], path, depth=depth + 1)
+            if path.endswith(".tsx"):
+                for start, end in token.type_spans:
+                    for index in range(start, end):
+                        if output[index] not in "\r\n":
+                            output[index] = " "
         merged = []
         for start, end in sorted(self.erased):
             if merged and start <= merged[-1][1]:

src/deadcode/scanner.py

@@ -268,7 +268,7 @@ def _module_css_definitions(content: str, rel_path: str):
 # delimiter parsing separate from strings inside JavaScript expressions.
 _JS_LITERAL_PATTERN = re.compile(r"""'(?:\\[\s\S]|[^'\\\r\n])*'|"(?:\\[\s\S]|[^"\\\r\n])*"|`(?:\\[\s\S]|[^`\\])*`""")
 _JS_COMMENT_PATTERN = re.compile(r"//[^\r\n]*|/\*[\s\S]*?\*/")
-_JSX_TAG_PATTERN = re.compile(r"<[a-zA-Z][\w:.-]*")
+_JSX_TAG_PATTERN = re.compile(r"<(?:[^\W\d]|\$)[\w$:.-]*")
 _JSX_ATTRIBUTE_PATTERN = re.compile(r"[a-zA-Z_:][\w:.-]*")
 _CLASS_PROPERTY_PATTERN = re.compile(r"""(?<![\w$])(?:className|class|['"]className['"]|['"]class['"])\s*:\s*""")
 _CLASSNAMES_CALL_PATTERN = re.compile(r"(?<![\w$])(?:classNames|clsx)\s*(?=\()")

tests/test_jsx_module_attribute_quotes.py

@@ -111,3 +111,18 @@ def test_typescript_assertion_with_apparent_closing_tag_keeps_live_access(tmp_pa
     )
     findings = DeadCodeScanner(tmp_path).scan().orphaned_css
     assert {finding.name for finding in findings} == {"unused"}
+
+
+@pytest.mark.parametrize("tag", ["Élément", "Button<string>"])
+def test_generic_and_unicode_jsx_keep_module_and_literal_classes(tmp_path, tag):
+    (tmp_path / "Card.module.css").write_text(".card {}\n.unused {}\n", encoding="utf-8")
+    (tmp_path / "global.css").write_text(".literal {}\n.unusedGlobal {}\n", encoding="utf-8")
+    closing = tag.split("<")[0]
+    (tmp_path / "consumer.tsx").write_text(
+        "import styles from './Card.module.css';\n"
+        f'<{tag} className="literal">It\'s <span className={{styles.card}} /></{closing}>;\n',
+        encoding="utf-8",
+    )
+    findings = DeadCodeScanner(tmp_path).scan().orphaned_css
+    assert {finding.name for finding in findings} == {"unused", "unusedGlobal"}
+    assert all(finding.removable for finding in findings)