Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions scripts/check_preview_css_ownership.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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}
Comment on lines +81 to +82

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Recalculate repetition caps for the context-aware counter

Switching counters without recalculating sameFileRepeatedDeclarationCaps gives existing stylesheets headroom for new unconditional duplicates, weakening the non-regression gate this script enforces. For example, mixer-console-foundation.css now counts 0 repetitions against its unchanged cap of 4; appending another :root{color-scheme:dark;} makes verify() pass and report newSameOwnerStacking: 0, whereas the previous counter correctly rejected the increase from 4 to 5. Recalculate the per-file caps using the context-aware parser so distinguishing responsive contexts does not also permit new same-context stacking.

Useful? React with 👍 / 👎.



def verify() -> dict:
Expand Down
15 changes: 12 additions & 3 deletions tests/approved_preview_css_owner_nonregression_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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"):
Expand All @@ -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"):
Expand Down
Loading