@digdir/designsystemet 1.1.3 → 1.1.4

package/dist/src/tokens/format.js

@@ -1,5 +1,5 @@
 // src/tokens/format.ts
-import * as R20 from "ramda";
+import * as R18 from "ramda";
 
 // ../../node_modules/.pnpm/@tokens-studio+types@0.5.2/node_modules/@tokens-studio/types/dist/constants/BoxShadowTypes.js
 var BoxShadowTypes;
@@ -2413,11 +2413,11 @@ import * as R7 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.1.3",
+  version: "1.1.4",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
-    node: ">=22.16.0"
+    node: ">=22.17.0"
   },
   repository: {
     type: "git",
@@ -2466,6 +2466,7 @@ var package_default = {
     "digdir:tokens-build": "pnpm run designsystemet tokens build -t ../../internal/design-tokens -o ../../packages/theme/brand --clean --experimental-tailwind",
     "digdir:tokens-create": "pnpm run designsystemet tokens create --config ./configs/digdir.config.json",
     "update:template": "tsx ./src/scripts/update-template.ts",
+    "update:preview-tokens": "tsx ./src/scripts/update-preview-tokens.ts",
     "update:theme-digdir": "pnpm digdir:tokens-create && tsx ./src/scripts/update-design-tokens.ts && pnpm digdir:tokens-build",
     verify: "pnpm test && pnpm update:template && pnpm update:theme-digdir && pnpm build:tokens"
   },
@@ -2483,8 +2484,8 @@ var package_default = {
     "object-hash": "^3.0.0",
     postcss: "^8.5.6",
     ramda: "^0.31.3",
-    "style-dictionary": "^5.0.0",
-    zod: "^3.25.67",
+    "style-dictionary": "^5.0.1",
+    zod: "^3.25.74",
     "zod-validation-error": "^3.5.2"
   },
   devDependencies: {
@@ -2492,8 +2493,7 @@ var package_default = {
     "@types/apca-w3": "^0.1.3",
     "@types/chroma-js": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/glob": "^8.1.0",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.16.0",
     "@types/object-hash": "^3.0.6",
     "@types/ramda": "^0.30.2",
     "fs-extra": "^11.3.0",
@@ -2508,7 +2508,7 @@ var package_default = {
 var defaultFileHeader = `build: v${package_default.version}`;
 var createThemeCSSFiles = ({
   processedBuilds,
-  fileHeader: fileHeader2 = defaultFileHeader
+  fileHeader = defaultFileHeader
 }) => {
   const groupedByTheme = {};
   for (const [_, buildResults] of Object.entries(processedBuilds)) {
@@ -2555,7 +2555,7 @@ order may change due to nondeterminism.`.trim()
   });
   const header = `@charset "UTF-8";
 /*
-${fileHeader2}
+${fileHeader}
 */
 
 `;
@@ -2577,7 +2577,7 @@ ${fileHeader2}
 
 // src/tokens/process/platform.ts
 import chalk3 from "chalk";
-import * as R19 from "ramda";
+import * as R17 from "ramda";
 import StyleDictionary2 from "style-dictionary";
 
 // src/tokens/types.ts
@@ -2588,7 +2588,7 @@ var colorCategories = {
 
 // src/tokens/process/configs.ts
 import { register } from "@tokens-studio/sd-transforms";
-import * as R18 from "ramda";
+import * as R16 from "ramda";
 import StyleDictionary from "style-dictionary";
 
 // src/tokens/utils.ts
@@ -2699,7 +2699,11 @@ var colorScheme = {
         (t) => !isColorCategoryToken(t)
       ])
     );
-    const formattedTokens = filteredAllTokens.map(format).join("\n");
+    const formattedMap = filteredAllTokens.map((token) => ({
+      token,
+      formatted: format(token)
+    }));
+    const formattedTokens = formattedMap.map(R9.view(R9.lensProp("formatted"))).join("\n");
     const content = `{
 ${formattedTokens}
 ${colorSchemeProperty}}
@@ -2717,7 +2721,8 @@ var colorCategory = {
   name: "ds/css-colorcategory",
   format: async ({ dictionary, options, platform }) => {
     const { outputReferences, usesDtcg } = options;
-    const { selector, layer } = platform;
+    const { selector, layer, files } = platform;
+    const destination = files?.[0]?.destination;
     const format = R9.compose(
       createPropertyFormatter({
         outputReferences,
@@ -2734,7 +2739,12 @@ var colorCategory = {
         }
       })
     );
-    const formattedTokens = dictionary.allTokens.map(format).join("\n");
+    const formattedMap = dictionary.allTokens.map((token) => ({
+      token,
+      formatted: format(token)
+    }));
+    buildOptions.buildTokenFormats[destination] = formattedMap;
+    const formattedTokens = formattedMap.map(R9.view(R9.lensProp("formatted"))).join("\n");
     const content = `{
 ${formattedTokens}
 }
@@ -2765,30 +2775,30 @@ var overrideSizingFormula = (format, token) => {
     calc
   };
 };
-var formatSizingTokens = (format, tokens) => {
-  const { round, calc } = R10.reduce(
-    (acc, token) => {
-      const { round: round2, calc: calc2, name } = overrideSizingFormula(format, token);
-      return {
-        round: [...acc.round, `${name}: ${round2};`],
-        calc: [...acc.calc, `${name}: ${calc2};`]
-      };
-    },
-    { round: [], calc: [] },
-    tokens
-  );
-  return `
+var formatSizingTokens = (format, tokens) => R10.reduce(
+  (acc, token) => {
+    const { round, calc, name } = overrideSizingFormula(format, token);
+    return {
+      tokens: [...acc.tokens, token],
+      round: [...acc.round, `${name}: ${round};`],
+      calc: [...acc.calc, `${name}: ${calc};`]
+    };
+  },
+  { tokens: [], round: [], calc: [] },
+  tokens
+);
+var sizingTemplate = ({ round, calc }) => `
 ${calc.join("\n")}
 
   @supports (width: round(down, .1em, 1px)) {
 ${round.join("\n")}
   }`;
-};
 var semantic = {
   name: "ds/css-semantic",
   format: async ({ dictionary, options, platform }) => {
     const { outputReferences, usesDtcg } = options;
-    const { selector, layer } = platform;
+    const { selector, layer, files } = platform;
+    const destination = files?.[0]?.destination;
     const format = createPropertyFormatter2({
       outputReferences,
       dictionary,
@@ -2801,7 +2811,18 @@ var semantic = {
       (t) => pathStartsWithOneOf(["_size"], t) && isDigit(t.path[1]),
       filteredTokens
     );
-    const formattedTokens = [R10.map(format, restTokens).join("\n"), formatSizingTokens(format, sizingTokens)];
+    const formattedSizingTokens = formatSizingTokens(format, sizingTokens);
+    const formattedMap = restTokens.map((token) => ({
+      token,
+      formatted: format(token)
+    }));
+    const formattedSizingMap = formattedSizingTokens.round.map((t, i) => ({
+      token: formattedSizingTokens.tokens[i],
+      formatted: t
+    }));
+    buildOptions.buildTokenFormats[destination] = [...formattedMap, ...formattedSizingMap];
+    const sizingSnippet = sizingTemplate(formattedSizingTokens);
+    const formattedTokens = formattedMap.map(R10.view(R10.lensProp("formatted"))).concat(sizingSnippet);
     const content = `{
 ${formattedTokens.join("\n")}
 }
@@ -2826,7 +2847,8 @@ var typography = {
   name: "ds/css-typography",
   format: async ({ dictionary, options, platform }) => {
     const { outputReferences, usesDtcg } = options;
-    const { selector, layer } = platform;
+    const { selector, layer, files } = platform;
+    const destination = files?.[0]?.destination;
     const format = createPropertyFormatter3({
       outputReferences,
       dictionary,
@@ -2834,7 +2856,12 @@ var typography = {
       usesDtcg
     });
     const filteredTokens = R11.reject(typographyFontFamilyPredicate, dictionary.allTokens);
-    const formattedTokens = R11.pipe(R11.map(format), R11.join("\n"))(filteredTokens);
+    const formattedMap = filteredTokens.map((token) => ({
+      token,
+      formatted: format(token)
+    }));
+    buildOptions.buildTokenFormats[destination] = formattedMap;
+    const formattedTokens = formattedMap.map(R11.view(R11.lensProp("formatted"))).join("\n");
     const content = selector ? `${selector} {
 ${formattedTokens}
 }` : formattedTokens;
@@ -3041,90 +3068,6 @@ var semanticVariables = ({ theme }) => {
   };
 };
 
-// src/tokens/process/configs/storefront.ts
-import * as R16 from "ramda";
-import { outputReferencesFilter as outputReferencesFilter2 } from "style-dictionary/utils";
-
-// src/tokens/process/formats/js-tokens.ts
-import * as R15 from "ramda";
-import { createPropertyFormatter as createPropertyFormatter4, fileHeader } from "style-dictionary/utils";
-var groupByType = R15.groupBy((token) => getType(token));
-var removeUnwatedTokens = R15.pipe(
-  R15.reject((token) => isColorCategoryToken(token)),
-  R15.reject((token) => R15.any((path) => path.startsWith("_"))(token.path))
-);
-var dissocExtensions = R15.pipe(R15.dissoc("$extensions"), R15.dissocPath(["original", "$extensions"]));
-var removeUnwatedProps = R15.map((token) => dissocExtensions(token));
-var toCssVarName = R15.pipe(R15.split(":"), R15.head, R15.trim);
-var jsTokens = {
-  name: "ds/js-tokens",
-  format: async ({ dictionary, file, options }) => {
-    const { usesDtcg, outputReferences } = options;
-    const format = createPropertyFormatter4({
-      outputReferences,
-      dictionary,
-      format: "css",
-      usesDtcg
-    });
-    const formatTokens2 = R15.map((token) => {
-      if (pathStartsWithOneOf(["size", "_size"], token)) {
-        const { calc, name } = overrideSizingFormula(format, token);
-        return {
-          ...token,
-          name: name.trim(),
-          $value: calc.trim()
-        };
-      }
-      return {
-        ...token,
-        name: toCssVarName(format(token))
-      };
-    });
-    const processTokens = R15.pipe(removeUnwatedTokens, removeUnwatedProps, formatTokens2, groupByType);
-    const tokens = processTokens(inlineTokens(isInlineTokens, dictionary.allTokens));
-    const content = Object.entries(tokens).map(
-      ([name, token]) => `export const  ${name} = ${JSON.stringify(token, null, 2).replace(/"([^"]+)":/g, "$1:")} 
-`
-    ).join("\n");
-    return fileHeader({ file }).then((fileHeaderText) => fileHeaderText + content);
-  }
-};
-
-// src/tokens/process/configs/storefront.ts
-var typescriptTokens = ({ "color-scheme": colorScheme2, theme }) => {
-  return {
-    preprocessors: ["tokens-studio"],
-    platforms: {
-      ts: {
-        prefix,
-        basePxFontSize,
-        transforms: dsTransformers,
-        buildPath: `${theme}/`,
-        files: [
-          {
-            destination: `${colorScheme2}.ts`,
-            format: jsTokens.name,
-            filter: (token) => {
-              if (pathStartsWithOneOf(["border-width", "letter-spacing", "border-radius"], token) && !R16.includes("semantic", token.filePath))
-                return false;
-              const isSemanticColor = R16.includes("semantic", token.filePath) && typeEquals(["color"], token);
-              const wantedTypes = typeEquals(["shadow", "dimension", "typography", "opacity"], token);
-              return isSemanticColor || wantedTypes;
-            }
-          }
-        ],
-        options: {
-          outputReferences: (token, options) => {
-            const include = pathStartsWithOneOf(["border-radius"], token);
-            const isWantedSize = pathStartsWithOneOf(["size", "_size"], token) && isDigit(token.path[1]);
-            return (include || isWantedSize) && outputReferencesFilter2(token, options);
-          }
-        }
-      }
-    }
-  };
-};
-
 // src/tokens/process/configs/typography.ts
 import { expandTypesMap } from "@tokens-studio/sd-transforms";
 var typographyVariables = ({ theme, typography: typography2 }) => {
@@ -3151,6 +3094,7 @@ var typographyVariables = ({ theme, typography: typography2 }) => {
           sizeRem.name,
           "ts/size/lineheight",
           "ts/typography/fontWeight",
+          "ts/size/css/letterspacing",
           typographyName.name
         ],
         files: [
@@ -3175,13 +3119,13 @@ var typographyVariables = ({ theme, typography: typography2 }) => {
 // src/tokens/process/utils/getMultidimensionalThemes.ts
 import chalk2 from "chalk";
 import { kebabCase } from "change-case";
-import * as R17 from "ramda";
+import * as R15 from "ramda";
 var getMultidimensionalThemes = (processed$themes, dimensions) => {
   const verboseLogging = buildOptions?.verbose;
   const grouped$themes = groupThemes(processed$themes);
   const permutations = permutateThemes(grouped$themes);
   const ALL_DEPENDENT_ON = ["theme"];
-  const keys2 = R17.keys(grouped$themes);
+  const keys2 = R15.keys(grouped$themes);
   const nonDependentKeys = keys2.filter((x) => ![...ALL_DEPENDENT_ON, ...dimensions].includes(x));
   if (verboseLogging) {
     console.log(chalk2.cyan(`\u{1F50E} Finding theme permutations for ${dimensions}`));
@@ -3221,7 +3165,7 @@ function groupThemes(themes) {
   }
   return groups;
 }
-var hasUnknownProps = R17.pipe(R17.values, R17.none(R17.equals("unknown")), R17.not);
+var hasUnknownProps = R15.pipe(R15.values, R15.none(R15.equals("unknown")), R15.not);
 function permutateThemes(groups) {
   const separator = "_";
   const permutations = cartesian(Object.values(groups));
@@ -3231,8 +3175,8 @@ function permutateThemes(groups) {
         const { group, name, selectedTokenSets } = theme;
         let updatedPermutation = acc.permutation;
         if (group) {
-          const groupProp = R17.lensProp(group);
-          updatedPermutation = R17.set(groupProp, name, updatedPermutation);
+          const groupProp = R15.lensProp(group);
+          updatedPermutation = R15.set(groupProp, name, updatedPermutation);
         }
         const updatedName = `${String(acc.name)}${acc ? separator : ""}${name}`;
         const sets = [...acc.selectedTokenSets, ...filterTokenSets(selectedTokenSets)];
@@ -3291,7 +3235,6 @@ StyleDictionary.registerTransform(sizeRem);
 StyleDictionary.registerTransform(typographyName);
 StyleDictionary.registerTransform(resolveMath);
 StyleDictionary.registerTransform(unitless);
-StyleDictionary.registerFormat(jsTokens);
 for (const format of Object.values(formats)) {
   StyleDictionary.registerFormat(format);
 }
@@ -3305,8 +3248,7 @@ var configs = {
   warningColorVariables: colorCategoryVariables({ category: "builtin", color: "warning" }),
   infoColorVariables: colorCategoryVariables({ category: "builtin", color: "info" }),
   typographyVariables,
-  semanticVariables,
-  typescriptTokens
+  semanticVariables
 };
 var getConfigsForThemeDimensions = (getConfig, processed$themes, dimensions, options) => {
   const { tokensDir, tokenSets } = options;
@@ -3322,7 +3264,7 @@ var getConfigsForThemeDimensions = (getConfig, processed$themes, dimensions, opt
               obj.filePath = tokenSet;
             }
           });
-          tokenSource.tokens = R18.mergeDeepRight(tokenSource.tokens, tokensWithFilePath);
+          tokenSource.tokens = R16.mergeDeepRight(tokenSource.tokens, tokensWithFilePath);
         }
       }
     } else {
@@ -3354,6 +3296,7 @@ var getConfigsForThemeDimensions = (getConfig, processed$themes, dimensions, opt
 // src/tokens/process/platform.ts
 var initResult = {
   formatted: [],
+  tokens: [],
   permutation: {
     "color-scheme": "",
     "main-color": "",
@@ -3364,7 +3307,11 @@ var initResult = {
     typography: ""
   }
 };
-var buildOptions;
+var buildOptions = {
+  verbose: false,
+  processed$themes: [],
+  buildTokenFormats: {}
+};
 var sd = new StyleDictionary2();
 var buildConfigs = {
   typography: { getConfig: configs.typographyVariables, dimensions: ["typography"] },
@@ -3397,19 +3344,15 @@ var buildConfigs = {
     log: ({ permutation: { theme } }) => `${theme} - info`
   },
   semantic: { getConfig: configs.semanticVariables, dimensions: ["semantic"] }
-  // storefront: {
-  //   name: 'Storefront preview tokens',
-  //   getConfig: configs.typescriptTokens,
-  //   dimensions: ['color-scheme'],
-  //   options: { outPath: path.resolve('../../apps/storefront/tokens') },
-  //   enabled: () => buildOptions?.preview ?? false,
-  // },
 };
 async function processPlatform(options) {
   const { type, processed$themes } = options;
   const platform = "css";
   const tokenSets = type === "format" ? options.tokenSets : void 0;
   const tokensDir = type === "build" ? options.tokensDir : void 0;
+  const filteredProcessed$themes = processed$themes.filter(
+    (theme) => R17.not(theme.group === "size" && theme.name !== "medium")
+  );
   const UNSAFE_DEFAULT_COLOR = process.env.UNSAFE_DEFAULT_COLOR ?? "";
   if (UNSAFE_DEFAULT_COLOR) {
     console.warn(
@@ -3432,19 +3375,16 @@ async function processPlatform(options) {
   buildOptions = options;
   buildOptions.defaultColor = UNSAFE_DEFAULT_COLOR;
   buildOptions.colorGroups = colorGroups;
-  const filteredProcessed$themes = processed$themes.filter(
-    (theme) => R19.not(theme.group === "size" && theme.name !== "medium")
-  );
-  const customColors = getCustomColors(filteredProcessed$themes, colorGroups);
   if (!buildOptions.defaultColor) {
-    const firstMainColor = R19.head(customColors);
+    const customColors = getCustomColors(filteredProcessed$themes, colorGroups);
+    const firstMainColor = R17.head(customColors);
     buildOptions.defaultColor = firstMainColor;
   }
   if (buildOptions.defaultColor) {
     console.log(`
 \u{1F3A8} Using ${chalk3.blue(buildOptions.defaultColor)} as default color`);
   }
-  const buildAndSdConfigs = R19.map((buildConfig) => {
+  const buildAndSdConfigs = R17.map((buildConfig) => {
     const sdConfigs = getConfigsForThemeDimensions(
       buildConfig.getConfig,
       filteredProcessed$themes,
@@ -3480,7 +3420,7 @@ async function processPlatform(options) {
     typography: [initResult]
   };
   try {
-    for (const [buildName, { buildConfig, sdConfigs }] of R19.toPairs(buildAndSdConfigs)) {
+    for (const [buildName, { buildConfig, sdConfigs }] of R17.toPairs(buildAndSdConfigs)) {
       if (!(buildConfig.enabled?.() ?? true)) {
         continue;
       }
@@ -3492,13 +3432,16 @@ async function processPlatform(options) {
             const { config, permutation } = sdConfig;
             const modes = ["theme", ...buildConfig.dimensions];
             const modeMessage = modes.map((x) => permutation[x]).join(" - ");
-            const logMessage = R19.isNil(buildConfig.log) ? modeMessage : buildConfig?.log(sdConfig);
+            const logMessage = R17.isNil(buildConfig.log) ? modeMessage : buildConfig?.log(sdConfig);
             console.log(logMessage);
             const sdOptions = { cache: true };
             const sdExtended = await sd.extend(config);
+            const formatted = await sdExtended.formatPlatform(platform, sdOptions);
+            const tokens = (await sdExtended.getPlatformTokens(platform, sdOptions)).allTokens;
             const result = {
               permutation,
-              formatted: await sdExtended.formatPlatform(platform, sdOptions)
+              formatted,
+              tokens
             };
             return Promise.resolve(result);
           })
@@ -3519,6 +3462,7 @@ async function processPlatform(options) {
 var formatTokens = async (options) => {
   const processedBuilds = await processPlatform({
     type: "format",
+    buildTokenFormats: {},
     ...options
   });
   return processedBuilds;
@@ -3530,15 +3474,14 @@ var formatTheme = async (themeConfig) => {
   const processedBuilds = await formatTokens({
     tokenSets,
     processed$themes,
-    verbose: false,
-    preview: false
+    verbose: false
   });
   return processedBuilds;
 };
 var formatThemeCSS = async (themeConfig) => {
   const processedBuilds = await formatTheme(themeConfig);
   const themeCSSFiles = createThemeCSSFiles({ processedBuilds });
-  return R20.head(themeCSSFiles)?.output ?? "";
+  return R18.head(themeCSSFiles)?.output ?? "";
 };
 export {
   formatTheme,