@digdir/designsystemet 1.1.0 → 1.1.1

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

@@ -5,7 +5,7 @@ import * as R 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: {
@@ -40,6 +40,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",
@@ -49,6 +50,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",
@@ -67,15 +69,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",
@@ -83,7 +85,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",
@@ -101,7 +103,7 @@ var createThemeCSSFiles = ({
   fileHeader = defaultFileHeader
 }) => {
   const groupedByTheme = {};
-  for (const [_, buildResults] of Object.entries(R.dissoc("types", processedBuilds))) {
+  for (const [_, buildResults] of Object.entries(processedBuilds)) {
     for (const buildResult of buildResults) {
       const themeName = buildResult.permutation.theme;
       const newOutputs = buildResult.formatted;

package/dist/src/tokens/process/platform.d.ts

@@ -1,6 +1,6 @@
-import type { ThemeObject } from '@tokens-studio/types';
 import type { OutputFile, TokenSet } from '../types.js';
 import { type ThemePermutation } from '../types.js';
+import { type ProcessedThemeObject } from './utils/getMultidimensionalThemes.js';
 type SharedOptions = {
     /** Enable verbose output */
     verbose: boolean;
@@ -11,7 +11,9 @@ type SharedOptions = {
     /** Generate preview tokens */
     preview: boolean;
     /** Token Studio `$themes.json` content */
-    $themes: ThemeObject[];
+    processed$themes: ProcessedThemeObject[];
+    /** Color groups */
+    colorGroups?: string[];
 };
 export type BuildOptions = {
     type: 'build';
@@ -28,7 +30,7 @@ export type FormatOptions = {
     tokenSets: Map<string, TokenSet>;
 } & SharedOptions;
 type ProcessOptions = BuildOptions | FormatOptions;
-type ProcessedBuildConfigs<T> = Record<keyof typeof buildConfigs | 'types', T>;
+type ProcessedBuildConfigs<T> = Record<keyof typeof buildConfigs, T>;
 export type ProcessReturn = ProcessedBuildConfigs<BuildResult[]>;
 type BuildResult = {
     permutation: ThemePermutation;

package/dist/src/tokens/process/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../../src/tokens/process/platform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAqC,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIvF,KAAK,aAAa,GAAG;IACnB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAClC,GAAG,aAAa,CAAC;AAElB,KAAK,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;AAEnD,KAAK,qBAAqB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,OAAO,YAAY,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;AAE/E,MAAM,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;AAEjE,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,UAAU,EAAE,CAAC;CACzB,CAAC;AAeF,eAAO,IAAI,YAAY,EAAE,cAAc,GAAG,SAAS,CAAC;AAkBpD,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCqB,CAAC;AAExC,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA0IrF"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../../src/tokens/process/platform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAqC,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvF,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAElG,KAAK,aAAa,GAAG;IACnB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACzC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAClC,GAAG,aAAa,CAAC;AAElB,KAAK,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;AAEnD,KAAK,qBAAqB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,OAAO,YAAY,EAAE,CAAC,CAAC,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;AAEjE,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,UAAU,EAAE,CAAC;CACzB,CAAC;AAeF,eAAO,IAAI,YAAY,EAAE,cAAc,GAAG,SAAS,CAAC;AAOpD,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCqB,CAAC;AAExC,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAqIrF"}

package/dist/src/tokens/process/platform.js

@@ -779,20 +779,6 @@ var getMultidimensionalThemes = (processed$themes, dimensions) => {
   });
 };
 var processed = Symbol("Type brand for ProcessedThemeObject");
-function isProcessed(theme) {
-  return Boolean(theme[processed]);
-}
-function processThemeObject(theme) {
-  if (isProcessed(theme)) {
-    return theme;
-  }
-  const result = { ...theme, [processed]: true };
-  if (result.group) {
-    result.group = kebabCase(result.group);
-  }
-  result.name = kebabCase(result.name);
-  return result;
-}
 function groupThemes(themes) {
   const groups = {};
   for (const theme of themes) {
@@ -864,6 +850,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 });
@@ -946,12 +938,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"] },
@@ -992,7 +978,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;
@@ -1017,8 +1003,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) => R12.not(theme.group === "size" && theme.name !== "medium"));
-  const customColors = getCustomColors(processed$themes, colorGroups);
+  buildOptions.colorGroups = colorGroups;
+  const filteredProcessed$themes = processed$themes.filter(
+    (theme) => R12.not(theme.group === "size" && theme.name !== "medium")
+  );
+  const customColors = getCustomColors(filteredProcessed$themes, colorGroups);
   if (!buildOptions.defaultColor) {
     const firstMainColor = R12.head(customColors);
     buildOptions.defaultColor = firstMainColor;
@@ -1028,10 +1017,15 @@ async function processPlatform(options) {
 \u{1F3A8} Using ${chalk2.blue(buildOptions.defaultColor)} as default color`);
   }
   const buildAndSdConfigs = R12.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")
     );
@@ -1055,8 +1049,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 R12.toPairs(buildAndSdConfigs)) {
@@ -1091,30 +1084,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 ${chalk2.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;
-}
 export {
   buildOptions,
   processPlatform

package/dist/src/tokens/process/utils/getMultidimensionalThemes.d.ts

@@ -31,5 +31,6 @@ export type ProcessedThemeObject = ThemeObject & {
  */
 export declare function processThemeObject(theme: ThemeObject | ProcessedThemeObject): ProcessedThemeObject;
 export type GroupedThemes = Record<keyof ThemePermutation, ProcessedThemeObject[]>;
+export declare const getCustomColors: (processed$themes: ProcessedThemeObject[], colorGroups: (string | RegExp)[]) => string[];
 export {};
 //# sourceMappingURL=getMultidimensionalThemes.d.ts.map

package/dist/src/tokens/process/utils/getMultidimensionalThemes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMultidimensionalThemes.d.ts","sourceRoot":"","sources":["../../../../../src/tokens/process/utils/getMultidimensionalThemes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,GAAI,kBAAkB,oBAAoB,EAAE,EAAE,YAAY,cAAc,EAAE,sBAe/G,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,OAAO,MAAsD,CAAC;AAC/E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAMvE;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,oBAAoB,GAAG,oBAAoB,CAUlG;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,gBAAgB,EAAE,oBAAoB,EAAE,CAAC,CAAC"}
+{"version":3,"file":"getMultidimensionalThemes.d.ts","sourceRoot":"","sources":["../../../../../src/tokens/process/utils/getMultidimensionalThemes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,GAAI,kBAAkB,oBAAoB,EAAE,EAAE,YAAY,cAAc,EAAE,sBAe/G,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,OAAO,MAAsD,CAAC;AAC/E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAMvE;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,oBAAoB,GAAG,oBAAoB,CAUlG;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,gBAAgB,EAAE,oBAAoB,EAAE,CAAC,CAAC;AA8FnF,eAAO,MAAM,eAAe,GAAI,kBAAkB,oBAAoB,EAAE,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,aASnF,CAAC"}

package/dist/src/tokens/process/utils/getMultidimensionalThemes.js

@@ -921,7 +921,14 @@ 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);
 export {
+  getCustomColors,
   getMultidimensionalThemes,
   processThemeObject
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digdir/designsystemet",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "CLI for Designsystemet",
   "author": "Designsystemet team",
   "engines": {
@@ -41,15 +41,15 @@
     "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",
@@ -57,7 +57,7 @@
     "@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",
@@ -68,6 +68,7 @@
   },
   "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",
@@ -77,6 +78,7 @@
     "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",