@usefragments/core 1.10.1 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usefragments/core",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "license": "MIT",
   "description": "Core types, schemas, and runtime API for Fragments component definitions",
   "author": "Conan McNicholl",

package/src/tokens/scss.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 
 import { normalizeTokenGroupComment } from "./categories.js";
-import { parseScssTokens } from "./scss.js";
+import { parseScssTokens, parseScssVariables } from "./scss.js";
 
 /**
  * FRICTION #7d — stop prose SCSS comments from being slugified into token
@@ -92,3 +92,34 @@ describe("parseScssTokens category derivation (#7d)", () => {
     expect(out.categories.colors?.some((t) => t.name === "--fui-color-accent")).toBe(true);
   });
 });
+
+describe("parseScssVariables", () => {
+  it("retains multiline generated adapter expressions as one variable value", () => {
+    const variables = parseScssVariables(`
+$fui-font-weight-normal: map.get(
+  measurements.$legacy,
+  "typography",
+  "fontWeight",
+  "normal"
+) !default;
+`);
+
+    expect(variables.get("$fui-font-weight-normal")).toBe(
+      'map.get( measurements.$legacy, "typography", "fontWeight", "normal" )'
+    );
+  });
+
+  it("keeps Sass maps available for resolution without emitting the map container as a token", () => {
+    const scss = `
+$spacing: (
+  xs: 4px,
+  sm: 8px,
+);
+`;
+
+    expect(parseScssVariables(scss).get("$spacing")).toBe("( xs: 4px, sm: 8px, )");
+
+    const tokens = Object.values(parseScssTokens(scss).categories).flat();
+    expect(tokens.map((token) => token.name)).not.toContain("$spacing");
+  });
+});

package/src/tokens/scss.ts

@@ -27,12 +27,15 @@ export function detectTokenPrefix(names: string[]): string {
 
 export function parseScssVariables(content: string): Map<string, string> {
   const vars = new Map<string, string>();
-  const scssVarRegex = /^\s*(\$[\w-]+)\s*:\s*(.+?)\s*(?:!default\s*)?;/gm;
+  const scssVarRegex = /^\s*(\$[\w-]+)\s*:\s*([\s\S]*?)\s*(?:!default\s*)?;/gm;
 
   let match: RegExpExecArray | null;
   while ((match = scssVarRegex.exec(content)) !== null) {
     const name = match[1];
-    const value = match[2].replace(/\s*\/\/.*$/, "").trim();
+    const value = match[2]
+      .replace(/\s*\/\/[^\n]*$/gm, "")
+      .replace(/\s+/g, " ")
+      .trim();
     if (!vars.has(name)) {
       vars.set(name, value);
     }
@@ -45,7 +48,7 @@ export function resolveTokenValue(
   rawValue: string,
   scssVars: Map<string, string>,
   cssVarValues: Map<string, string>,
-  depth = 0,
+  depth = 0
 ): string {
   if (depth > 5) return rawValue;
 
@@ -60,9 +63,7 @@ export function resolveTokenValue(
 
   resolved = resolved.replace(/(?<![#\{])(\$[\w-]+)/g, (_, varName) => {
     const val = scssVars.get(varName);
-    return val !== undefined
-      ? resolveTokenValue(val, scssVars, cssVarValues, depth + 1)
-      : varName;
+    return val !== undefined ? resolveTokenValue(val, scssVars, cssVarValues, depth + 1) : varName;
   });
 
   resolved = resolved.replace(
@@ -76,7 +77,7 @@ export function resolveTokenValue(
         return resolveTokenValue(fallback.trim(), scssVars, cssVarValues, depth + 1);
       }
       return original;
-    },
+    }
   );
 
   return resolved;
@@ -134,6 +135,10 @@ export function parseScssTokens(content: string, filePath = "tokens.scss"): Toke
 
   for (const [name, value] of scssVars) {
     if (seenNames.has(name)) continue;
+    // Parenthesized Sass maps are containers, not addressable token values.
+    // Keep them in `scssVars` for reference resolution, but let the dedicated
+    // map-entry parser expose their individual members.
+    if (value.startsWith("(")) continue;
     seenNames.add(name);
     tokens.push({
       name,