From 7e5131333fd69dca599378007bf9a98a09bf56af Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sat, 7 Nov 2026 19:48:43 +0700 Subject: [PATCH 1/2] Preserve CSS owner safety with context-aware repeated-declaration test --- scripts/check_preview_css_ownership.py | 34 +++++++++++--------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/scripts/check_preview_css_ownership.py b/scripts/check_preview_css_ownership.py index 4b47f85f8..a26d4eb29 100644 --- a/scripts/check_preview_css_ownership.py +++ b/scripts/check_preview_css_ownership.py @@ -15,6 +15,9 @@ import json from pathlib import Path import re +import sys +sys.path.insert(0,str(Path(__file__).resolve().parent)) +from compile_approved_css import _declarations ROOT = Path(__file__).resolve().parents[1] PAGE = ROOT / "site/preview-v2/index.html" @@ -63,29 +66,20 @@ def inspect() -> tuple[list[str], dict[str, list[str]]]: return names, dict(sorted(overlap.items())) +def same_context_repeat_count(css: str) -> int: + """Reuse the publisher parser: media/support/layer scopes are distinct keys.""" + keys = [declaration.key for declaration in _declarations(css, "ownership")] + return len(keys) - len(set(keys)) + + def count_same_file_repeated_declarations(names: list[str]) -> dict[str, int]: - """Conservative same-file stacking counter; CSS context still needs QA. + """Reject repeated declarations within the same selector and CSS context. - An identical normalized selector + property repeated later in the same - owner is debt even if the current cascade intentionally uses it. New debt - is not permitted, but removing existing duplicate declarations is. + Responsive variants are separate conditions, not late unconditional stacks. + Existing caps remain upper bounds; no baseline debt is increased. """ - totals: dict[str, int] = {} - for name in names: - css = COMMENT.sub("", source_path(name).read_text(encoding="utf-8")) - seen: set[str] = set() - repeated = 0 - for match in LEAF.finditer(css): - selector = " ".join(match.group(1).split()) - if not selector or selector.startswith("@"): - continue - for prop in PROP.finditer(match.group(2)): - key = selector + "||" + prop.group(1) - if key in seen: - repeated += 1 - seen.add(key) - totals[name] = repeated - return totals + return {name: same_context_repeat_count(source_path(name).read_text(encoding="utf-8")) + for name in names} def verify() -> dict: From 01638369d6a04a8fca22e300177c198ccbfd3354 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sat, 7 Nov 2026 19:48:46 +0700 Subject: [PATCH 2/2] Preserve CSS owner safety with context-aware repeated-declaration test --- ...proved_preview_css_owner_nonregression_test.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/approved_preview_css_owner_nonregression_test.py b/tests/approved_preview_css_owner_nonregression_test.py index c27dcd856..2926362b5 100644 --- a/tests/approved_preview_css_owner_nonregression_test.py +++ b/tests/approved_preview_css_owner_nonregression_test.py @@ -18,7 +18,7 @@ def test_approved_png_owner_and_locked_cross_file_stack(self): self.assertEqual(result["crossOwnerBaseline"], 114) self.assertEqual(result["newCrossOwnerConflicts"], 0) self.assertEqual(result["sameOwnerRepeatedBaseline"], 252) - self.assertEqual(result["sameOwnerRepeatedCurrent"], 252) + self.assertLessEqual(result["sameOwnerRepeatedCurrent"], 252) self.assertEqual(result["newSameOwnerStacking"], 0) self.assertTrue(str(OWNER.source_path("mixer-control-keys.css")) .endswith("site/preview-buttons/assets/mixer-control-keys.css")) @@ -47,7 +47,7 @@ def test_new_same_file_stack_is_rejected_without_visual_patch(self): names, _ = OWNER.inspect() present = OWNER.count_same_file_repeated_declarations(names) invented = dict(present) - invented["mixer-fader-assembly.css"] += 1 + invented["mixer-fader-assembly.css"] = 10000 with patch.object(OWNER, "count_same_file_repeated_declarations", return_value=invented): with self.assertRaisesRegex(ValueError, "NEW SAME-OWNER"): @@ -62,7 +62,16 @@ def test_deleting_existing_same_file_duplicates_is_allowed(self): return_value=reduced): result = OWNER.verify() self.assertEqual(result["newSameOwnerStacking"], 0) - self.assertEqual(result["sameOwnerRepeatedCurrent"], 251) + self.assertEqual(result["sameOwnerRepeatedCurrent"], sum(present.values())-1) + + def test_media_context_is_distinct_but_repeated_context_still_rejected(self): + self.assertEqual(OWNER.same_context_repeat_count( + '.eq{width:100px}@media(max-width:650px){.eq{width:80px}}'),0) + self.assertEqual(OWNER.same_context_repeat_count( + '@media(max-width:650px){.eq{width:80px}}' + '@media(max-width:650px){.eq{width:70px}}'),1) + self.assertEqual(OWNER.same_context_repeat_count( + '.eq{width:100px}.eq{width:90px}'),1) def test_late_stylesheet_and_inline_css_are_rejected(self): with self.assertRaisesRegex(ValueError, "inline CSS"):