@digdir/designsystemet 0.1.0-alpha.12 → 0.1.0-alpha.13

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2024 Digitaliseringsdirektoratet (Digdir)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/bin/designsystemet.js

@@ -2616,6 +2616,9 @@ import StyleDictionary from "style-dictionary";
 import { outputReferencesFilter } from "style-dictionary/utils";
 import * as R8 from "ramda";
 
+// src/tokens/utils/permutateThemes.ts
+import * as R2 from "ramda";
+
 // ../../node_modules/@tokens-studio/types/dist/constants/BoxShadowTypes.js
 var BoxShadowTypes;
 (function(BoxShadowTypes2) {
@@ -2781,40 +2784,49 @@ var TypographyValues;
 
 // src/tokens/utils/permutateThemes.ts
 function mapThemesToSetsObject(themes) {
-  return Object.fromEntries(themes.map((theme) => [theme.name, filterTokenSets(theme.selectedTokenSets)]));
+  return themes.map((theme) => ({ name: theme.name, selectedTokenSets: filterTokenSets(theme.selectedTokenSets) }));
 }
 function permutateThemes(themes, { separator: separator2 = "-" } = {}) {
-  if (themes.some((theme) => theme.group)) {
-    const groups = {};
-    themes.forEach((theme) => {
-      if (theme.group) {
-        groups[theme.group] = [...groups[theme.group] ?? [], theme];
-      } else {
-        throw new Error(
-          `Theme ${theme.name} does not have a group property, which is required for multi-dimensional theming.`
-        );
-      }
-    });
-    if (Object.keys(groups).length <= 1) {
-      return mapThemesToSetsObject(themes);
-    }
-    const permutations = cartesian(Object.values(groups));
-    return Object.fromEntries(
-      permutations.map((perm) => {
-        const reduced = perm.reduce(
-          (acc, curr) => [
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `${acc[0]}${acc[0] ? separator2 : ""}${curr.name}`,
-            [...acc[1], ...filterTokenSets(curr.selectedTokenSets)]
-          ],
-          ["", []]
-        );
-        return [reduced[0], [...new Set(reduced[1])]];
-      })
-    );
-  } else {
+  if (!themes.some((theme) => theme.group)) {
+    return mapThemesToSetsObject(themes);
+  }
+  const groups = {};
+  themes.forEach((theme) => {
+    if (theme.group) {
+      groups[theme.group] = [...groups[theme.group] ?? [], theme];
+    } else {
+      throw new Error(
+        `Theme ${theme.name} does not have a group property, which is required for multi-dimensional theming.`
+      );
+    }
+  });
+  if (Object.keys(groups).length <= 1) {
     return mapThemesToSetsObject(themes);
   }
+  const permutations = cartesian(Object.values(groups));
+  const permutatedThemes = permutations.map((perm) => {
+    const permutatedTheme = perm.reduce(
+      (acc, theme) => {
+        const { group, name, selectedTokenSets } = theme;
+        let updatedPermutatedTheme = acc;
+        if (group) {
+          const groupProp = R2.lensProp(group.toLowerCase());
+          updatedPermutatedTheme = R2.set(groupProp, name.toLowerCase(), updatedPermutatedTheme);
+        }
+        const updatedName = `${String(acc.name)}${acc ? separator2 : ""}${name}`;
+        const sets = [...updatedPermutatedTheme.selectedTokenSets, ...filterTokenSets(selectedTokenSets)];
+        return {
+          ...updatedPermutatedTheme,
+          name: updatedName,
+          selectedTokenSets: sets
+        };
+      },
+      { name: "", selectedTokenSets: [] }
+    );
+    const uniqueTokenSets = new Set(permutatedTheme.selectedTokenSets);
+    return { ...permutatedTheme, selectedTokenSets: Array.from(uniqueTokenSets) };
+  });
+  return permutatedThemes;
 }
 function filterTokenSets(tokensets) {
   return Object.entries(tokensets).filter(([, val]) => val !== TokenSetStatus.DISABLED).sort((a, b) => {
@@ -2831,7 +2843,7 @@ function cartesian(a) {
 }
 
 // src/tokens/transformers.ts
-import * as R3 from "ramda";
+import * as R4 from "ramda";
 
 // src/tokens/utils/noCase.ts
 var lowerCase = (text = "") => text.toLowerCase();
@@ -2861,18 +2873,18 @@ function replace(input, re, value) {
 }
 
 // src/tokens/utils/utils.ts
-import * as R2 from "ramda";
+import * as R3 from "ramda";
 var getType = (token) => (token.$type ?? token.type) || "";
 var getValue = (token) => token.$value ?? token.value;
-var typeEquals = (types, token) => {
-  if (R2.isNil(token)) {
+var typeEquals = R3.curry((types, token) => {
+  if (R3.isNil(token)) {
     return false;
   }
-  return R2.includes(R2.toLower(getType(token)), R2.map(R2.toLower, Array.isArray(types) ? types : [types]));
-};
+  return R3.includes(R3.toLower(getType(token)), R3.map(R3.toLower, Array.isArray(types) ? types : [types]));
+});
 
 // src/tokens/transformers.ts
-var isPx = R3.test(/\b\d+px\b/g);
+var isPx = R4.test(/\b\d+px\b/g);
 var sizeRem = {
   name: "ds/size/toRem",
   type: "value",
@@ -2907,19 +2919,19 @@ var typographyShorthand = {
   transitive: true,
   filter: (token) => token.type === "typography",
   transform: (token) => {
-    const typography = getValue(token);
-    return `${typography.fontWeight} ${typography.fontSize}/${typography.lineHeight} '${typography.fontFamily}'`;
+    const typography2 = getValue(token);
+    return `${typography2.fontWeight} ${typography2.fontSize}/${typography2.lineHeight} '${typography2.fontFamily}'`;
   }
 };
 
 // src/tokens/formats/js-tokens.ts
-import * as R4 from "ramda";
+import * as R5 from "ramda";
 import { fileHeader, createPropertyFormatter } from "style-dictionary/utils";
-var groupByType = R4.groupBy((token) => getType(token));
-var removeUnwatedTokens = R4.filter(
+var groupByType = R5.groupBy((token) => getType(token));
+var removeUnwatedTokens = R5.filter(
   (token) => !["fds-base_spacing", "fds-base_sizing"].includes(token.name)
 );
-var toCssVarName = R4.pipe(R4.split(":"), R4.head, R4.trim);
+var toCssVarName = R5.pipe(R5.split(":"), R5.head, R5.trim);
 var jsTokens = {
   name: "ds/js-tokens",
   format: async function({ dictionary, file }) {
@@ -2927,11 +2939,11 @@ var jsTokens = {
       dictionary,
       format: "css"
     });
-    const formatTokens = R4.map((token) => ({
+    const formatTokens = R5.map((token) => ({
       ...token,
       name: toCssVarName(format(token))
     }));
-    const processTokens = R4.pipe(removeUnwatedTokens, formatTokens, groupByType);
+    const processTokens = R5.pipe(removeUnwatedTokens, formatTokens, groupByType);
     const tokens = processTokens(dictionary.allTokens);
     const content = Object.entries(tokens).map(
       ([name, token]) => `export const  ${name} = ${JSON.stringify(token, null, 2).replace(/"([^"]+)":/g, "$1:")} 
@@ -2941,21 +2953,20 @@ var jsTokens = {
   }
 };
 
-// src/tokens/formats/css-variables.ts
-import * as R5 from "ramda";
-import { fileHeader as fileHeader2, createPropertyFormatter as createPropertyFormatter2, usesReferences } from "style-dictionary/utils";
-var calculatedVariable = R5.pipe(R5.split(/:(.*?);/g), (split5) => `${split5[0]}: calc(${R5.trim(split5[1])});`);
+// src/tokens/formats/css.ts
+import * as R6 from "ramda";
+import { fileHeader as fileHeader2, createPropertyFormatter as createPropertyFormatter2, usesReferences, getReferences } from "style-dictionary/utils";
 var prefersColorScheme = (mode, content) => `
 @media (prefers-color-scheme: ${mode}) {
   [data-ds-color-mode="auto"] ${content}
 }
 `;
-var cssVariables = {
-  name: "ds/css-variables",
+var colormode = {
+  name: "ds/css-colormode",
   format: async function({ dictionary, file, options, platform }) {
     const { allTokens } = dictionary;
     const { outputReferences } = options;
-    const { selector, isCalculatedToken, mode } = platform;
+    const { selector, mode, layer } = platform;
     const mode_ = mode;
     const header = await fileHeader2({ file });
     const format = createPropertyFormatter2({
@@ -2963,7 +2974,31 @@ var cssVariables = {
       dictionary,
       format: "css"
     });
-    const formatTokens = R5.map((token) => {
+    const content = `{
+${allTokens.map(format).join("\n")}
+}
+`;
+    const autoSelectorContent = ["light", "dark"].includes(mode_) ? prefersColorScheme(mode_, content) : "";
+    return header + `@layer ${layer} {
+${selector} ${content} ${autoSelectorContent}
+}
+`;
+  }
+};
+var calculatedVariable = R6.pipe(R6.split(/:(.*?);/g), (split3) => `${split3[0]}: calc(${R6.trim(split3[1])});`);
+var semantic = {
+  name: "ds/css-semantic",
+  format: async function({ dictionary, file, options, platform }) {
+    const { allTokens } = dictionary;
+    const { outputReferences } = options;
+    const { selector, isCalculatedToken, layer } = platform;
+    const header = await fileHeader2({ file });
+    const format = createPropertyFormatter2({
+      outputReferences,
+      dictionary,
+      format: "css"
+    });
+    const formatTokens = R6.map((token) => {
       const originalValue = getValue(token.original);
       if (usesReferences(originalValue) && typeof outputReferences === "function" && outputReferences?.(token, { dictionary })) {
         if (isCalculatedToken?.(token, options)) {
@@ -2977,14 +3012,12 @@ var cssVariables = {
 ${formattedVariables.join("\n")}
 }
 `;
-    const autoSelectorContent = ["light", "dark"].includes(mode_) ? prefersColorScheme(mode_, content) : "";
-    return header + `${selector} ${content}` + autoSelectorContent;
+    return header + `@layer ${layer} {
+${selector} ${content}
+}
+`;
   }
 };
-
-// src/tokens/formats/css-classes.ts
-import * as R6 from "ramda";
-import { fileHeader as fileHeader3, createPropertyFormatter as createPropertyFormatter3, getReferences } from "style-dictionary/utils";
 var sortByType = R6.sortBy((token) => token?.type === "typography");
 var getVariableName = R6.pipe(
   R6.split(":"),
@@ -2998,21 +3031,23 @@ var bemify = R6.pipe(
     const filteredPath = path2.filter((p) => p !== "typography");
     const withPrefix = R6.concat([prefix], R6.remove(0, 0, filteredPath));
     const [rest, last] = R6.splitAt(-1, withPrefix);
-    return `${rest.join("-")}--${R6.head(last)}`;
+    const className = `${rest.join("-")}--${R6.head(last)}`;
+    return className;
   },
   R6.trim,
   R6.toLower
 );
 var classSelector = R6.pipe(R6.prop("path"), bemify);
-var isTypography = R6.curry(typeEquals)("typography");
-var sortTypographyLast = R6.sortWith([R6.ascend((token) => isTypography(token) ? 1 : 0)]);
-var cssClassesTypography = {
-  name: "ds/css-classes-typography",
+var sortTypographyLast = R6.sortWith([
+  R6.ascend((token) => typeEquals("typography")(token) ? 1 : 0)
+]);
+var typography = {
+  name: "ds/css-typography",
   format: async function({ dictionary, file, options, platform }) {
     const { outputReferences } = options;
-    const { selector } = platform;
-    const header = await fileHeader3({ file });
-    const format = createPropertyFormatter3({
+    const { selector, layer } = platform;
+    const header = await fileHeader2({ file });
+    const format = createPropertyFormatter2({
       outputReferences,
       dictionary,
       format: "css"
@@ -3046,17 +3081,20 @@ var cssClassesTypography = {
           }
           if (typeEquals("typography", token)) {
             const references = getReferences(getValue(token.original), dictionary.tokens);
-            const fontweight = R6.find(R6.curry(typeEquals)(["fontweights"]))(references);
-            const lineheight = R6.find(R6.curry(typeEquals)(["lineheights"]))(references);
-            const fontsize = R6.find(R6.curry(typeEquals)(["fontsizes"]))(references);
+            const fontweight = R6.find(typeEquals(["fontweights"]))(references);
+            const lineheight = R6.find(typeEquals(["lineheights"]))(references);
+            const fontsize = R6.find(typeEquals(["fontsizes"]))(references);
+            const letterSpacing = R6.find(typeEquals(["letterSpacing"]))(references);
             const fontSizeVar = fontsize ? getVariableName(format(fontsize)) : null;
             const fontWeightVar = fontweight ? getVariableName(format(fontweight)) : null;
             const lineheightVar = lineheight ? getVariableName(format(lineheight)) : null;
+            const letterSpacingVar = letterSpacing ? getVariableName(format(letterSpacing)) : null;
             const className = `
   .${classSelector(token)} {
     ${fontSizeVar && `font-size: ${fontSizeVar};`}
     ${lineheightVar && `line-height: ${lineheightVar};`}
     ${fontWeightVar && `font-weight: ${fontWeightVar};`}
+    ${letterSpacingVar && `letter-spacing: ${letterSpacingVar};`}
   }`;
             return { ...acc, classes: [className, ...acc.classes] };
           }
@@ -3067,15 +3105,11 @@ var cssClassesTypography = {
     )(sortedTokens);
     const classes = formattedTokens.classes.join("\n");
     const variables = formattedTokens.variables.join("\n");
-    const variables_ = `:root {
-${variables}
-}
-`;
     const content = selector ? `${selector} {
+${variables}
 ${classes}
 }` : classes;
-    return header + `@layer ds.typography {
-${variables_}
+    return header + `@layer ${layer} {
 ${content}
 }
 `;
@@ -3087,6 +3121,7 @@ var import_fs_extra = __toESM(require_lib(), 1);
 import glob3 from "fast-glob";
 import chalk3 from "chalk";
 import * as R7 from "ramda";
+var sortLightmodeFirst = R7.sortWith([R7.descend(R7.includes("light")), R7.descend(R7.includes("secondary"))]);
 var makeEntryFile = {
   name: "make_entryfile",
   do: async function(dictionary, platform) {
@@ -3095,8 +3130,13 @@ var makeEntryFile = {
     if (log?.verbosity !== "silent") {
       console.log(chalk3.green(`Creating entry file: ${writePath}`));
     }
+    const generateImportUrls = R7.pipe(
+      sortLightmodeFirst,
+      R7.map((file) => `@import url('./${theme}/${file.toString()}');`),
+      R7.join("\n")
+    );
     const files = await glob3(`**/*`, { cwd: platform.buildPath });
-    const content = R7.reverse(R7.sortBy(R7.includes("light"), files)).map((file) => `@import url('./${theme}/${file}');`).join("\n");
+    const content = generateImportUrls(files);
     await import_fs_extra.default.writeFile(writePath, content);
   },
   undo: async function noOp() {
@@ -3108,13 +3148,14 @@ void tokenStudio.registerTransforms(StyleDictionary);
 var prefix = "ds";
 var basePxFontSize = 16;
 var separator = "_";
-var fileHeader4 = () => [`These files are generated from design tokens defind using Token Studio`];
+var fileHeader3 = () => [`These files are generated from design tokens defind using Token Studio`];
 StyleDictionary.registerTransform(sizeRem);
 StyleDictionary.registerTransform(nameKebab);
 StyleDictionary.registerTransform(typographyShorthand);
 StyleDictionary.registerFormat(jsTokens);
-StyleDictionary.registerFormat(cssVariables);
-StyleDictionary.registerFormat(cssClassesTypography);
+StyleDictionary.registerFormat(colormode);
+StyleDictionary.registerFormat(semantic);
+StyleDictionary.registerFormat(typography);
 StyleDictionary.registerAction(makeEntryFile);
 var dsTransformers = [
   nameKebab.name,
@@ -3128,7 +3169,8 @@ var dsTransformers = [
   "ts/size/lineheight",
   "ts/shadow/css/shorthand"
 ];
-var processThemeName = R8.pipe(R8.replace(`${separator}semantic`, ""), R8.toLower, R8.split(separator));
+var paritionPrimitives = R8.partition(R8.test(/(?!.*global\.json).*primitives.*/));
+var hasUnknownProps = R8.pipe(R8.values, R8.none(R8.equals("unknown")), R8.not);
 var outputColorReferences = (token) => {
   if (R8.test(/accent|neutral|brand1|brand2|brand3|success|danger|warning/, token.name) && R8.includes("semantic/color", token.filePath)) {
     return true;
@@ -3140,6 +3182,7 @@ var permutateThemes2 = ($themes) => permutateThemes($themes, {
 });
 var colorModeVariables = ({ mode = "light", outPath, theme }) => {
   const selector = `${mode === "light" ? ":root, " : ""}[data-ds-color-mode="${mode}"]`;
+  const layer = `ds.theme.color.${mode}`;
   return {
     log: { verbosity: "silent" },
     preprocessors: ["tokens-studio"],
@@ -3150,6 +3193,7 @@ var colorModeVariables = ({ mode = "light", outPath, theme }) => {
         mode,
         theme,
         selector,
+        layer,
         //
         prefix,
         buildPath: `${outPath}/${theme}/`,
@@ -3158,12 +3202,12 @@ var colorModeVariables = ({ mode = "light", outPath, theme }) => {
         files: [
           {
             destination: `color-mode/${mode}.css`,
-            format: cssVariables.name,
+            format: colormode.name,
             filter: (token) => !token.isSource && typeEquals("color", token)
           }
         ],
         options: {
-          fileHeader: fileHeader4,
+          fileHeader: fileHeader3,
           outputReferences: (token, options) => outputColorReferences(token) && outputReferencesFilter(token, options)
         }
       }
@@ -3172,6 +3216,7 @@ var colorModeVariables = ({ mode = "light", outPath, theme }) => {
 };
 var semanticVariables = ({ outPath, theme }) => {
   const selector = `:root`;
+  const layer = `ds.theme.semantic`;
   const isCalculatedToken = (token) => typeEquals(["spacing", "sizing", "borderRadius"], token);
   return {
     log: { verbosity: "silent" },
@@ -3184,6 +3229,7 @@ var semanticVariables = ({ outPath, theme }) => {
         basePxFontSize,
         isCalculatedToken,
         selector,
+        layer,
         //
         prefix,
         buildPath: `${outPath}/${theme}/`,
@@ -3192,12 +3238,12 @@ var semanticVariables = ({ outPath, theme }) => {
         files: [
           {
             destination: `semantic.css`,
-            format: cssVariables.name,
+            format: semantic.name,
             filter: (token) => (!token.isSource || isCalculatedToken(token)) && !typeEquals(["color", "fontWeights", "fontFamilies"], token)
           }
         ],
         options: {
-          fileHeader: fileHeader4,
+          fileHeader: fileHeader3,
           outputReferences: (token, options) => isCalculatedToken(token) && outputReferencesFilter(token, options)
         }
       }
@@ -3231,59 +3277,74 @@ var typescriptTokens = ({ mode = "unknown", outPath, theme }) => {
           }
         ],
         options: {
-          fileHeader: fileHeader4
+          fileHeader: fileHeader3
         }
       }
     }
   };
 };
-var typographyCSS = ({ outPath, theme, typography }) => {
+var typographyCSS = ({ outPath, theme, typography: typography2 }) => {
+  const selector = `${typography2 === "primary" ? ":root, " : ""}[data-ds-typography="${typography2}"]`;
+  const layer = `ds.theme.typography.${typography2}`;
   return {
     log: { verbosity: "silent" },
     preprocessors: ["tokens-studio"],
     platforms: {
       css: {
         prefix,
-        typography,
-        // selector,
+        typography: typography2,
+        selector,
+        layer,
         buildPath: `${outPath}/${theme}/`,
         basePxFontSize,
         transforms: [nameKebab.name, "ts/size/px", sizeRem.name, "ts/size/lineheight", "ts/typography/fontWeight"],
         files: [
           {
-            destination: `typography.css`,
-            format: cssClassesTypography.name,
+            destination: `typography/${typography2}.css`,
+            format: typography.name,
             filter: (token) => {
-              return typeEquals(["typography", "fontweights", "fontfamilies", "lineheights", "fontsizes"], token) && !(token.path[0] || "").startsWith("theme");
+              return typeEquals(
+                ["typography", "fontweights", "fontfamilies", "lineheights", "fontsizes", "letterSpacing"],
+                token
+              ) && !(token.path[0] || "").startsWith("theme");
             }
           }
         ],
         options: {
-          fileHeader: fileHeader4
+          fileHeader: fileHeader3
         }
       }
     }
   };
 };
-var getConfigs = (getConfig, outPath, tokensDir, themes) => Object.entries(themes).map(([name, tokensets]) => {
-  const setsWithPaths = tokensets.map((x) => `${tokensDir}/${x}.json`);
-  const [mode, theme, semantic, fontSize, typography] = processThemeName(name);
-  const paritionPrimitives = /(?!.*global\.json).*primitives.*/;
-  const [source, include] = R8.partition(R8.test(paritionPrimitives), setsWithPaths);
+var getConfigs = (getConfig, outPath, tokensDir, permutatedThemes) => permutatedThemes.map((permutatedTheme) => {
+  const {
+    selectedTokenSets = [],
+    mode = "unknown",
+    theme = "unknown",
+    semantic: semantic2 = "unknown",
+    size = "unknown",
+    typography: typography2 = "unknown"
+  } = permutatedTheme;
+  if (hasUnknownProps(permutatedTheme)) {
+    throw Error(`Theme ${permutatedTheme.name} has unknown props: ${JSON.stringify(permutatedTheme)}`);
+  }
+  const setsWithPaths = selectedTokenSets.map((x) => `${tokensDir}/${x}.json`);
+  const [source, include] = paritionPrimitives(setsWithPaths);
   const config_ = getConfig({
     outPath,
     theme,
     mode,
-    semantic,
-    fontSize,
-    typography
+    semantic: semantic2,
+    size,
+    typography: typography2
   });
   const config = {
     ...config_,
     source,
     include
   };
-  return { name: `${theme}-${mode}`, config };
+  return { mode, theme, semantic: semantic2, size, typography: typography2, config };
 }).sort();
 
 // src/tokens/build.ts
@@ -3296,26 +3357,23 @@ async function run(options) {
   const $themes = JSON.parse(fs3.readFileSync(path.resolve(`${tokensDir}/$themes.json`), "utf-8"));
   const relevant$themes = $themes.filter((theme) => {
     const group = R9.toLower(R9.defaultTo("")(theme.group));
-    if (group === "typography" && theme.name !== "default") return false;
     if (group === "size" && theme.name !== "default") return false;
     return true;
   });
   const themes = permutateThemes3(relevant$themes);
-  const semanticThemes = R9.pickBy(
-    (_, key) => R9.startsWith("light", R9.toLower(key)),
-    themes
-  );
-  const colorModeConfigs = getConfigs2(colorModeVariables, tokensOutDir, tokensDir, themes);
+  const typographyThemes = R9.filter((val) => val.mode === "light", themes);
+  const colormodeThemes = R9.filter((val) => val.typography === "primary", themes);
+  const semanticThemes = R9.filter((val) => val.mode === "light" && val.typography === "primary", themes);
+  const colorModeConfigs = getConfigs2(colorModeVariables, tokensOutDir, tokensDir, colormodeThemes);
   const semanticConfigs = getConfigs2(semanticVariables, tokensOutDir, tokensDir, semanticThemes);
-  const storefrontConfigs = getConfigs2(typescriptTokens, storefrontOutDir, tokensDir, themes);
-  const typographyConfigs = getConfigs2(typographyCSS, tokensOutDir, tokensDir, semanticThemes);
+  const typographyConfigs = getConfigs2(typographyCSS, tokensOutDir, tokensDir, typographyThemes);
+  const storefrontConfigs = getConfigs2(typescriptTokens, storefrontOutDir, tokensDir, colormodeThemes);
   if (typographyConfigs.length > 0) {
     console.log(`
 \u{1F371} Building ${chalk4.green("typography")}`);
     await Promise.all(
-      typographyConfigs.map(async ({ name, config }) => {
-        const typographyTheme = name.split("-")[0];
-        console.log(`\u{1F477} Processing: ${typographyTheme}`);
+      typographyConfigs.map(async ({ theme, typography: typography2, config }) => {
+        console.log(`\u{1F477} ${theme} - ${typography2}`);
         const typographyClasses = await sd.extend(config);
         return typographyClasses.buildAllPlatforms();
       })
@@ -3325,9 +3383,8 @@ async function run(options) {
     console.log(`
 \u{1F371} Building ${chalk4.green("semantic")}`);
     await Promise.all(
-      semanticConfigs.map(async ({ name, config }) => {
-        const typographyTheme = name.split("-")[0];
-        console.log(`\u{1F477} Processing: ${typographyTheme}`);
+      semanticConfigs.map(async ({ theme, config, semantic: semantic2 }) => {
+        console.log(`\u{1F477} ${theme} - ${semantic2}`);
         const typographyClasses = await sd.extend(config);
         return typographyClasses.buildAllPlatforms();
       })
@@ -3337,8 +3394,8 @@ async function run(options) {
     console.log(`
 \u{1F371} Building ${chalk4.green("color-mode")}`);
     await Promise.all(
-      colorModeConfigs.map(async ({ name, config }) => {
-        console.log(`\u{1F477} Processing: ${name}`);
+      colorModeConfigs.map(async ({ theme, mode, config }) => {
+        console.log(`\u{1F477} ${theme} - ${mode}`);
         const themeVariablesSD = await sd.extend(config);
         return themeVariablesSD.buildAllPlatforms();
       })
@@ -3346,10 +3403,10 @@ async function run(options) {
   }
   if (storefrontConfigs.length > 0 && options.preview) {
     console.log(`
-\u{1F371} Building ${chalk4.bgGreen("Storefront")}`);
+\u{1F371} Building ${chalk4.green("Storefront preview tokens")}`);
     await Promise.all(
-      storefrontConfigs.map(async ({ name, config }) => {
-        console.log(`\u{1F477} Processing: ${name}`);
+      storefrontConfigs.map(async ({ theme, mode, config }) => {
+        console.log(`\u{1F477} ${theme} - ${mode}`);
         const storefrontSD = await sd.extend(config);
         return storefrontSD.buildAllPlatforms();
       })