@motion-proto/live-tokens 0.91.2 → 0.92.0

package/dist-plugin/index.js

@@ -23,7 +23,7 @@ import {
   runAdditiveTokensCssMigrations,
   runTokensCssMigrations,
   validateTokensCss
-} from "./chunk-GWMEYBZ2.js";
+} from "./chunk-JOSSYGR2.js";
 import {
   hexToOklch,
   oklchToRgb255,

package/dist-plugin/setType/index.cjs

@@ -324,6 +324,7 @@ function inferFontFamilyVariable(weightVariable) {
 // src/editor/core/fonts/weightCoverage.ts
 var STACK_REF = /var\(\s*(--font-(?:display|sans|serif|mono))\s*\)/;
 var VAR_REF = /var\(\s*(--[a-z0-9-]+)/i;
+var ALIAS = /^var\(\s*(--[a-z0-9-]+)\s*\)$/i;
 function declarations(css) {
   const decls = /* @__PURE__ */ new Map();
   for (const [, name, value] of css.matchAll(/(--[a-z0-9-]+)\s*:\s*([^;{}]+);/gi)) {
@@ -331,6 +332,18 @@ function declarations(css) {
   }
   return decls;
 }
+function follow(decls, value, read) {
+  const seen = /* @__PURE__ */ new Set();
+  while (value !== void 0) {
+    const hit = read(value);
+    if (hit !== void 0) return hit;
+    const next = value.match(ALIAS)?.[1];
+    if (!next || next.startsWith("--font-") || seen.has(next)) return void 0;
+    seen.add(next);
+    value = decls.get(next);
+  }
+  return void 0;
+}
 function requiredWeights(tokensCss, overrides = {}) {
   const decls = declarations(tokensCss);
   for (const [name, value] of Object.entries(overrides)) decls.set(name, String(value).trim());
@@ -343,9 +356,17 @@ function requiredWeights(tokensCss, overrides = {}) {
   for (const [name, value] of decls) {
     const familyVariable = inferFontFamilyVariable(name);
     if (!familyVariable) continue;
-    const stack = decls.get(familyVariable)?.match(STACK_REF)?.[1];
+    const stack = follow(
+      decls,
+      decls.get(familyVariable),
+      (v) => v.match(STACK_REF)?.[1]
+    );
     if (!stack) continue;
-    const weight = /^\d+$/.test(value) ? Number(value) : scale.get(value.match(VAR_REF)?.[1] ?? "");
+    const weight = follow(
+      decls,
+      value,
+      (v) => /^\d+$/.test(v) ? Number(v) : scale.get(v.match(VAR_REF)?.[1] ?? "")
+    );
     if (weight === void 0) continue;
     const key = `${stack}:${weight}`;
     if (seen.has(key)) continue;

package/dist-plugin/setType/index.js

@@ -282,6 +282,7 @@ function inferFontFamilyVariable(weightVariable) {
 // src/editor/core/fonts/weightCoverage.ts
 var STACK_REF = /var\(\s*(--font-(?:display|sans|serif|mono))\s*\)/;
 var VAR_REF = /var\(\s*(--[a-z0-9-]+)/i;
+var ALIAS = /^var\(\s*(--[a-z0-9-]+)\s*\)$/i;
 function declarations(css) {
   const decls = /* @__PURE__ */ new Map();
   for (const [, name, value] of css.matchAll(/(--[a-z0-9-]+)\s*:\s*([^;{}]+);/gi)) {
@@ -289,6 +290,18 @@ function declarations(css) {
   }
   return decls;
 }
+function follow(decls, value, read) {
+  const seen = /* @__PURE__ */ new Set();
+  while (value !== void 0) {
+    const hit = read(value);
+    if (hit !== void 0) return hit;
+    const next = value.match(ALIAS)?.[1];
+    if (!next || next.startsWith("--font-") || seen.has(next)) return void 0;
+    seen.add(next);
+    value = decls.get(next);
+  }
+  return void 0;
+}
 function requiredWeights(tokensCss, overrides = {}) {
   const decls = declarations(tokensCss);
   for (const [name, value] of Object.entries(overrides)) decls.set(name, String(value).trim());
@@ -301,9 +314,17 @@ function requiredWeights(tokensCss, overrides = {}) {
   for (const [name, value] of decls) {
     const familyVariable = inferFontFamilyVariable(name);
     if (!familyVariable) continue;
-    const stack = decls.get(familyVariable)?.match(STACK_REF)?.[1];
+    const stack = follow(
+      decls,
+      decls.get(familyVariable),
+      (v) => v.match(STACK_REF)?.[1]
+    );
     if (!stack) continue;
-    const weight = /^\d+$/.test(value) ? Number(value) : scale.get(value.match(VAR_REF)?.[1] ?? "");
+    const weight = follow(
+      decls,
+      value,
+      (v) => /^\d+$/.test(v) ? Number(v) : scale.get(v.match(VAR_REF)?.[1] ?? "")
+    );
     if (weight === void 0) continue;
     const key = `${stack}:${weight}`;
     if (seen.has(key)) continue;