stylelint-plugin-rhythmguard 3.7.0 → 3.7.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ The format follows Keep a Changelog principles and semantic versioning.
 
 ## [Unreleased]
 
+## [3.7.1] - 2026-09-17
+
+### Fixed
+
+- Sass maps declared through a merge helper are read: `$spacers: defaults((...), $spacers)` (Bootstrap v6), `map.merge($base, (...))` and `map-merge((...), (...))` contribute the merged map, later keys winning. The reader also follows Sass assignment rules now: a later plain assignment replaces an earlier `!default`, a later `!default` does not. Before, the first assignment always won, so Bootstrap v6's `$spacers: () !default;` hid the map that followed it and `scale: "auto"` fell back. ([#143](https://github.com/PetriLahdelma/stylelint-plugin-rhythmguard/issues/143))
+
+### Changed
+
+- The quiet benchmark has a `bootstrap-v6` row, the branch its maintainers asked to see (twbs/bootstrap#42907); the manifest accepts a `ref` so a row can pin a branch other than the default.
+- The release verify matrix and the post-publish smoke are back on the self-hosted farm. The repository variable `RELEASE_ON_HOSTED=true` moves a release onto GitHub-hosted runners while the farm is down, without a workflow edit or a re-cut; the release checklist explains when to use it.
+
 ## [3.7.0] - 2026-09-17
 
 ### Added

package/CONTRIBUTING.md

@@ -106,7 +106,7 @@ The maintainer aims to respond to issues and PRs within a week. Small PRs merge
 
 ## Releases
 
-Maintainer-run. Bump `package.json` and `CHANGELOG.md`, create a GitHub release, and `release.yml` verifies the matrix and publishes through npm trusted publishing (OIDC), on GitHub-hosted runners so a release does not depend on the self-hosted farm. Provenance is automatic. The checklist is in [`docs/RELEASE_CHECKLIST.md`](./docs/RELEASE_CHECKLIST.md).
+Maintainer-run. Bump `package.json` and `CHANGELOG.md`, create a GitHub release, and `release.yml` verifies on the self-hosted matrix and publishes through npm trusted publishing (OIDC) from a GitHub-hosted job. The checklist covers cutting a release while the farm is down. Provenance is automatic. The checklist is in [`docs/RELEASE_CHECKLIST.md`](./docs/RELEASE_CHECKLIST.md).
 
 ## Benchmarking performance
 

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://raw.githubusercontent.com/petrilahdelma/stylelint-plugin-rhythmguard/main/assets/rhythmguard-banner.svg?v=10" width="100%" alt="Rhythmguard: stable local evidence for design system drift" />
+  <img src="https://raw.githubusercontent.com/petrilahdelma/stylelint-plugin-rhythmguard/main/assets/rhythmguard-banner.svg?v=11" width="100%" alt="Rhythmguard: stable local evidence for design system drift" />
 </p>
 
 # stylelint-plugin-rhythmguard
@@ -7,7 +7,7 @@
 Nobody chose 13px. Rhythmguard catches off-scale spacing in CSS and Tailwind class strings, tells you the nearest steps on your scale, and snaps to them or to your tokens when you ask.
 
 [![CI](https://img.shields.io/github/actions/workflow/status/petrilahdelma/stylelint-plugin-rhythmguard/ci.yml?branch=main&label=ci)](https://github.com/petrilahdelma/stylelint-plugin-rhythmguard/actions/workflows/ci.yml)
-[![npm version](https://img.shields.io/npm/v/stylelint-plugin-rhythmguard?label=npm&color=1f6feb&r=370)](https://www.npmjs.com/package/stylelint-plugin-rhythmguard)
+[![npm version](https://img.shields.io/npm/v/stylelint-plugin-rhythmguard?label=npm&color=1f6feb&r=371)](https://www.npmjs.com/package/stylelint-plugin-rhythmguard)
 [![npm downloads](https://img.shields.io/npm/dm/stylelint-plugin-rhythmguard.svg)](https://www.npmjs.com/package/stylelint-plugin-rhythmguard)
 [![License: MIT](https://img.shields.io/badge/license-MIT-white.svg)](./LICENSE)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-plugin-rhythmguard",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Nobody chose 13px. Catches off-scale spacing in CSS and Tailwind class strings and snaps it to your scale or tokens. Stylelint rules, an ESLint companion, and an audit CLI.",
   "bin": {
     "rhythmguard": "src/cli/index.js"
@@ -153,7 +153,7 @@
   "devDependencies": {
     "@eslint/js": "^9.39.5",
     "@types/node": "^22.20.1",
-    "c8": "^10.1.3",
+    "c8": "^12.0.0",
     "eslint": "^9.39.5",
     "postcss-scss": "^4.0.9",
     "stylelint": "^16.15.0",

package/src/core/token-sources.js

@@ -456,15 +456,67 @@ function parseScssDeclarations(source) {
     }
 
     startPattern.lastIndex = index;
+    const isDefault = /!default\b/.test(value);
     const cleaned = value.replace(/!(default|global)\b/g, '').trim();
-    if (cleaned && !declarations.has(name)) {
+    // Sass semantics at the top level: `!default` assigns only when the variable is
+    // still unset, a plain assignment always wins. Bootstrap v6 declares
+    // `$spacers: () !default;` and then `$spacers: defaults((...), $spacers);`.
+    if (cleaned && (!declarations.has(name) || !isDefault)) {
       declarations.set(name, cleaned);
     }
   }
 
+  for (const [name, raw] of declarations) {
+    const unwrapped = unwrapScssMapCall(raw, declarations);
+    if (unwrapped) {
+      declarations.set(name, unwrapped);
+    }
+  }
+
   return declarations;
 }
 
+/**
+ * A map declared through a merge helper, read as the map it produces:
+ * `defaults((...), $spacers)` (Bootstrap v6), `map.merge($a, (...))`,
+ * `map-merge((...), (...))`. Map-literal arguments and variables that hold a
+ * map are merged left to right with later keys winning, as Sass does; anything
+ * else (an unset `!default` placeholder, an expression) contributes nothing.
+ */
+const SCSS_MAP_MERGE_CALL = /^(?:defaults|map\.merge|map-merge)\s*\(([\s\S]*)\)$/;
+
+function unwrapScssMapCall(raw, declarations) {
+  const match = raw.match(SCSS_MAP_MERGE_CALL);
+  if (!match) {
+    return null;
+  }
+  const entries = new Map();
+  for (const argument of splitTopLevel(match[1], ',')) {
+    const text = argument.trim();
+    let mapLiteral = null;
+    if (isScssMap(text)) {
+      mapLiteral = text;
+    } else if (/^\$[\w-]+$/.test(text)) {
+      const referenced = declarations.get(text.slice(1));
+      if (referenced && isScssMap(referenced)) {
+        mapLiteral = referenced;
+      }
+    }
+    if (!mapLiteral) {
+      continue;
+    }
+    for (const entry of splitTopLevel(mapLiteral.slice(1, -1), ',')) {
+      const pair = splitTopLevel(entry, ':');
+      if (pair.length < 2) continue;
+      entries.set(pair[0].trim(), pair.slice(1).join(':').trim());
+    }
+  }
+  if (entries.size === 0) {
+    return null;
+  }
+  return `(${[...entries].map(([key, expression]) => `${key}: ${expression}`).join(', ')})`;
+}
+
 function isScssMap(raw) {
   return raw.startsWith('(') && raw.endsWith(')') && /:/.test(raw);
 }