@digdir/designsystemet 1.13.0 → 1.13.1

package/dist/bin/designsystemet.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 // bin/designsystemet.ts
-import path5 from "path";
+import path4 from "path";
 import { Argument, createCommand, program } from "@commander-js/extra-typings";
-import pc12 from "picocolors";
-import * as R29 from "ramda";
+import pc11 from "picocolors";
+import * as R28 from "ramda";
 
 // src/colors/colorMetadata.ts
 import * as R from "ramda";
@@ -393,7 +393,7 @@ var cssClassRename = (dictionary) => ({
 var cssVarRename = (dictionary) => ({
   postcssPlugin: `Replaces CSS variables ${hash(dictionary)}`,
   Declaration(decl) {
-    const { value, prop: prop4 } = decl;
+    const { value, prop: prop3 } = decl;
     const deleted = /* @__PURE__ */ new Set();
     for (const [from, to] of Object.entries(dictionary)) {
       if (R4.isNotEmpty(to)) {
@@ -404,8 +404,8 @@ var cssVarRename = (dictionary) => ({
           decl.value = value.replace(from, to);
           continue;
         }
-        if (R4.includes(from, prop4) && decl.variable) {
-          decl.prop = prop4.replace(from, to);
+        if (R4.includes(from, prop3) && decl.variable) {
+          decl.prop = prop3.replace(from, to);
         }
       }
     }
@@ -468,23 +468,23 @@ var FileSystem = class {
     }
     return fs.mkdir(dir, { recursive: true });
   };
-  writeFile = async (path6, data) => {
+  writeFile = async (path5, data) => {
     if (this.dry) {
-      console.log(`${pc2.blue("writeFile")} ${path6}`);
+      console.log(`${pc2.blue("writeFile")} ${path5}`);
       return Promise.resolve();
     }
-    return fs.writeFile(path6, data, { encoding: "utf-8" }).catch((error) => {
-      console.error(pc2.red(`Error writing file: ${path6}`));
+    return fs.writeFile(path5, data, { encoding: "utf-8" }).catch((error) => {
+      console.error(pc2.red(`Error writing file: ${path5}`));
       console.error(pc2.red(error));
       throw error;
     });
   };
-  cp = async (src, dest, filter2) => {
+  cp = async (src, dest, filter) => {
     if (this.dry) {
       console.log(`${pc2.blue("cp")} ${src} ${dest}`);
       return Promise.resolve();
     }
-    return fs.cp(src, dest, { recursive: true, filter: filter2 });
+    return fs.cp(src, dest, { recursive: true, filter });
   };
   copyFile = async (src, dest) => {
     if (this.dry) {
@@ -502,12 +502,12 @@ var FileSystem = class {
 \u{1F525} Cleaning dir ${pc2.red(`${dir.trim()}`)} `);
     return fs.rm(dir, { recursive: true, force: true });
   };
-  readFile = async (path6, allowFileNotFound) => {
+  readFile = async (path5, allowFileNotFound) => {
     if (this.dry) {
-      console.log(`${pc2.blue("readFile")} ${path6}`);
+      console.log(`${pc2.blue("readFile")} ${path5}`);
     }
     try {
-      return await fs.readFile(path6, "utf-8");
+      return await fs.readFile(path5, "utf-8");
     } catch (error) {
       if (allowFileNotFound && error.code === "ENOENT") {
         return "";
@@ -515,12 +515,12 @@ var FileSystem = class {
       throw error;
     }
   };
-  readdir = async (path6) => {
+  readdir = async (path5) => {
     if (this.dry) {
-      console.log(`${pc2.blue("readdir")} ${path6}`);
+      console.log(`${pc2.blue("readdir")} ${path5}`);
     }
     try {
-      return await fs.readdir(path6);
+      return await fs.readdir(path5);
     } catch (error) {
       if (error.code === "ENOENT") {
         return [];
@@ -959,7 +959,7 @@ import pc5 from "picocolors";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
@@ -1082,8 +1082,8 @@ var pathStartsWithOneOf = R6.curry(
     }
     const tokenPath = mapToLowerCase(token.path);
     const matchPathsStartingWith = R6.map((pathOrString) => {
-      const path6 = typeof pathOrString === "string" ? [pathOrString] : pathOrString;
-      return R6.startsWith(mapToLowerCase(path6), tokenPath);
+      const path5 = typeof pathOrString === "string" ? [pathOrString] : pathOrString;
+      return R6.startsWith(mapToLowerCase(path5), tokenPath);
     }, paths);
     return hasAnyTruth(matchPathsStartingWith);
   }
@@ -1108,11 +1108,11 @@ function isColorCategoryToken(token, category) {
 var isDigit = (s) => /^\d+$/.test(s);
 function traverseObj(obj, fn) {
   for (const key in obj) {
-    const prop4 = obj[key];
-    if (prop4 != null) {
-      fn.apply(null, [obj, key, prop4]);
-      if (typeof prop4 === "object") {
-        traverseObj(prop4, fn);
+    const prop3 = obj[key];
+    if (prop3 != null) {
+      fn.apply(null, [obj, key, prop3]);
+      if (typeof prop3 === "object") {
+        traverseObj(prop3, fn);
       }
     }
   }
@@ -2524,8 +2524,8 @@ ${dynamicColors}`;
 import pc6 from "picocolors";
 import * as R21 from "ramda";
 var defaultFileHeader2 = `build: v${package_default.version}`;
-var getFileNameWithoutExtension = (path6) => {
-  const pathSegments = path6.split("/");
+var getFileNameWithoutExtension = (path5) => {
+  const pathSegments = path5.split("/");
   return pathSegments[pathSegments.length - 1].split(".").slice(0, -1).join(".");
 };
 var createThemeCSSFiles = ({
@@ -2640,11 +2640,6 @@ design-tokens: v${$designsystemet.version}` : ""
   return files;
 };
 
-// src/tokens/create/files.ts
-import path2 from "path";
-import pc8 from "picocolors";
-import * as R23 from "ramda";
-
 // src/tokens/create/generators/$designsystemet.ts
 function generate$Designsystemet() {
   return {
@@ -2846,33 +2841,16 @@ var createTokenFiles = async (options) => {
   const {
     outDir,
     tokenSets,
-    theme: { name: themeName, colors: colors2 }
+    theme: { colors: colors2 },
+    themeNames
   } = options;
   const $themesPath = "$themes.json";
   const $metadataPath = "$metadata.json";
   const $designsystemetPath = "$designsystemet.jsonc";
-  let themeObjects = [];
   const sizeModes2 = ["small", "medium", "large"];
   await dsfs.mkdir(outDir);
-  try {
-    const $themes2 = await dsfs.readFile(path2.join(outDir, $themesPath));
-    if ($themes2) {
-      themeObjects = JSON.parse($themes2);
-    }
-  } catch (_error) {
-  }
-  const concatThemeNames = R23.pipe(
-    R23.filter((obj) => R23.toLower(obj.group || "") === "theme"),
-    R23.map(R23.prop("name")),
-    // New theme is added to the end of the list so we keep the same order from config and Token Studio
-    R23.append(themeName),
-    R23.uniq
-  );
-  const themes = concatThemeNames(themeObjects);
-  console.log(`
-Themes: ${pc8.blue(themes.join(", "))}`);
-  const $themes = await generate$Themes(["dark", "light"], themes, colors2, sizeModes2);
-  const $metadata = generate$Metadata(["dark", "light"], themes, colors2, sizeModes2);
+  const $themes = await generate$Themes(["dark", "light"], themeNames, colors2, sizeModes2);
+  const $metadata = generate$Metadata(["dark", "light"], themeNames, colors2, sizeModes2);
   const $designsystemet = generate$Designsystemet();
   const files = [];
   files.push({ destination: $themesPath, output: stringify($themes) });
@@ -2886,7 +2864,7 @@ Themes: ${pc8.blue(themes.join(", "))}`);
 };
 
 // src/tokens/create/generators/primitives/color-scheme.ts
-import * as R24 from "ramda";
+import * as R23 from "ramda";
 var generateColor = (colorArray, overrides) => {
   const obj = {};
   const $type = "color";
@@ -2923,11 +2901,11 @@ var generateColorScheme = (themeName, colorScheme2, colors2, overrides) => {
     });
     return Object.keys(positionOverrides).length > 0 ? positionOverrides : void 0;
   };
-  const main = R24.mapObjIndexed(
+  const main = R23.mapObjIndexed(
     (color, colorName) => generateColor(generateColorScale(color, colorScheme2), createColorOverrides(colorName)),
     colors2.main
   );
-  const support = R24.mapObjIndexed(
+  const support = R23.mapObjIndexed(
     (color, colorName) => generateColor(generateColorScale(color, colorScheme2), createColorOverrides(colorName)),
     colors2.support
   );
@@ -2937,7 +2915,7 @@ var generateColorScheme = (themeName, colorScheme2, colors2, overrides) => {
     ...baseColors,
     ...overrides?.severity
   };
-  const globalColors = R24.mapObjIndexed(
+  const globalColors = R23.mapObjIndexed(
     (color, colorName) => generateColor(generateColorScale(color, colorScheme2), createColorOverrides(colorName)),
     baseColorsWithOverrides
   );
@@ -3489,7 +3467,7 @@ var fontSizes = {
 };
 
 // src/tokens/create/generators/semantic/color.ts
-import * as R25 from "ramda";
+import * as R24 from "ramda";
 var generateSemanticColors = (colors2, _themeName) => {
   const mainColorNames = Object.keys(colors2.main);
   const supportColorNames = Object.keys(colors2.support);
@@ -3528,7 +3506,7 @@ var baseColorTemplate = {
 };
 var generateColorScaleTokens = (colorName) => {
   const colorScale = {};
-  for (const [colorSemantic, colorNumber] of R25.toPairs(semanticColorMap)) {
+  for (const [colorSemantic, colorNumber] of R24.toPairs(semanticColorMap)) {
     colorScale[colorSemantic] = {
       $type: "color",
       $value: `{color.${colorName}.${colorNumber}}`
@@ -3956,7 +3934,7 @@ function generateSemanticStyle() {
 }
 
 // src/tokens/create/generators/themes/theme.ts
-import * as R26 from "ramda";
+import * as R25 from "ramda";
 var generateTheme = (colors2, themeName, borderRadius) => {
   const mainColorNames = Object.keys(colors2.main);
   const supportColorNames = Object.keys(colors2.support);
@@ -3988,8 +3966,8 @@ var generateTheme = (colors2, themeName, borderRadius) => {
     },
     ...remainingThemeFile
   };
-  const baseBorderRadius = R26.lensPath(["border-radius", "base", "$value"]);
-  const updatedThemeFile = R26.set(baseBorderRadius, String(borderRadius), themeFile);
+  const baseBorderRadius = R25.lensPath(["border-radius", "base", "$value"]);
+  const updatedThemeFile = R25.set(baseBorderRadius, String(borderRadius), themeFile);
   const token = JSON.parse(
     JSON.stringify(
       updatedThemeFile,
@@ -4061,7 +4039,7 @@ var generateBase = (themeName) => ({
 });
 var generateColorScaleTokens3 = (colorName, themeName) => {
   const colorScale = {};
-  for (const [_, colorNumber] of R26.toPairs(semanticColorMap)) {
+  for (const [_, colorNumber] of R25.toPairs(semanticColorMap)) {
     colorScale[colorNumber] = {
       $type: "color",
       $value: `{${themeName}.${colorName}.${colorNumber}}`
@@ -4116,8 +4094,8 @@ var createTokens = async (theme) => {
 };
 
 // src/tokens/generate-config.ts
-import path3 from "path";
-import pc9 from "picocolors";
+import path2 from "path";
+import pc8 from "picocolors";
 async function readJsonFile(filePath) {
   try {
     const content = await dsfs.readFile(filePath);
@@ -4136,21 +4114,21 @@ function extractBaseColor(colorScale) {
   return null;
 }
 async function discoverThemes(tokensDir) {
-  const lightModePath = path3.join(tokensDir, "themes");
+  const lightModePath = path2.join(tokensDir, "themes");
   try {
     const files = await dsfs.readdir(lightModePath);
     const themes = files.filter((file) => file.endsWith(".json")).map((file) => file.replace(".json", ""));
     return themes;
   } catch {
-    throw new Error(`Could not find themes. Make sure ${pc9.blue(lightModePath)} exists and contains theme JSON files.`);
+    throw new Error(`Could not find themes. Make sure ${pc8.blue(lightModePath)} exists and contains theme JSON files.`);
   }
 }
 async function readThemeTokens(tokensDir, themeName) {
-  const themePath = path3.join(tokensDir, "primitives", "modes", "color-scheme", "light", `${themeName}.json`);
+  const themePath = path2.join(tokensDir, "primitives", "modes", "color-scheme", "light", `${themeName}.json`);
   return readJsonFile(themePath);
 }
 async function readThemeConfig(tokensDir, themeName) {
-  const themeConfigPath = path3.join(tokensDir, "themes", `${themeName}.json`);
+  const themeConfigPath = path2.join(tokensDir, "themes", `${themeName}.json`);
   try {
     return await readJsonFile(themeConfigPath);
   } catch {
@@ -4184,7 +4162,7 @@ function extractFontFamily(themeConfig) {
   return void 0;
 }
 async function readTypographyConfig(tokensDir, themeName) {
-  const typographyConfigPath = path3.join(
+  const typographyConfigPath = path2.join(
     tokensDir,
     "primitives",
     "modes",
@@ -4246,31 +4224,31 @@ function categorizeColors(themeTokens, themeName) {
 async function generateConfigFromTokens(options) {
   const { tokensDir } = options;
   console.log(`
-Reading tokens from ${pc9.blue(tokensDir)}`);
+Reading tokens from ${pc8.blue(tokensDir)}`);
   const themes = await discoverThemes(tokensDir);
   if (themes.length === 0) {
     throw new Error(`
-No themes found in ${pc9.blue(tokensDir)}`);
+No themes found in ${pc8.blue(tokensDir)}`);
   }
   console.log(`
-Found ${pc9.green(String(themes.length))} theme(s): ${themes.map((t) => pc9.cyan(t)).join(", ")}`);
+Found ${pc8.green(String(themes.length))} theme(s): ${themes.map((t) => pc8.cyan(t)).join(", ")}`);
   const config = {
     outDir: tokensDir,
     themes: {}
   };
   for (const themeName of themes) {
     console.log(`
-Processing theme ${pc9.cyan(themeName)}...`);
+Processing theme ${pc8.cyan(themeName)}...`);
     const themeTokens = await readThemeTokens(tokensDir, themeName);
     const themeConfig = await readThemeConfig(tokensDir, themeName);
     const typographyConfig = await readTypographyConfig(tokensDir, themeName);
     const { main, support, neutral } = categorizeColors(themeTokens, themeName);
     if (Object.keys(main).length === 0) {
-      console.warn(pc9.yellow(`
+      console.warn(pc8.yellow(`
 Warning: No main colors found for theme ${themeName}`));
     }
     if (!neutral) {
-      console.warn(pc9.yellow(`
+      console.warn(pc8.yellow(`
 Warning: No neutral color found for theme ${themeName}`));
       continue;
     }
@@ -4287,38 +4265,38 @@ Warning: No neutral color found for theme ${themeName}`));
     };
     console.log(
       `
-\u2705 Main colors: ${Object.keys(main).map((c) => pc9.cyan(c)).join(", ") || pc9.dim("none")}`
+\u2705 Main colors: ${Object.keys(main).map((c) => pc8.cyan(c)).join(", ") || pc8.dim("none")}`
     );
     console.log(
       `
-\u2705 Support colors: ${Object.keys(support).map((c) => pc9.cyan(c)).join(", ") || pc9.dim("none")}`
+\u2705 Support colors: ${Object.keys(support).map((c) => pc8.cyan(c)).join(", ") || pc8.dim("none")}`
     );
     console.log(`
-\u2705 Neutral: ${pc9.cyan(neutral)}`);
+\u2705 Neutral: ${pc8.cyan(neutral)}`);
     if (borderRadius !== void 0) {
       console.log(`
-\u2705 Border radius: ${pc9.cyan(String(borderRadius))}`);
+\u2705 Border radius: ${pc8.cyan(String(borderRadius))}`);
     }
     if (fontFamily) {
       console.log(`
-\u2705 Font family: ${pc9.cyan(fontFamily)}`);
+\u2705 Font family: ${pc8.cyan(fontFamily)}`);
     }
   }
   return config;
 }
 
 // bin/config.ts
-import pc11 from "picocolors";
-import * as R28 from "ramda";
-
-// src/config.ts
 import pc10 from "picocolors";
 import * as R27 from "ramda";
+
+// src/config.ts
+import pc9 from "picocolors";
+import * as R26 from "ramda";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
-function mapPathToOptionName(path6) {
-  const normalisedPath = path6[0] === "themes" ? ["theme", ...R27.drop(2, path6)] : path6;
-  const option = R27.path(normalisedPath, cliOptions);
+function mapPathToOptionName(path5) {
+  const normalisedPath = path5[0] === "themes" ? ["theme", ...R26.drop(2, path5)] : path5;
+  const option = R26.path(normalisedPath, cliOptions);
   if (typeof option !== "string") {
     return;
   }
@@ -4332,12 +4310,12 @@ function makeFriendlyError(err) {
         const optionName = mapPathToOptionName(issue.path);
         const errorCode = `(error code: ${issue.code})`;
         const optionMessage = optionName ? ` or CLI option --${optionName}` : "";
-        return `  - Error in JSON value ${pc10.red(issuePath)}${optionMessage}:
-      ${issue.message} ${pc10.dim(errorCode)}`;
+        return `  - Error in JSON value ${pc9.red(issuePath)}${optionMessage}:
+      ${issue.message} ${pc9.dim(errorCode)}`;
       }).join("\n")
     });
   } catch (_err2) {
-    console.error(pc10.red(err instanceof Error ? err.message : "Unknown error occurred while parsing config file"));
+    console.error(pc9.red(err instanceof Error ? err.message : "Unknown error occurred while parsing config file"));
     console.error(err instanceof Error ? err.stack : "No stack trace available");
   }
 }
@@ -4345,7 +4323,7 @@ function validateConfig(schema, unvalidatedConfig, configFilePath) {
   try {
     return schema.parse(unvalidatedConfig);
   } catch (err) {
-    console.error(pc10.redBright(`Invalid config file at ${pc10.red(configFilePath)}`));
+    console.error(pc9.redBright(`Invalid config file at ${pc9.red(configFilePath)}`));
     const validationError = makeFriendlyError(err);
     console.error(validationError?.toString());
     process.exit(1);
@@ -4358,7 +4336,7 @@ function parseConfig(configFile, configFilePath) {
   try {
     return JSON.parse(configFile);
   } catch (err) {
-    console.error(pc10.redBright(`Failed parsing config file at ${pc10.red(configFilePath)}`));
+    console.error(pc9.redBright(`Failed parsing config file at ${pc9.red(configFilePath)}`));
     const validationError = makeFriendlyError(err);
     console.error(validationError?.toString());
     process.exit(1);
@@ -4457,11 +4435,11 @@ async function readConfigFile(configFilePath, allowFileNotFound = true) {
     if (allowFileNotFound) {
       return "";
     }
-    console.error(pc11.redBright(`Could not read config file at ${pc11.blue(configFilePath)}`));
+    console.error(pc10.redBright(`Could not read config file at ${pc10.blue(configFilePath)}`));
     throw err;
   }
   if (configFile) {
-    console.log(`Found config file: ${pc11.green(configFilePath)}`);
+    console.log(`Found config file: ${pc10.green(configFilePath)}`);
   }
   return configFile;
 }
@@ -4469,11 +4447,11 @@ async function parseCreateConfig(configFile, options) {
   const { cmd, theme = "theme", configFilePath } = options;
   const configParsed = parseConfig(configFile, configFilePath);
   const themeColors = Object.values(configParsed?.themes ?? {}).map(
-    (x) => /* @__PURE__ */ new Set([...R28.keys(x.colors.main), ...R28.keys(x.colors.support)])
+    (x) => /* @__PURE__ */ new Set([...R27.keys(x.colors.main), ...R27.keys(x.colors.support)])
   );
-  if (!R28.all(R28.equals(R28.__, themeColors[0]), themeColors)) {
-    console.error(pc11.redBright(`In config, all themes must have the same custom color names, but we found:`));
-    const themeNames = R28.keys(configParsed.themes ?? {});
+  if (!R27.all(R27.equals(R27.__, themeColors[0]), themeColors)) {
+    console.error(pc10.redBright(`In config, all themes must have the same custom color names, but we found:`));
+    const themeNames = R27.keys(configParsed.themes ?? {});
     themeColors.forEach((colors2, index) => {
       const colorNames2 = Array.from(colors2);
       console.log(`  - ${themeNames[index]}: ${colorNames2.join(", ")}`);
@@ -4481,7 +4459,7 @@ async function parseCreateConfig(configFile, options) {
     console.log();
     process.exit(1);
   }
-  const noUndefined = R28.reject(R28.isNil);
+  const noUndefined = R27.reject(R27.isNil);
   const getThemeOptions = (optionGetter) => noUndefined({
     colors: noUndefined({
       main: optionGetter(cmd, "mainColors"),
@@ -4497,10 +4475,10 @@ async function parseCreateConfig(configFile, options) {
   const unvalidatedConfig = noUndefined({
     outDir: configParsed?.outDir ?? getCliOption(cmd, "outDir"),
     clean: configParsed?.clean ?? getCliOption(cmd, "clean"),
-    themes: configParsed?.themes ? R28.map((jsonThemeValues) => {
+    themes: configParsed?.themes ? R27.map((jsonThemeValues) => {
       const defaultThemeValues = getThemeOptions(getDefaultCliOption);
       const cliThemeValues = getThemeOptions(getSuppliedCliOption);
-      const mergedConfigs = R28.mergeDeepRight(defaultThemeValues, R28.mergeDeepRight(jsonThemeValues, cliThemeValues));
+      const mergedConfigs = R27.mergeDeepRight(defaultThemeValues, R27.mergeDeepRight(jsonThemeValues, cliThemeValues));
       return mergedConfigs;
     }, configParsed.themes) : (
       // If there are no themes specified in the JSON config, we use both explicit
@@ -4532,11 +4510,11 @@ var DEFAULT_THEME_NAME = "theme";
 var DEFAULT_CONFIG_FILEPATH = "designsystemet.config.json";
 function makeTokenCommands() {
   const tokenCmd = createCommand("tokens");
-  tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${pc12.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option(
+  tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${pc11.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option(
     "-o, --out-dir <string>",
-    `Output directory for built ${pc12.blue("design-tokens")}`,
+    `Output directory for built ${pc11.blue("design-tokens")}`,
     DEFAULT_TOKENS_BUILD_DIR
-  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before building tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for built ${pc12.blue("design-tokens")}`, parseBoolean, false).option("--verbose", "Enable verbose output", false).option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option("--experimental-tailwind", "Generate Tailwind CSS classes for tokens", false).action(async (opts) => {
+  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before building tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for built ${pc11.blue("design-tokens")}`, parseBoolean, false).option("--verbose", "Enable verbose output", false).option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option("--experimental-tailwind", "Generate Tailwind CSS classes for tokens", false).action(async (opts) => {
     console.log(figletAscii);
     const { verbose, clean, dry, experimentalTailwind, tokens } = opts;
     dsfs.init({ dry, outdir: opts.outDir, verbose });
@@ -4550,17 +4528,17 @@ function makeTokenCommands() {
       tailwind: experimentalTailwind
     });
     console.log(`
-\u{1F4BE} Writing build to ${pc12.green(outDir)}`);
+\u{1F4BE} Writing build to ${pc11.green(outDir)}`);
     await dsfs.writeFiles(files, outDir, true);
     console.log(`
-\u2705 Finished building tokens in ${pc12.green(outDir)}`);
+\u2705 Finished building tokens in ${pc11.green(outDir)}`);
     return Promise.resolve();
   });
   tokenCmd.command("create").description("Create Designsystemet tokens").option(`-m, --${cliOptions.theme.colors.main} <name:hex...>`, `Main colors`, parseColorValues).option(`-s, --${cliOptions.theme.colors.support} <name:hex...>`, `Support colors`, parseColorValues).option(`-n, --${cliOptions.theme.colors.neutral} <hex>`, `Neutral hex color`, convertToHex).option(
     `-o, --${cliOptions.outDir} <string>`,
-    `Output directory for created ${pc12.blue("design-tokens")}`,
+    `Output directory for created ${pc11.blue("design-tokens")}`,
     DEFAULT_TOKENS_CREATE_DIR
-  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before creating tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for created ${pc12.blue("design-tokens")}`, parseBoolean, false).option(`-f, --${cliOptions.theme.typography.fontFamily} <string>`, `Font family (experimental)`, DEFAULT_FONT).option(
+  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before creating tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for created ${pc11.blue("design-tokens")}`, parseBoolean, false).option(`-f, --${cliOptions.theme.typography.fontFamily} <string>`, `Font family (experimental)`, DEFAULT_FONT).option(
     `-b, --${cliOptions.theme.borderRadius} <number>`,
     `Unitless base border-radius in px`,
     (radiusAsString) => Number(radiusAsString),
@@ -4577,6 +4555,10 @@ function makeTokenCommands() {
       cmd,
       configFilePath
     });
+    const themeNames = Object.keys(config.themes);
+    if (themeNames.length > 0) {
+      console.log(`Using themes from config file: ${pc11.blue(themeNames.join(", "))}`);
+    }
     dsfs.init({ dry: opts.dry, outdir: config.outDir });
     const outDir = dsfs.outDir;
     if (config.clean) {
@@ -4587,12 +4569,12 @@ function makeTokenCommands() {
       for (const [name, themeWithoutName] of Object.entries(config.themes)) {
         const theme = { name, ...themeWithoutName };
         const { tokenSets } = await createTokens(theme);
-        files = files.concat(await createTokenFiles({ outDir, theme, tokenSets }));
+        files = files.concat(await createTokenFiles({ outDir, theme, tokenSets, themeNames }));
       }
     }
     await dsfs.writeFiles(files, outDir);
     console.log(`
-\u2705 Finished creating tokens in ${pc12.green(outDir)} for theme: ${pc12.blue(themeName)}`);
+\u2705 Finished creating tokens in ${pc11.green(outDir)} for themes: ${pc11.blue(themeNames.join(", "))}`);
     return Promise.resolve();
   });
   return tokenCmd;
@@ -4601,9 +4583,9 @@ program.addCommand(makeTokenCommands());
 program.command("generate-config-from-tokens").description("Generate a config file from existing design tokens. Will not include overrides.").option("-d, --dir <string>", "Path to design tokens directory", DEFAULT_TOKENS_CREATE_DIR).option("-o, --out <string>", "Output path for config file", DEFAULT_CONFIG_FILEPATH).option("--dry [boolean]", "Dry run - show config without writing file", parseBoolean, false).action(async (opts) => {
   console.log(figletAscii);
   const { dry } = opts;
-  const tokensDir = path5.resolve(opts.dir);
-  const configFilePath = path5.resolve(opts.out);
-  dsfs.init({ dry, outdir: path5.dirname(configFilePath) });
+  const tokensDir = path4.resolve(opts.dir);
+  const configFilePath = path4.resolve(opts.out);
+  dsfs.init({ dry, outdir: path4.dirname(configFilePath) });
   try {
     const config = await generateConfigFromTokens({
       tokensDir,
@@ -4619,10 +4601,10 @@ program.command("generate-config-from-tokens").description("Generate a config fi
       await dsfs.writeFile(configFilePath, configJson);
       console.log();
       console.log(`
-\u2705 Config file written to ${pc12.blue(configFilePath)}`);
+\u2705 Config file written to ${pc11.blue(configFilePath)}`);
     }
   } catch (error) {
-    console.error(pc12.redBright("Error generating config:"));
+    console.error(pc11.redBright("Error generating config:"));
     console.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
@@ -4640,8 +4622,8 @@ program.command("migrate").description("run a Designsystemet migration").addArgu
       console.error("Migration not found!");
       throw "Aborting";
     }
-    console.log(`Applying migration ${pc12.blue(migrationKey)} with glob: ${pc12.green(glob2)}`);
-    migration?.(glob2).then(() => console.log(`Migration ${pc12.blue(migrationKey)} finished`)).catch((error) => console.log(error));
+    console.log(`Applying migration ${pc11.blue(migrationKey)} with glob: ${pc11.green(glob2)}`);
+    migration?.(glob2).then(() => console.log(`Migration ${pc11.blue(migrationKey)} finished`)).catch((error) => console.log(error));
   } else {
     console.log("Migrate: please specify a migration name or --list");
   }
@@ -4656,7 +4638,7 @@ function parseBoolean(value) {
   return value === "true" || value === true;
 }
 async function getConfigFile(userConfigFilePath) {
-  const allowFileNotFound = R29.isNil(userConfigFilePath) || userConfigFilePath === DEFAULT_CONFIG_FILEPATH;
+  const allowFileNotFound = R28.isNil(userConfigFilePath) || userConfigFilePath === DEFAULT_CONFIG_FILEPATH;
   const configFilePath = userConfigFilePath ?? DEFAULT_CONFIG_FILEPATH;
   const configFile = await readConfigFile(configFilePath, allowFileNotFound);
   return { configFile, configFilePath };

package/dist/src/index.js

@@ -2138,7 +2138,7 @@ import * as R9 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/build.js

@@ -133,7 +133,7 @@ import pc4 from "picocolors";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/create/files.d.ts

@@ -4,6 +4,7 @@ type CreateTokenFilesOptions = {
     outDir: string;
     theme: Theme;
     tokenSets: TokenSets;
+    themeNames: string[];
 };
 export declare const createTokenFiles: (options: CreateTokenFilesOptions) => Promise<OutputFile[]>;
 export {};

package/dist/src/tokens/create/files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../src/tokens/create/files.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAa,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK3E,eAAO,MAAM,SAAS,GAAI,MAAM,OAAO,WAAkC,CAAC;AAE1E,KAAK,uBAAuB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,SAAS,uBAAuB,0BAoDtE,CAAC"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../src/tokens/create/files.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAa,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK3E,eAAO,MAAM,SAAS,GAAI,MAAM,OAAO,WAAkC,CAAC;AAE1E,KAAK,uBAAuB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,SAAS,uBAAuB,0BAiCtE,CAAC"}

package/dist/src/tokens/create/files.js

@@ -1,8 +1,3 @@
-// src/tokens/create/files.ts
-import path2 from "path";
-import pc2 from "picocolors";
-import * as R from "ramda";
-
 // src/utils/filesystem.ts
 import fs from "fs/promises";
 import path from "path";
@@ -52,23 +47,23 @@ var FileSystem = class {
     }
     return fs.mkdir(dir, { recursive: true });
   };
-  writeFile = async (path3, data) => {
+  writeFile = async (path2, data) => {
     if (this.dry) {
-      console.log(`${pc.blue("writeFile")} ${path3}`);
+      console.log(`${pc.blue("writeFile")} ${path2}`);
       return Promise.resolve();
     }
-    return fs.writeFile(path3, data, { encoding: "utf-8" }).catch((error) => {
-      console.error(pc.red(`Error writing file: ${path3}`));
+    return fs.writeFile(path2, data, { encoding: "utf-8" }).catch((error) => {
+      console.error(pc.red(`Error writing file: ${path2}`));
       console.error(pc.red(error));
       throw error;
     });
   };
-  cp = async (src, dest, filter2) => {
+  cp = async (src, dest, filter) => {
     if (this.dry) {
       console.log(`${pc.blue("cp")} ${src} ${dest}`);
       return Promise.resolve();
     }
-    return fs.cp(src, dest, { recursive: true, filter: filter2 });
+    return fs.cp(src, dest, { recursive: true, filter });
   };
   copyFile = async (src, dest) => {
     if (this.dry) {
@@ -86,12 +81,12 @@ var FileSystem = class {
 \u{1F525} Cleaning dir ${pc.red(`${dir.trim()}`)} `);
     return fs.rm(dir, { recursive: true, force: true });
   };
-  readFile = async (path3, allowFileNotFound) => {
+  readFile = async (path2, allowFileNotFound) => {
     if (this.dry) {
-      console.log(`${pc.blue("readFile")} ${path3}`);
+      console.log(`${pc.blue("readFile")} ${path2}`);
     }
     try {
-      return await fs.readFile(path3, "utf-8");
+      return await fs.readFile(path2, "utf-8");
     } catch (error) {
       if (allowFileNotFound && error.code === "ENOENT") {
         return "";
@@ -99,12 +94,12 @@ var FileSystem = class {
       throw error;
     }
   };
-  readdir = async (path3) => {
+  readdir = async (path2) => {
     if (this.dry) {
-      console.log(`${pc.blue("readdir")} ${path3}`);
+      console.log(`${pc.blue("readdir")} ${path2}`);
     }
     try {
-      return await fs.readdir(path3);
+      return await fs.readdir(path2);
     } catch (error) {
       if (error.code === "ENOENT") {
         return [];
@@ -131,7 +126,7 @@ var dsfs = new FileSystem();
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
@@ -581,33 +576,16 @@ var createTokenFiles = async (options) => {
   const {
     outDir,
     tokenSets,
-    theme: { name: themeName, colors }
+    theme: { colors },
+    themeNames
   } = options;
   const $themesPath = "$themes.json";
   const $metadataPath = "$metadata.json";
   const $designsystemetPath = "$designsystemet.jsonc";
-  let themeObjects = [];
   const sizeModes = ["small", "medium", "large"];
   await dsfs.mkdir(outDir);
-  try {
-    const $themes2 = await dsfs.readFile(path2.join(outDir, $themesPath));
-    if ($themes2) {
-      themeObjects = JSON.parse($themes2);
-    }
-  } catch (_error) {
-  }
-  const concatThemeNames = R.pipe(
-    R.filter((obj) => R.toLower(obj.group || "") === "theme"),
-    R.map(R.prop("name")),
-    // New theme is added to the end of the list so we keep the same order from config and Token Studio
-    R.append(themeName),
-    R.uniq
-  );
-  const themes = concatThemeNames(themeObjects);
-  console.log(`
-Themes: ${pc2.blue(themes.join(", "))}`);
-  const $themes = await generate$Themes(["dark", "light"], themes, colors, sizeModes);
-  const $metadata = generate$Metadata(["dark", "light"], themes, colors, sizeModes);
+  const $themes = await generate$Themes(["dark", "light"], themeNames, colors, sizeModes);
+  const $metadata = generate$Metadata(["dark", "light"], themeNames, colors, sizeModes);
   const $designsystemet = generate$Designsystemet();
   const files = [];
   files.push({ destination: $themesPath, output: stringify($themes) });

package/dist/src/tokens/create/generators/$designsystemet.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/format.js

@@ -1910,7 +1910,7 @@ import * as R8 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/index.js

@@ -1926,7 +1926,7 @@ import * as R8 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/process/output/declarations.js

@@ -4,7 +4,7 @@ import pc3 from "picocolors";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/dist/src/tokens/process/output/theme.js

@@ -5,7 +5,7 @@ import * as R2 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.13.0",
+  version: "1.13.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digdir/designsystemet",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "CLI for Designsystemet",
   "author": "Designsystemet team",
   "engines": {
@@ -51,7 +51,7 @@
     "style-dictionary": "^5.3.3",
     "zod": "^4.3.6",
     "zod-validation-error": "^5.0.0",
-    "@digdir/designsystemet-types": "^1.13.0"
+    "@digdir/designsystemet-types": "^1.13.1"
   },
   "devDependencies": {
     "@tokens-studio/types": "0.5.2",