@digdir/designsystemet 1.1.0 → 1.1.1

package/dist/config.schema.json

@@ -9,10 +9,6 @@
       "description": "Path to the output directory for the created design tokens",
       "type": "string"
     },
-    "clean": {
-      "description": "Delete the output directory before building or creating tokens",
-      "type": "boolean"
-    },
     "themes": {
       "description": "An object with one or more themes. Each property defines a theme, and the property name is used as the theme name.",
       "type": "object",
@@ -85,6 +81,10 @@
         ],
         "additionalProperties": false
       }
+    },
+    "clean": {
+      "description": "Delete the output directory before building or creating tokens",
+      "type": "boolean"
     }
   },
   "required": [

package/dist/src/config.d.ts

@@ -9,7 +9,7 @@ import { z } from 'zod/v4';
  * @throws Exits the process with code 1 if validation fails, after logging a friendly error message.
  */
 export declare function validateConfig<T>(schema: z.ZodType<T>, unvalidatedConfig: Record<string, unknown>, configPath: string): T;
-export declare function parseConfig<T>(schema: z.ZodType<T>, configFile: string, configPath: string): T;
+export declare function parseConfig<T>(configFile: string, configPath: string): T;
 export declare const colorRegex: RegExp;
 declare const themeSchema: z.ZodObject<{
     colors: z.ZodObject<{
@@ -22,28 +22,13 @@ declare const themeSchema: z.ZodObject<{
     }, z.core.$strip>>;
     borderRadius: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
-export declare const configFileBuildSchema: z.ZodObject<{
+export declare const commonConfig: z.ZodObject<{
     clean: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
-export declare const configFileCreateSchema: z.ZodObject<{
-    outDir: z.ZodNonOptional<z.ZodString>;
-    clean: z.ZodNonOptional<z.ZodOptional<z.ZodBoolean>>;
-    themes: z.ZodNonOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        colors: z.ZodObject<{
-            main: z.ZodRecord<z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<`#${string}`, string>>>;
-            support: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<`#${string}`, string>>>>>;
-            neutral: z.ZodPipe<z.ZodString, z.ZodTransform<`#${string}`, string>>;
-        }, z.core.$strip>;
-        typography: z.ZodOptional<z.ZodObject<{
-            fontFamily: z.ZodString;
-        }, z.core.$strip>>;
-        borderRadius: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>>;
-}, z.core.$strip>;
 /**
  * This defines the structure of the final configuration file
  */
-export declare const combinedConfigSchema: z.ZodObject<{
+export declare const configFileCreateSchema: z.ZodObject<{
     outDir: z.ZodNonOptional<z.ZodString>;
     themes: z.ZodNonOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         colors: z.ZodObject<{
@@ -58,9 +43,9 @@ export declare const combinedConfigSchema: z.ZodObject<{
     }, z.core.$strip>>>;
     clean: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
-export type ConfigSchema = z.infer<typeof combinedConfigSchema>;
-export type ConfigSchemaBuild = z.infer<typeof configFileBuildSchema>;
-export type ConfigSchemaCreate = z.infer<typeof configFileCreateSchema>;
+export type CommonConfigSchema = z.infer<typeof commonConfig>;
+export type BuildConfigSchema = z.infer<typeof commonConfig>;
+export type CreateConfigSchema = z.infer<typeof configFileCreateSchema>;
 export type ConfigSchemaTheme = z.infer<typeof themeSchema>;
 export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/src/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAiC3B;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,UAAU,EAAE,MAAM,GACjB,CAAC,CASH;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,CAc9F;AAWD,eAAO,MAAM,UAAU,QAA2C,CAAC;AAyBnE,QAAA,MAAM,WAAW;;;;;;;;;;iBAiBmG,CAAC;AAErH,eAAO,MAAM,qBAAqB;;iBAEhC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;iBAYtB,CAAC;AAEd;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;iBAA6D,CAAC;AAC/F,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAChE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACtE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAsC3B;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,UAAU,EAAE,MAAM,GACjB,CAAC,CAUH;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,CAexE;AAWD,eAAO,MAAM,UAAU,QAA2C,CAAC;AAyBnE,QAAA,MAAM,WAAW;;;;;;;;;;iBAiBmG,CAAC;AAErH,eAAO,MAAM,YAAY;;iBAEvB,CAAC;AAYH;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;iBAAqD,CAAC;AACzF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAC7D,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/src/config.js

@@ -2,7 +2,7 @@
 import chalk from "chalk";
 import * as R7 from "ramda";
 import { z } from "zod/v4";
-import { fromError } from "zod-validation-error";
+import { fromError } from "zod-validation-error/v4";
 
 // src/colors/colorMetadata.ts
 import * as R from "ramda";
@@ -322,16 +322,21 @@ function mapPathToOptionName(path2) {
   return option;
 }
 function makeFriendlyError(err) {
-  return fromError(err, {
-    messageBuilder: (issues) => issues.map((issue) => {
-      const issuePath = issue.path.join(".");
-      const optionName = mapPathToOptionName(issue.path);
-      const errorCode = `(error code: ${issue.code})`;
-      const optionMessage = optionName ? ` or CLI option --${optionName}` : "";
-      return `  - Error in JSON value ${chalk.red(issuePath)}${optionMessage}:
-    ${issue.message} ${chalk.dim(errorCode)}`;
-    }).join("\n")
-  });
+  try {
+    return fromError(err, {
+      messageBuilder: (issues) => issues.map((issue) => {
+        const issuePath = issue.path.join(".");
+        const optionName = mapPathToOptionName(issue.path);
+        const errorCode = `(error code: ${issue.code})`;
+        const optionMessage = optionName ? ` or CLI option --${optionName}` : "";
+        return `  - Error in JSON value ${chalk.red(issuePath)}${optionMessage}:
+      ${issue.message} ${chalk.dim(errorCode)}`;
+      }).join("\n")
+    });
+  } catch (_err2) {
+    console.error(chalk.red(err instanceof Error ? err.message : "Unknown error occurred while parsing config file"));
+    console.error(err instanceof Error ? err.stack : "No stack trace available");
+  }
 }
 function validateConfig(schema, unvalidatedConfig, configPath) {
   try {
@@ -339,21 +344,20 @@ function validateConfig(schema, unvalidatedConfig, configPath) {
   } catch (err) {
     console.error(chalk.redBright(`Invalid config file at ${chalk.red(configPath)}`));
     const validationError = makeFriendlyError(err);
-    console.error(validationError.toString());
+    console.error(validationError?.toString());
     process.exit(1);
   }
 }
-function parseConfig(schema, configFile, configPath) {
+function parseConfig(configFile, configPath) {
   if (!configFile) {
     return {};
   }
   try {
-    const parsedConfig = JSON.parse(configFile);
-    return schema.parse(parsedConfig);
+    return JSON.parse(configFile);
   } catch (err) {
     console.error(chalk.redBright(`Failed parsing config file at ${chalk.red(configPath)}`));
     const validationError = makeFriendlyError(err);
-    console.error(validationError.toString());
+    console.error(validationError?.toString());
     process.exit(1);
   }
 }
@@ -391,21 +395,19 @@ var themeSchema = z.object({
   }).describe("Defines the typography for a given theme").optional(),
   borderRadius: z.number().meta({ description: "Defines the border-radius for this theme" }).optional()
 }).meta({ description: "An object defining a theme. The property name holding the object becomes the theme name." });
-var configFileBuildSchema = z.object({
+var commonConfig = z.object({
   clean: z.boolean().meta({ description: "Delete the output directory before building or creating tokens" }).optional()
 });
-var configFileCreateSchema = z.object({
+var _configFileCreateSchema = z.object({
   outDir: z.string().meta({ description: "Path to the output directory for the created design tokens" }),
-  clean: z.boolean().meta({ description: "Delete the output directory before building or creating tokens" }).optional(),
   themes: z.record(z.string(), themeSchema).meta({
     description: "An object with one or more themes. Each property defines a theme, and the property name is used as the theme name."
   })
 }).required();
-var combinedConfigSchema = configFileCreateSchema.extend(configFileBuildSchema.shape);
+var configFileCreateSchema = _configFileCreateSchema.extend(commonConfig.shape);
 export {
   colorRegex,
-  combinedConfigSchema,
-  configFileBuildSchema,
+  commonConfig,
   configFileCreateSchema,
   parseConfig,
   validateConfig

package/dist/src/index.js

@@ -2572,7 +2572,7 @@ import * as R7 from "ramda";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.1.0",
+  version: "1.1.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
@@ -2607,6 +2607,7 @@ var package_default = {
   },
   scripts: {
     designsystemet: "tsx ./bin/designsystemet.ts",
+    "designsystemet:inspect": "tsx --inspect-brk ./bin/designsystemet.ts",
     build: "tsup && pnpm build:types && pnpm build:json-schema",
     "build:types": "tsc --emitDeclarationOnly --declaration",
     "build:json-schema": "tsx ./src/scripts/createJsonSchema.ts",
@@ -2616,6 +2617,7 @@ var package_default = {
     "test:tokens-build": "pnpm run designsystemet tokens build -t ./temp/options/design-tokens -o ./temp/options/build --clean",
     "test:tokens-build-tailwind": "pnpm run designsystemet tokens build -t ./temp/options/design-tokens -o ./temp/options/build --clean --experimental-tailwind",
     "test:tokens-build-config": "pnpm run designsystemet tokens build -t ./temp/config/design-tokens -o ./temp/config/build --clean",
+    "test:tokens-build-config:inspect": "pnpm run designsystemet:inspect tokens build -t ./temp/config/design-tokens -o ./temp/config/build --clean",
     "test:tokens-build-config-tailwind": "pnpm run designsystemet tokens build -t ./temp/config/design-tokens -o ./temp/config/build --clean --experimental-tailwind",
     "test:tokens-create-and-build-options": "pnpm test:tokens-create-options && pnpm test:tokens-build",
     "test:tokens-create-and-build-config": "pnpm test:tokens-create-config && pnpm test:tokens-build-config",
@@ -2634,15 +2636,15 @@ var package_default = {
     "change-case": "^5.4.4",
     "chroma-js": "^3.1.2",
     "colorjs.io": "^0.6.0-alpha.1",
-    commander: "^13.1.0",
+    commander: "^14.0.0",
     "fast-glob": "^3.3.3",
     hsluv: "^1.0.1",
     "object-hash": "^3.0.0",
-    postcss: "^8.5.5",
+    postcss: "^8.5.6",
     ramda: "^0.30.1",
-    "style-dictionary": "^4.4.0",
-    zod: "^3.25.64",
-    "zod-validation-error": "^3.5.0"
+    "style-dictionary": "^5.0.0",
+    zod: "^3.25.67",
+    "zod-validation-error": "^3.5.2"
   },
   devDependencies: {
     "@tokens-studio/types": "0.5.2",
@@ -2650,7 +2652,7 @@ var package_default = {
     "@types/chroma-js": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
-    "@types/node": "^22.15.31",
+    "@types/node": "^22.15.32",
     "@types/object-hash": "^3.0.6",
     "@types/ramda": "^0.30.2",
     "fs-extra": "^11.3.0",
@@ -2668,7 +2670,7 @@ var createThemeCSSFiles = ({
   fileHeader: fileHeader2 = defaultFileHeader
 }) => {
   const groupedByTheme = {};
-  for (const [_, buildResults] of Object.entries(R7.dissoc("types", processedBuilds))) {
+  for (const [_, buildResults] of Object.entries(processedBuilds)) {
     for (const buildResult of buildResults) {
       const themeName = buildResult.permutation.theme;
       const newOutputs = buildResult.formatted;
@@ -3435,6 +3437,12 @@ function filterTokenSets(tokensets) {
 function cartesian(a) {
   return a.reduce((a2, b) => a2.flatMap((d) => b.map((e) => [d, e].flat())));
 }
+var getCustomColors = (processed$themes, colorGroups) => processed$themes.filter((x) => {
+  if (!x.group) {
+    return false;
+  }
+  return colorGroups.includes(x.group);
+}).map((x) => x.name);
 
 // src/tokens/process/configs.ts
 void register(StyleDictionary, { withSDBuiltins: false });
@@ -3517,12 +3525,6 @@ var initResult = {
 };
 var buildOptions;
 var sd = new StyleDictionary2();
-var getCustomColors = (processed$themes, colorGroups) => processed$themes.filter((x) => {
-  if (!x.group) {
-    return false;
-  }
-  return colorGroups.includes(x.group);
-}).map((x) => x.name);
 var buildConfigs = {
   typography: { getConfig: configs.typographyVariables, dimensions: ["typography"] },
   "color-scheme": { getConfig: configs.colorSchemeVariables, dimensions: ["color-scheme"] },
@@ -3563,7 +3565,7 @@ var buildConfigs = {
   // },
 };
 async function processPlatform(options) {
-  const { type, $themes } = 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;
@@ -3588,8 +3590,11 @@ async function processPlatform(options) {
   const colorGroups = UNSAFE_COLOR_GROUPS.length > 0 ? UNSAFE_COLOR_GROUPS : [colorCategories.main, colorCategories.support].map((c) => `${c}-color`);
   buildOptions = options;
   buildOptions.defaultColor = UNSAFE_DEFAULT_COLOR;
-  const processed$themes = $themes.map(processThemeObject).filter((theme) => R19.not(theme.group === "size" && theme.name !== "medium"));
-  const customColors = getCustomColors(processed$themes, colorGroups);
+  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);
     buildOptions.defaultColor = firstMainColor;
@@ -3599,10 +3604,15 @@ async function processPlatform(options) {
 \u{1F3A8} Using ${chalk3.blue(buildOptions.defaultColor)} as default color`);
   }
   const buildAndSdConfigs = R19.map((buildConfig) => {
-    const sdConfigs = getConfigsForThemeDimensions(buildConfig.getConfig, processed$themes, buildConfig.dimensions, {
-      tokensDir,
-      tokenSets
-    });
+    const sdConfigs = getConfigsForThemeDimensions(
+      buildConfig.getConfig,
+      filteredProcessed$themes,
+      buildConfig.dimensions,
+      {
+        tokensDir,
+        tokenSets
+      }
+    );
     const unknownConfigs = buildConfig.dimensions.map(
       (dimension) => sdConfigs.filter((x) => x.permutation[dimension] === "unknown")
     );
@@ -3626,8 +3636,7 @@ async function processPlatform(options) {
     "warning-color": [initResult],
     "info-color": [initResult],
     semantic: [initResult],
-    typography: [initResult],
-    types: [initResult]
+    typography: [initResult]
   };
   try {
     for (const [buildName, { buildConfig, sdConfigs }] of R19.toPairs(buildAndSdConfigs)) {
@@ -3662,30 +3671,8 @@ async function processPlatform(options) {
     }
     throw err;
   }
-  const colorsFileName = "colors.d.ts";
-  const reactColorTypes = await createColorTypeDeclaration(customColors);
-  processedBuilds.types = [
-    {
-      ...initResult,
-      formatted: [{ output: reactColorTypes, destination: colorsFileName }]
-    }
-  ];
   return processedBuilds;
 }
-async function createColorTypeDeclaration(colors) {
-  console.log(`
-\u{1F371} Building ${chalk3.green("type declarations")}`);
-  const typeDeclaration = `
-import type {} from '@digdir/designsystemet-react/colors';
-
-declare module '@digdir/designsystemet-react/colors' {
-  export interface MainAndSupportColors {
-${colors.map((color) => `    ${color}: never;`).join("\n")}
-  }
-}
-`.trimStart();
-  return typeDeclaration;
-}
 
 // src/tokens/format.ts
 var formatTokens = async (options) => {
@@ -3698,9 +3685,10 @@ var formatTokens = async (options) => {
 var formatTheme = async (themeConfig) => {
   const { tokenSets } = await createTokens(themeConfig);
   const $themes = await generate$Themes(["dark", "light"], [themeConfig.name], themeConfig.colors);
+  const processed$themes = $themes.map(processThemeObject);
   const processedBuilds = await formatTokens({
     tokenSets,
-    $themes,
+    processed$themes,
     verbose: false,
     preview: false
   });

package/dist/src/scripts/createJsonSchema.js

@@ -7,7 +7,7 @@ import { z as z2 } from "zod/v4";
 import chalk from "chalk";
 import * as R7 from "ramda";
 import { z } from "zod/v4";
-import { fromError } from "zod-validation-error";
+import { fromError } from "zod-validation-error/v4";
 
 // src/colors/colorMetadata.ts
 import * as R from "ramda";
@@ -334,22 +334,21 @@ var themeSchema = z.object({
   }).describe("Defines the typography for a given theme").optional(),
   borderRadius: z.number().meta({ description: "Defines the border-radius for this theme" }).optional()
 }).meta({ description: "An object defining a theme. The property name holding the object becomes the theme name." });
-var configFileBuildSchema = z.object({
+var commonConfig = z.object({
   clean: z.boolean().meta({ description: "Delete the output directory before building or creating tokens" }).optional()
 });
-var configFileCreateSchema = z.object({
+var _configFileCreateSchema = z.object({
   outDir: z.string().meta({ description: "Path to the output directory for the created design tokens" }),
-  clean: z.boolean().meta({ description: "Delete the output directory before building or creating tokens" }).optional(),
   themes: z.record(z.string(), themeSchema).meta({
     description: "An object with one or more themes. Each property defines a theme, and the property name is used as the theme name."
   })
 }).required();
-var combinedConfigSchema = configFileCreateSchema.extend(configFileBuildSchema.shape);
+var configFileCreateSchema = _configFileCreateSchema.extend(commonConfig.shape);
 
 // src/scripts/createJsonSchema.ts
 var schema = z2.object({
   $schema: z2.string().optional()
-}).extend(combinedConfigSchema.shape);
+}).extend(configFileCreateSchema.shape);
 writeFile(
   resolve(import.meta.dirname, "../../dist/config.schema.json"),
   JSON.stringify(

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

@@ -1,3 +1,3 @@
 import { type BuildOptions } from './process/platform.js';
-export declare const buildTokens: (options: Omit<BuildOptions, "type" | "$themes">) => Promise<import("./process/platform.js").ProcessReturn>;
+export declare const buildTokens: (options: Omit<BuildOptions, "type" | "processed$themes">) => Promise<import("./process/platform.js").ProcessReturn>;
 //# sourceMappingURL=build.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/tokens/build.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,YAAY,EAAmB,MAAM,uBAAuB,CAAC;AAiB3E,eAAO,MAAM,WAAW,GAAU,SAAS,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC,2DAqDhF,CAAC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/tokens/build.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,YAAY,EAAmB,MAAM,uBAAuB,CAAC;AAkB3E,eAAO,MAAM,WAAW,GAAU,SAAS,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAC,2DAqDzF,CAAC"}