@digdir/designsystemet 1.0.0-next.47 → 1.0.0-next.48

package/dist/bin/config.d.ts

@@ -10,7 +10,7 @@ export declare const configFileSchema: z.ZodObject<{
     themes: z.ZodRecord<z.ZodString, z.ZodObject<{
         colors: z.ZodObject<{
             main: z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>;
-            support: z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>;
+            support: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>>>;
             neutral: z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>;
         }, "strip", z.ZodTypeAny, {
             main: Record<string, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`>;
@@ -19,7 +19,7 @@ export declare const configFileSchema: z.ZodObject<{
         }, {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         }>;
         typography: z.ZodObject<{
             fontFamily: z.ZodString;
@@ -43,7 +43,7 @@ export declare const configFileSchema: z.ZodObject<{
         colors: {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         };
         typography: {
             fontFamily: string;
@@ -69,7 +69,7 @@ export declare const configFileSchema: z.ZodObject<{
         colors: {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         };
         typography: {
             fontFamily: string;
@@ -89,7 +89,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
     themes: z.ZodRecord<z.ZodString, z.ZodObject<{
         colors: z.ZodObject<{
             main: z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>;
-            support: z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>;
+            support: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>>>>;
             neutral: z.ZodEffects<z.ZodString, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`, string>;
         }, "strip", z.ZodTypeAny, {
             main: Record<string, `#${string}` | `rgb(${number} ${number} ${number})` | `hsl(${number}deg ${number}% ${number}%)` | `hsv(${number}deg ${number}% ${number}%)` | `hsluv(${number} ${number} ${number})` | `lab(${number}% ${number} ${number})` | `lch(${number}% ${number} ${number}deg)` | `oklab(${number}% ${number} ${number})` | `oklch(${number}% ${number} ${number}deg)` | `jab(${number}% ${number} ${number})` | `jch(${number}% ${number} ${number}deg)`>;
@@ -98,7 +98,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
         }, {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         }>;
         typography: z.ZodObject<{
             fontFamily: z.ZodString;
@@ -122,7 +122,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
         colors: {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         };
         typography: {
             fontFamily: string;
@@ -149,7 +149,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
         colors: {
             main: Record<string, string>;
             neutral: string;
-            support: Record<string, string>;
+            support?: Record<string, string> | undefined;
         };
         typography: {
             fontFamily: string;

package/dist/bin/config.js

@@ -25,7 +25,7 @@ const themeSchema = z.object(
     colors: z.object(
       {
         main: colorCategorySchema,
-        support: colorCategorySchema,
+        support: colorCategorySchema.optional().default({}),
         neutral: colorSchema
       },
       { description: "Defines the colors for this theme" }

package/dist/bin/designsystemet.js

@@ -44,14 +44,14 @@ function makeTokenCommands() {
     (radiusAsString) => Number(radiusAsString),
     4
   ).option("--theme <string>", "Theme name (ignored when using JSON config file)", DEFAULT_THEME_NAME).option(
-    "--json <string>",
-    `Path to JSON config file (default: "${DEFAULT_CONFIG_FILE}")`,
-    (value) => parseJsonConfig(value, { allowFileNotFound: false })
+    "--config <string>",
+    `Path to config file (default: "${DEFAULT_CONFIG_FILE}")`,
+    (value) => parseConfig(value, { allowFileNotFound: false })
   ).action(async (opts, cmd) => {
     if (opts.dry) {
       console.log(`Performing dry run, no files will be written`);
     }
-    const configFile = await (opts.json ? opts.json : parseJsonConfig(DEFAULT_CONFIG_FILE, { allowFileNotFound: true }));
+    const configFile = await (opts.config ? opts.config : parseConfig(DEFAULT_CONFIG_FILE, { allowFileNotFound: true }));
     const propsFromJson = configFile?.config;
     if (propsFromJson) {
       const themeColors = Object.values(propsFromJson?.themes ?? {}).map(
@@ -60,7 +60,7 @@ function makeTokenCommands() {
       if (!R.all(R.equals(R.__, themeColors[0]), themeColors)) {
         console.error(
           chalk.redBright(
-            `In JSON config ${configFile.path}, all themes must have the same custom color names, but we found:`
+            `In config ${configFile.path}, all themes must have the same custom color names, but we found:`
           )
         );
         const themeNames = R.keys(propsFromJson.themes ?? {});
@@ -103,7 +103,7 @@ function makeTokenCommands() {
     try {
       config = combinedConfigSchema.parse(unvalidatedConfig);
     } catch (err) {
-      console.error(chalk.redBright("Invalid config after combining JSON file and CLI options"));
+      console.error(chalk.redBright("Invalid config after combining config file and CLI options"));
       const validationError = makeFriendlyError(err);
       console.error(validationError.toString());
       process.exit(1);
@@ -137,12 +137,12 @@ program.command("migrate").description("run a Designsystemet migration").addArgu
   }
 });
 await program.parseAsync(process.argv);
-async function parseJsonConfig(jsonPath, options) {
-  const resolvedPath = path.resolve(process.cwd(), jsonPath);
-  let jsonFile;
+async function parseConfig(configPath, options) {
+  const resolvedPath = path.resolve(process.cwd(), configPath);
+  let configFile;
   try {
-    jsonFile = await fs.readFile(resolvedPath, { encoding: "utf-8" });
-    console.log(`Found JSON config file: ${chalk.green(resolvedPath)}`);
+    configFile = await fs.readFile(resolvedPath, { encoding: "utf-8" });
+    console.log(`Found config file: ${chalk.green(resolvedPath)}`);
   } catch (err) {
     if (err instanceof Error) {
       const nodeErr = err;
@@ -154,11 +154,11 @@ async function parseJsonConfig(jsonPath, options) {
   }
   try {
     return {
-      path: jsonPath,
-      config: await configFileSchema.parseAsync(JSON.parse(jsonFile))
+      path: configPath,
+      config: await configFileSchema.parseAsync(JSON.parse(configFile))
     };
   } catch (err) {
-    console.error(chalk.redBright(`Invalid JSON config in ${jsonPath}`));
+    console.error(chalk.redBright(`Invalid config in ${configPath}`));
     const validationError = makeFriendlyError(err);
     console.error(validationError.toString());
     process.exit(1);

package/dist/config.schema.json

@@ -30,7 +30,9 @@
                 "description": "One or more color definitions"
               },
               "support": {
-                "$ref": "#/properties/themes/additionalProperties/properties/colors/properties/main"
+                "$ref": "#/properties/themes/additionalProperties/properties/colors/properties/main",
+                "description": "One or more color definitions",
+                "default": {}
               },
               "neutral": {
                 "$ref": "#/properties/themes/additionalProperties/properties/colors/properties/main/additionalProperties"
@@ -38,7 +40,6 @@
             },
             "required": [
               "main",
-              "support",
               "neutral"
             ],
             "additionalProperties": false,

package/dist/src/tokens/build/configs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../src/tokens/build/configs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAoB,MAAM,wBAAwB,CAAC;AAQhG,OAAO,KAAK,EAEV,kBAAkB,EAClB,2BAA2B,EAC3B,cAAc,EACd,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,oBAAoB,EAA6B,MAAM,sCAAsC,CAAC;AAO5G,eAAO,MAAM,MAAM,OAAO,CAAC;AAC3B,eAAO,MAAM,cAAc,KAAK,CAAC;AA8BjC,MAAM,MAAM,wBAAwB,GAAG,CACrC,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,KACE,qBAAqB,GAAG;IAAE,MAAM,EAAE,qBAAqB,CAAC;IAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;CAAE,EAAE,CAAC;AA+PnH,eAAO,MAAM,OAAO;;;;;;;CAOnB,CAAC;AAEF,eAAO,MAAM,4BAA4B,cAC5B,wBAAwB,UAC3B,oBAAoB,EAAE,cAClB,cAAc,EAAE,WACnB,kBAAkB,KAC1B,2BAA2B,EA8B7B,CAAC"}
+{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../src/tokens/build/configs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAoB,MAAM,wBAAwB,CAAC;AAQhG,OAAO,KAAK,EAEV,kBAAkB,EAClB,2BAA2B,EAC3B,cAAc,EACd,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,oBAAoB,EAA6B,MAAM,sCAAsC,CAAC;AAO5G,eAAO,MAAM,MAAM,OAAO,CAAC;AAC3B,eAAO,MAAM,cAAc,KAAK,CAAC;AA8BjC,MAAM,MAAM,wBAAwB,GAAG,CACrC,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,KACE,qBAAqB,GAAG;IAAE,MAAM,EAAE,qBAAqB,CAAC;IAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;CAAE,EAAE,CAAC;AAwOnH,eAAO,MAAM,OAAO;;;;;;;CAOnB,CAAC;AAEF,eAAO,MAAM,4BAA4B,cAC5B,wBAAwB,UAC3B,oBAAoB,EAAE,cAClB,cAAc,EAAE,WACnB,kBAAkB,KAC1B,2BAA2B,EA8B7B,CAAC"}

package/dist/src/tokens/build/configs.js

@@ -2,7 +2,7 @@ import { expandTypesMap, register } from "@tokens-studio/sd-transforms";
 import * as R from "ramda";
 import StyleDictionary from "style-dictionary";
 import { outputReferencesFilter } from "style-dictionary/utils";
-import { DEFAULT_COLOR, buildOptions } from "../build.js";
+import { buildOptions } from "../build.js";
 import { isColorCategoryToken, isDigit, pathStartsWithOneOf, typeEquals } from "../utils.js";
 import { formats } from "./formats/css.js";
 import { jsTokens } from "./formats/js-tokens.js";
@@ -70,8 +70,8 @@ const colorSchemeVariables = ({ "color-scheme": colorScheme = "light", theme },
 };
 const colorCategoryVariables = (category) => ({ "color-scheme": colorScheme, theme, [`${category}-color`]: color }, { outPath }) => {
   const layer = `ds.theme.color`;
-  const isDefault = color === buildOptions?.accentColor;
-  const selector = `${isDefault ? ":root, [data-color-scheme], " : ""}[data-color="${color}"]`;
+  const isRootColor = color === buildOptions?.rootColor;
+  const selector = `${isRootColor ? ":root, [data-color-scheme], " : ""}[data-color="${color}"]`;
   const config = {
     usesDtcg,
     preprocessors: ["tokens-studio"],
@@ -101,29 +101,6 @@ const colorCategoryVariables = (category) => ({ "color-scheme": colorScheme, the
       }
     }
   };
-  if (isDefault && color !== DEFAULT_COLOR) {
-    console.log(
-      `Creating "${DEFAULT_COLOR}" color variables pointing to "${color}", since a color named "${DEFAULT_COLOR}" is not defined`
-    );
-    const defaultColorConfig = R.mergeDeepRight(config, {
-      platforms: {
-        css: {
-          selector: ":root",
-          files: [
-            {
-              ...config.platforms?.css?.files?.[0],
-              destination: `color/${DEFAULT_COLOR}.css`
-            }
-          ],
-          options: { replaceCategoryWith: DEFAULT_COLOR }
-        }
-      }
-    });
-    return [
-      { config },
-      { config: defaultColorConfig, permutationOverrides: { "main-color": `${DEFAULT_COLOR} \u2192 ${color}` } }
-    ];
-  }
   return config;
 };
 const semanticVariables = ({ theme }, { outPath }) => {

package/dist/src/tokens/build/types.d.ts

@@ -11,7 +11,7 @@ export type ColorCategories = keyof typeof colorCategories;
 export type ThemePermutation = {
     'color-scheme': string;
     'main-color': string;
-    'support-color': string;
+    'support-color'?: string;
     semantic: string;
     size: string;
     theme: string;

package/dist/src/tokens/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/tokens/build/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,eAAO,MAAM,eAAe;;;CAGlB,CAAC;AACX,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,eAAe,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;AAEpD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC;AAEtG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,SAAS,EAAE,wBAAwB,CAAC;IACpC,0FAA0F;IAC1F,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,uGAAuG;IACvG,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACtC,mEAAmE;IACnE,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,EAAE,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjG,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IAAE,WAAW,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/tokens/build/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,eAAO,MAAM,eAAe;;;CAGlB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,eAAe,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;AAEpD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC;AAEtG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,SAAS,EAAE,wBAAwB,CAAC;IACpC,0FAA0F;IAC1F,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,uGAAuG;IACvG,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACtC,mEAAmE;IACnE,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,EAAE,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjG,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IAAE,WAAW,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAC"}

package/dist/src/tokens/build.d.ts

@@ -1,4 +1,3 @@
-export declare const DEFAULT_COLOR = "accent";
 type Options = {
     /** Design tokens path */
     tokens: string;
@@ -8,8 +7,8 @@ type Options = {
     preview: boolean;
     /** Enable verbose output */
     verbose: boolean;
-    /** Set the default "accent" color, if not overridden with data-color */
-    accentColor?: string;
+    /** Set the default color for ":root" */
+    rootColor?: string;
     /** Dry run, no files will be written */
     dry?: boolean;
     /** Clean the output path before building tokens */

package/dist/src/tokens/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/tokens/build.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,aAAa,WAAW,CAAC;AAEtC,KAAK,OAAO,GAAG;IACb,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,IAAI,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC;AAwC7C,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFjE"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/tokens/build.ts"],"names":[],"mappings":"AAcA,KAAK,OAAO,GAAG;IACb,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,IAAI,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC;AAwC7C,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA2FjE"}

package/dist/src/tokens/build.js

@@ -8,7 +8,6 @@ import { colorCategories } from "./build/types.js";
 import { makeEntryFile } from "./build/utils/entryfile.js";
 import { processThemeObject } from "./build/utils/getMultidimensionalThemes.js";
 import { cleanDir, copyFile, writeFile } from "./utils.js";
-const DEFAULT_COLOR = "accent";
 let buildOptions;
 const sd = new StyleDictionary();
 const buildConfigs = {
@@ -48,24 +47,30 @@ async function buildTokens(options) {
   buildOptions = options;
   const $themes = JSON.parse(await fs.readFile(path.resolve(`${tokensDir}/$themes.json`), "utf-8")).map(processThemeObject);
   const relevant$themes = $themes.filter((theme) => R.not(theme.group === "size" && theme.name !== "medium"));
-  if (!buildOptions.accentColor) {
-    const accentOrFirstMainColor = relevant$themes.find((theme) => theme.name === DEFAULT_COLOR) || relevant$themes.find((theme) => theme.group === "main-color");
-    buildOptions.accentColor = accentOrFirstMainColor?.name;
+  if (!buildOptions.rootColor) {
+    const firstMainColor = relevant$themes.find((theme) => theme.group === "main-color");
+    buildOptions.rootColor = firstMainColor?.name;
+    console.log(`Using first main color; ${chalk.blue(firstMainColor?.name)}, as ${chalk.green(`":root"`)} color`);
   }
-  if (buildOptions.accentColor !== DEFAULT_COLOR) {
-    console.log("accent color:", buildOptions.accentColor);
-  }
-  const buildAndSdConfigs = R.map(
-    (val) => ({
-      buildConfig: val,
-      sdConfigs: getConfigsForThemeDimensions(val.getConfig, relevant$themes, val.dimensions, {
-        outPath: targetDir,
-        tokensDir,
-        ...val.options
-      })
-    }),
-    buildConfigs
-  );
+  const buildAndSdConfigs = R.map((buildConfig) => {
+    const sdConfigs = getConfigsForThemeDimensions(buildConfig.getConfig, relevant$themes, buildConfig.dimensions, {
+      outPath: targetDir,
+      tokensDir,
+      ...buildConfig.options
+    });
+    const unknownConfigs = buildConfig.dimensions.map(
+      (dimension) => sdConfigs.filter((x) => x.permutation[dimension] === "unknown")
+    );
+    for (const unknowns of unknownConfigs) {
+      if (unknowns.length === sdConfigs.length) {
+        buildConfig.enabled = () => false;
+      }
+    }
+    return {
+      buildConfig,
+      sdConfigs
+    };
+  }, buildConfigs);
   if (clean) {
     await cleanDir(targetDir, dry);
   }
@@ -121,7 +126,6 @@ ${mainAndSupportColors.map((color) => `    ${color}: never;`).join("\n")}
   await writeFile(path.resolve(outPath, colorsFileName), typeDeclaration, dry);
 }
 export {
-  DEFAULT_COLOR,
   buildOptions,
   buildTokens
 };

package/dist/src/tokens/design-tokens/template/$metadata.json

@@ -20,7 +20,6 @@
     "semantic/modes/support-color/brand1",
     "semantic/modes/support-color/brand2",
     "semantic/modes/support-color/brand3",
-    "semantic/style",
-    "Figma/components"
+    "semantic/style"
   ]
 }

package/dist/src/tokens/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../src/tokens/template.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,eAAe,qBAyG3B,CAAC"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../src/tokens/template.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,eAAe,qBAwG3B,CAAC"}

package/dist/src/tokens/template.js

@@ -16,7 +16,6 @@ const argsFromToPaths = (path_) => [
 const options = { recursive: true };
 const endsWithOneOf = (suffixes, str) => R.any((suffix) => R.endsWith(suffix, str), suffixes);
 const updateTemplates = async () => {
-  await fs.cp(...argsFromToPaths("Figma"), options);
   await fs.cp(...argsFromToPaths("primitives/globals.json"), options);
   await fs.cp(...argsFromToPaths("primitives/modes/size"), options);
   await fs.cp(...argsFromToPaths("primitives/modes/typography/size"), options);

package/dist/src/tokens/utils.js

@@ -65,7 +65,7 @@ const cleanDir = async (dir, dry) => {
     console.log(`${chalk.blue("cleanDir")} ${dir}`);
     return Promise.resolve();
   }
-  console.log(`${chalk.red("Cleaning outputDir: ")} ${dir}`);
+  console.log(`${chalk.red(`Cleaning outputDir: ${dir.trim()}`)} `);
   return await fs.rm(dir, { recursive: true, force: true });
 };
 export {

package/dist/src/tokens/write/generate$metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate$metadata.d.ts","sourceRoot":"","sources":["../../../../src/tokens/write/generate$metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,KAAK,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAyBtG"}
+{"version":3,"file":"generate$metadata.d.ts","sourceRoot":"","sources":["../../../../src/tokens/write/generate$metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,KAAK,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAwBtG"}

package/dist/src/tokens/write/generate$metadata.js

@@ -19,8 +19,7 @@ function generateMetadataJson(schemes, themes, colors) {
       "semantic/color",
       ...Object.entries(colors.main).map(([color]) => `semantic/modes/main-color/${color}`),
       ...Object.entries(colors.support).map(([color]) => `semantic/modes/support-color/${color}`),
-      "semantic/style",
-      "Figma/components"
+      "semantic/style"
     ]
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digdir/designsystemet",
-  "version": "1.0.0-next.47",
+  "version": "1.0.0-next.48",
   "description": "CLI for Designsystemet",
   "author": "Designsystemet team",
   "engines": {
@@ -40,52 +40,51 @@
     "build:types": "tsc --emitDeclarationOnly --declaration",
     "build:json-schema": "tsx ./src/build-scripts/createJsonSchema.ts",
     "types": "tsc --noEmit",
-    "test:tokens-create-options": "yarn designsystemet tokens create -m dominant:#007682 complimentary:#ff0000 -n #003333 -s support1:#12404f support2:#0054a6 support3:#942977 -b 99 -o ./test-tokens-create --clean",
-    "test:tokens-create-json": "yarn designsystemet tokens create --json ./test-tokens-create-complex.config.json",
+    "test:tokens-create-options": "yarn designsystemet tokens create -m dominant:#007682  -n #003333 -b 99 -o ./test-tokens-create --theme options-test --clean",
+    "test:tokens-create-config": "yarn designsystemet tokens create --config ./test-tokens-create-complex.config.json",
     "test:tokens-build": "yarn designsystemet tokens build -t ./test-tokens-create -o ./test-tokens-build --clean",
     "test:tokens-create-and-build-options": "yarn test:tokens-create-options && yarn test:tokens-build",
-    "test:tokens-create-and-build-json": "yarn test:tokens-create-json && yarn test:tokens-build",
-    "test": "yarn test:tokens-create-and-build-options && yarn test:tokens-create-and-build-json",
+    "test:tokens-create-and-build-config": "yarn test:tokens-create-config && yarn test:tokens-build",
+    "test": "yarn test:tokens-create-and-build-options && yarn test:tokens-create-and-build-config",
     "update:template": "tsx ./src/tokens/template.ts",
     "internal:tokens-create-digdir": "yarn designsystemet tokens create --theme theme -m accent:#0062BA -n #1E2B3C -s brand1:#F45F63 brand2:#E5AA20 brand3:#1E98F5 -o ./internal/design-tokens --clean",
-    "internal:tokens-create-altinn": "yarn designsystemet tokens create --theme theme2 -m accent:#0162BA -n #1E2B3C -s brand1:#0162BA brand2:#3F3161 brand3:#E02F4A -o ./internal/design-tokens --clean",
-    "internal:tokens-create-uutilsynet": "yarn designsystemet tokens create --theme theme3 -m accent:#0162BA -n #1E2B3C -s brand1:#5B60D1 brand2:#FEA769 brand3:#5DA290 -o ./internal/design-tokens --clean",
-    "internal:tokens-create-portal": "yarn designsystemet tokens create --theme theme4 -m accent:#4D107D -n #1E2B3C -s brand1:#A259DC brand2:#DF73E4 brand3:#E86ABF -o ./internal/design-tokens --clean",
+    "internal:tokens-create-altinn": "yarn designsystemet tokens create --theme theme2 -m accent:#0162BA -n #1E2B3C -s brand1:#0162BA brand2:#3F3161 brand3:#E02F4A -o ./internal/design-tokens",
+    "internal:tokens-create-uutilsynet": "yarn designsystemet tokens create --theme theme3 -m accent:#0162BA -n #1E2B3C -s brand1:#5B60D1 brand2:#FEA769 brand3:#5DA290 -o ./internal/design-tokens",
+    "internal:tokens-create-portal": "yarn designsystemet tokens create --theme theme4 -m accent:#4D107D -n #1E2B3C -s brand1:#A259DC brand2:#DF73E4 brand3:#E86ABF -o ./internal/design-tokens",
     "internal:tokens-create-all": "yarn internal:tokens-create-digdir && yarn internal:tokens-create-altinn && yarn internal:tokens-create-uutilsynet && yarn internal:tokens-create-portal"
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^12.1.0",
-    "@tokens-studio/sd-transforms": "1.2.2",
+    "@commander-js/extra-typings": "^13.0.0",
+    "@tokens-studio/sd-transforms": "1.2.9",
     "apca-w3": "^0.1.9",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "change-case": "^5.4.4",
-    "chroma-js": "^2.6.0",
-    "commander": "^12.1.0",
-    "fast-glob": "^3.3.2",
+    "chroma-js": "^3.1.2",
+    "commander": "^13.1.0",
+    "fast-glob": "^3.3.3",
     "hsluv": "^1.0.1",
-    "jscodeshift": "^0.16.1",
+    "jscodeshift": "^17.1.2",
     "object-hash": "^3.0.0",
-    "postcss": "^8.4.41",
-    "prompts": "^2.4.2",
+    "postcss": "^8.5.1",
     "ramda": "^0.30.1",
-    "style-dictionary": "^4.0.1",
-    "zod": "^3.23.8",
+    "style-dictionary": "^4.3.1",
+    "zod": "^3.24.1",
     "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
     "@types/apca-w3": "^0.1.3",
+    "@types/chroma-js": "^3.1.0",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
-    "@types/jscodeshift": "^0.11.11",
-    "@types/node": "^22.1.0",
+    "@types/jscodeshift": "^0.12.0",
+    "@types/node": "^22.10.7",
     "@types/object-hash": "^3.0.6",
-    "@types/prompts": "^2.4.9",
-    "@types/ramda": "^0.30.1",
-    "fs-extra": "^11.2.0",
-    "tslib": "^2.6.3",
-    "tsup": "^8.2.4",
-    "tsx": "^4.16.5",
-    "typescript": "^5.5.4",
+    "@types/ramda": "^0.30.2",
+    "fs-extra": "^11.3.0",
+    "tslib": "^2.8.1",
+    "tsup": "^8.3.5",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.3",
     "zod-to-json-schema": "^3.24.1"
   }
 }

package/dist/src/tokens/design-tokens/default/Figma/components.json

@@ -1,22 +0,0 @@
-{
-  "switch": {
-    "circle": {
-      "small": {
-        "$type": "sizing",
-        "$value": "{_size.5} - {switch.border}"
-      },
-      "medium": {
-        "$type": "sizing",
-        "$value": "{_size.6} - {switch.border}"
-      },
-      "large": {
-        "$type": "sizing",
-        "$value": "{_size.7} - {switch.border}"
-      }
-    },
-    "border": {
-      "$type": "sizing",
-      "$value": "4"
-    }
-  }
-}