guard-my-design-system 1.4.0 → 1.4.1

package/README.md

@@ -42,7 +42,8 @@ it updates that same comment. It never adds more comments:
 - **A hard-coded colour where a token exists.** The finding names the token:
   `var(--blue-500)`, not just a hex code. This works across colour notations:
   a hex stray is matched to an hsl or oklch token, including shadcn's
-  bare-triplet variables.
+  bare-triplet variables. Dark-theme values count as the system too, so a
+  stray in a dark block snaps to the dark token, never its light twin.
 - **A spacing value your codebase has never used**, with the nearest existing
   step named.
 - **A border radius, font size or shadow your system does not declare**, with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "guard-my-design-system",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Your design system dies one pull request at a time. This makes sure it doesn't. A guard that judges only the lines a change adds, against the system the repo already has, and names the on-system value the author probably meant.",
   "type": "module",
   "bin": {
@@ -11,7 +11,7 @@
     "src/"
   ],
   "dependencies": {
-    "roast-my-design-system": "5.11.0"
+    "roast-my-design-system": "6.0.1"
   },
   "keywords": [
     "design-system",

package/src/judge.mjs

@@ -11,7 +11,7 @@ import {
   extractStyling, normalizeHex, nearestColor, nearestLength,
   isCodeFile, isStyleFile, typefaceOf, GENERIC_FONTS,
   definedComponents, exemptReason,
-  EXTRA_KINDS, FONT_LINE_RE, extraValue,
+  EXTRA_KINDS, extraValue, fontDeclarations,
 } from 'roast-my-design-system/engine';
 
 // git prints diff paths from the repository root; the engine lists them from
@@ -79,9 +79,12 @@ export function judge(added, system, { readFile } = {}) {
         if (v) addedExtras[kind].set(v, (addedExtras[kind].get(v) ?? 0) + 1);
       }
     }
-    const fm = css ? FONT_LINE_RE.exec(text) : null;
-    const face = fm ? typefaceOf(fm[1].trim()) : null;
-    if (face) addedFaces.set(face, (addedFaces.get(face) ?? 0) + 1);
+    if (css) {
+      for (const d of fontDeclarations(text)) {
+        const face = typefaceOf(d.raw);
+        if (face) addedFaces.set(face, (addedFaces.get(face) ?? 0) + 1);
+      }
+    }
   }
   const knownLengths = new Set(
     system.spacing.filter((s) => s.count > (addedLengths.get(s.value) ?? 0)).map((s) => s.value)
@@ -213,16 +216,20 @@ export function judge(added, system, { readFile } = {}) {
       });
     }
 
-    const fm = css ? FONT_LINE_RE.exec(text) : null;
-    if (fm && !/^(var\(--[\w-]+\)|inherit)$/i.test(fm[1].trim())) {
-      const face = typefaceOf(fm[1].trim());
-      if (face && !GENERIC_FONTS.has(face.toLowerCase()) && !knownFaces.has(face)) {
-        findings.push({
-          file, line, kind: 'font', value: face,
-          advice: knownFaces.size
-            ? `the system declares: ${[...knownFaces].join(', ')}`
-            : 'first typeface declared in this codebase',
-        });
+    // The engine's fontDeclarations decides what a judgeable font value is
+    // (benign token references filtered inside it), so the counter and the
+    // checker can never disagree about fonts either.
+    if (css) {
+      for (const d of fontDeclarations(text)) {
+        const face = typefaceOf(d.raw);
+        if (face && !GENERIC_FONTS.has(face.toLowerCase()) && !knownFaces.has(face)) {
+          findings.push({
+            file, line, kind: 'font', value: face,
+            advice: knownFaces.size
+              ? `the system declares: ${[...knownFaces].join(', ')}`
+              : 'first typeface declared in this codebase',
+          });
+        }
       }
     }
   }