@vettvangur/design-system 2.0.63 → 2.0.65

package/dist/index.js

@@ -2182,6 +2182,29 @@ function maybeCollapseToBaseFont(raw, {
   }
   return raw;
 }
+function normalizeBaseFontValue(raw, {
+  baseFamily
+}) {
+  // For the base token itself, prefer emitting the canonical family name.
+  // Example: "Sharp Grotesk Book 19" -> "Sharp Grotesk".
+  const v = String(raw ?? '').trim();
+  if (!v || !baseFamily) {
+    return raw;
+  }
+
+  // Avoid changing var() or multi-stack definitions.
+  if (/^var\(/.test(v) || v.includes(',')) {
+    return raw;
+  }
+  const base = String(baseFamily).trim();
+  if (!base) {
+    return raw;
+  }
+  if (v === base || v.startsWith(`${base} `)) {
+    return base;
+  }
+  return raw;
+}
 function formatFontFamilyValue(raw) {
   if (raw == null) {
     return raw;
@@ -2263,11 +2286,15 @@ async function generateFile(variables, config) {
   const baseMobileRaw = baseTokenKey ? variables?.[baseTokenKey]?.values?.mobile : null;
   const baseFamily = baseMobileRaw ? splitFontStack(baseMobileRaw)[0] : null;
   for (const [key, token] of Object.entries(variables || {})) {
-    const mobileRaw = key === baseTokenKey ? token?.values?.mobile : maybeCollapseToBaseFont(token?.values?.mobile, {
+    const mobileRaw = key === baseTokenKey ? normalizeBaseFontValue(token?.values?.mobile, {
+      baseFamily
+    }) : maybeCollapseToBaseFont(token?.values?.mobile, {
       baseTokenKey,
       baseFamily
     });
-    const desktopRaw = key === baseTokenKey ? token?.values?.desktop : maybeCollapseToBaseFont(token?.values?.desktop, {
+    const desktopRaw = key === baseTokenKey ? normalizeBaseFontValue(token?.values?.desktop, {
+      baseFamily
+    }) : maybeCollapseToBaseFont(token?.values?.desktop, {
       baseTokenKey,
       baseFamily
     });
@@ -2276,7 +2303,9 @@ async function generateFile(variables, config) {
     if (mobile != null) {
       css += `  --${key}: ${mobile};\n`;
     }
-    if (desktop != null && desktop !== mobile) {
+
+    // Keep the -desktop key if a desktop mode exists, even if it matches mobile.
+    if (desktop != null) {
       css += `  --${key}-desktop: ${desktop};\n`;
     }
   }
@@ -3117,7 +3146,7 @@ function needsDesktopLine$1(values) {
   if (!values) {
     return false;
   }
-  return values.desktop !== values.mobile;
+  return values.desktop != null && values.desktop !== values.mobile;
 }
 
 /**
@@ -3293,7 +3322,7 @@ function needsDesktopLine(values) {
   if (!values) {
     return false;
   }
-  return values.desktop !== values.mobile;
+  return values.desktop != null && values.desktop !== values.mobile;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vettvangur/design-system",
-  "version": "2.0.63",
+  "version": "2.0.65",
   "description": "",
   "access": "public",
   "type": "module",