remarque-tokens 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to `remarque-tokens` are documented here. Token value
 changes always state the design rationale — downstream sites pin against
 these entries when syncing.
 
+## 0.6.1 — 2026-07-21
+
+### Fixed
+Three audit/parser bugs from real-world adoption (#67, found by tsundoku):
+- Body-less at-statements (`@import`, `@charset`) preceding a block no
+  longer pollute its prelude and misclassify it as an at-rule — palette
+  files may begin with imports.
+- Selector classification accepts qualified root forms (`html:root`,
+  `html[data-theme="dark"]`, `body.dark`, …) instead of exact strings.
+- `--src` scans now strip HTML `<!-- -->` comments (line-numbers
+  preserved) like CSS comments, ending issue-number false positives in
+  .astro/.svelte markup.
+
+Two new convention fixtures (leading-import, qualified-selectors) lock
+the fixes in CI. Consumers can drop their documented workarounds.
+
 ## 0.6.0 — 2026-07-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remarque-tokens",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "engines": {
     "node": ">=18"
   },

package/scripts/audit.mjs

@@ -165,6 +165,7 @@ for (const file of walk(SRC)) {
   // prose like "(issue #324)" in a comment trips the hex-color regex.
   const text = readFileSync(file, 'utf8')
     .replace(/\/\*[\s\S]*?\*\//g, (m) => m.replace(/[^\n]/g, ' '))
+    .replace(/<!--[\s\S]*?-->/g, (m) => m.replace(/[^\n]/g, ' '))
     .replace(/(^|[^:])\/\/[^\n]*/g, (m, p1) => p1 + ' '.repeat(m.length - p1.length));
   const lines = text.split('\n');
   lines.forEach((line, i) => {

package/scripts/lib/css-tokens.mjs

@@ -16,7 +16,10 @@ export function extractBlocks(css) {
     while (i < text.length) {
       const open = text.indexOf('{', i);
       if (open === -1) break;
-      const prelude = text.slice(i, open).trim().replace(/^[;\s]+/, '');
+      // Body-less at-statements (@import 'x'; @charset ...;) preceding a block
+      // would otherwise pollute its prelude and misclassify it as an at-rule
+      // (#67): keep only the segment after the last ';'.
+      const prelude = text.slice(i, open).split(';').pop().trim();
       let depth = 1, j = open + 1;
       while (j < text.length && depth > 0) {
         if (text[j] === '{') depth++;
@@ -49,12 +52,15 @@ export function declsOf(blocks, filterFn) {
    dark block in the class convention) as light. */
 const parts = (prelude) => prelude.split(',').map((s) => s.trim());
 
+const DARKISH = /(\.dark\b|\[data-theme="dark"\])/;
+const ROOTISH = /^(:root|html|body)\b/;
 export const isLightRoot = (b) =>
-  b.context === '' && parts(b.prelude).some((s) => s === ':root' || s === ':root.light' || s === '[data-theme="light"]');
+  b.context === '' && parts(b.prelude).some((s) =>
+    (ROOTISH.test(s) && !DARKISH.test(s)) || s === '[data-theme="light"]');
 
 /* Dark: media-query :root, the canonical [data-theme="dark"], or the
    class-convention :root.dark / html.dark (compatibility bridge). */
 export const isDarkBlock = (b) =>
   (b.context.includes('prefers-color-scheme') && b.context.includes('dark') &&
-    parts(b.prelude).some((s) => s === ':root')) ||
-  parts(b.prelude).some((s) => s === '[data-theme="dark"]' || s === ':root.dark' || s === 'html.dark' || s === '.dark');
+    parts(b.prelude).some((s) => ROOTISH.test(s) && !DARKISH.test(s))) ||
+  parts(b.prelude).some((s) => DARKISH.test(s) && (ROOTISH.test(s) || s.startsWith('.') || s.startsWith('[')));

package/tokens.json

@@ -2,7 +2,7 @@
   "$description": "Remarque design tokens — GENERATED from tokens-core.css + tokens-palette.css by scripts/tokens-json.mjs. Do not edit; the CSS is the source of truth.",
   "$extensions": {
     "remarque": {
-      "version": "0.6.0",
+      "version": "0.6.1",
       "tiers": {
         "core": "immutable identity — overriding forks the system",
         "palette": "sanctioned personalization surface — override freely, then run remarque-audit"