@digdir/designsystemet 1.0.6 → 1.0.7

package/configs/digdir.config.json

@@ -0,0 +1,59 @@
+{
+  "$schema": "../dist/config.schema.json",
+  "outDir": "./temp/digdir/design-tokens",
+  "clean": true,
+  "themes": {
+    "digdir": {
+      "colors": {
+        "main": {
+          "accent": "#0062BA"
+        },
+        "support": {
+          "brand1": "#F45F63",
+          "brand2": "#E5AA20",
+          "brand3": "#1E98F5"
+        },
+        "neutral": "#1E2B3C"
+      }
+    },
+    "altinn": {
+      "colors": {
+        "main": {
+          "accent": "#0062BA"
+        },
+        "support": {
+          "brand1": "#0162BA",
+          "brand2": "#3F3161",
+          "brand3": "#E02F4A"
+        },
+        "neutral": "#1E2B3C"
+      }
+    },
+    "uutilsynet": {
+      "colors": {
+        "main": {
+          "accent": "#0062BA"
+        },
+        "support": {
+          "brand1": "#5B60D1",
+          "brand2": "#FEA769",
+          "brand3": "#5DA290"
+        },
+        "neutral": "#1E2B3C"
+      }
+    },
+    "portal": {
+      "colors": {
+        "main": {
+          "accent": "#38628C"
+        },
+        "support": {
+          "brand1": "#D9ECFF",
+          "brand2": "#FFCA99",
+          "brand3": "#D96C79"
+        },
+        "neutral": "#203040"
+      }
+    }
+  }
+}

package/configs/test-tokens.config.json

@@ -0,0 +1,45 @@
+{
+  "$schema": "../dist/config.schema.json",
+  "outDir": "./temp/config/design-tokens",
+  "clean": true,
+  "themes": {
+    "some-org": {
+      "colors": {
+        "main": {
+          "dominant": "#0062BA",
+          "complimentary": "#94237C"
+        },
+        "support": {
+          "first": "#F45F63",
+          "second": "#E5AA20",
+          "third": "#1E98F5",
+          "fourth": "#F167EC"
+        },
+        "neutral": "#303030"
+      },
+      "typography": {
+        "fontFamily": "Inter"
+      },
+      "borderRadius": 8
+    },
+    "other-org": {
+      "colors": {
+        "main": {
+          "dominant": "#ffaaaa",
+          "complimentary": "#00ff00"
+        },
+        "support": {
+          "first": "#abcdef",
+          "second": "#123456",
+          "third": "#994a22",
+          "fourth": "#3d5f30"
+        },
+        "neutral": "#c05030"
+      },
+      "typography": {
+        "fontFamily": "Roboto"
+      },
+      "borderRadius": 99
+    }
+  }
+}

package/dist/bin/designsystemet.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // bin/designsystemet.ts
-import path4 from "node:path";
+import path4 from "path";
 import { Argument, createCommand, program } from "@commander-js/extra-typings";
 import chalk8 from "chalk";
 import * as R25 from "ramda";
@@ -361,7 +361,7 @@ var generateColorContrast = (color, type) => {
 
 // src/config.ts
 import * as R7 from "ramda";
-import { z } from "zod";
+import { z } from "zod/v4";
 
 // src/tokens/create/defaults.ts
 import * as R3 from "ramda";
@@ -2137,45 +2137,35 @@ var hexPatterns = [
 ];
 var reservedColorsPattern = `^(?!(?:${RESERVED_COLORS.join("|")})$)`;
 var colorRegex = new RegExp(`^${hexPatterns.join("|")}$`);
-var colorSchema = z.string({
-  description: `A hex color, which is used for creating a color scale. Invalid color names: ${RESERVED_COLORS.join(", ")}`
-}).regex(colorRegex).transform(convertToHex);
+var colorSchema = z.string().regex(colorRegex).transform(convertToHex).describe(
+  `A hex color, which is used for creating a color scale. Invalid color names: ${RESERVED_COLORS.join(", ")}`
+);
 var colorCategorySchema = z.record(
   z.string().regex(new RegExp(reservedColorsPattern, "i"), {
-    message: `Color names cannot include reserved names: ${RESERVED_COLORS.join(", ")}`
+    error: `Color names cannot include reserved names: ${RESERVED_COLORS.join(", ")}`
   }),
   colorSchema,
   {
-    description: "One or more color definitions",
-    invalid_type_error: "Color definitions must be hex color values"
+    error: "Color definitions must be hex color values"
   }
 ).refine((colors2) => !Object.keys(colors2).some((key) => RESERVED_COLORS.includes(key.toLowerCase())), {
-  message: `Color names cannot include reserved names: ${RESERVED_COLORS.join(", ")}`
-});
-var themeSchema = z.object(
-  {
-    colors: z.object(
-      {
-        main: colorCategorySchema,
-        support: colorCategorySchema.optional().default({}),
-        neutral: colorSchema
-      },
-      { description: "Defines the colors for this theme" }
-    ),
-    typography: z.object(
-      {
-        fontFamily: z.string({ description: "Sets the font-family for this theme" })
-      },
-      { description: "Defines the typography for a given theme" }
-    ).optional(),
-    borderRadius: z.number({ description: "Defines the border-radius for this theme" }).optional()
-  },
-  { description: "An object defining a theme. The property name holding the object becomes the theme name." }
-);
+  error: `Color names cannot include reserved names: ${RESERVED_COLORS.join(", ")}`
+}).describe("An object with one or more color definitions. The property name is used as the color name.");
+var themeSchema = z.object({
+  colors: z.object({
+    main: colorCategorySchema,
+    support: colorCategorySchema.optional().default({}),
+    neutral: colorSchema
+  }).meta({ description: "Defines the colors for this theme" }),
+  typography: z.object({
+    fontFamily: z.string().meta({ description: "Sets the font-family for this theme" })
+  }).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 configFileSchema = z.object({
-  outDir: z.string({ description: "Path to the output directory for the created design tokens" }).optional(),
-  clean: z.boolean({ description: "Delete the output directory before building or creating tokens" }).optional(),
-  themes: z.record(themeSchema, {
+  outDir: z.string().meta({ description: "Path to the output directory for the created design tokens" }).optional(),
+  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."
   })
 });
@@ -2225,12 +2215,12 @@ var cssVarRename = (dictionary) => ({
 });
 
 // src/migrations/codemods/css/run.ts
-import fs2 from "node:fs";
+import fs2 from "fs";
 import glob from "fast-glob";
 import postcss from "postcss";
 
 // src/utils.ts
-import fs from "node:fs/promises";
+import fs from "fs/promises";
 import chalk2 from "chalk";
 var mkdir = async (dir, dry) => {
   if (dry) {
@@ -2677,7 +2667,7 @@ var migrations_default = {
 };
 
 // src/tokens/build.ts
-import path2 from "node:path";
+import path2 from "path";
 import chalk6 from "chalk";
 import * as R23 from "ramda";
 
@@ -2688,11 +2678,11 @@ import chalk3 from "chalk";
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.0.6",
+  version: "1.0.7",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
-    node: ">=22.15.0"
+    node: ">=22.16.0"
   },
   repository: {
     type: "git",
@@ -2703,7 +2693,8 @@ var package_default = {
   type: "module",
   main: "./dist/src/index.js",
   files: [
-    "./dist/**"
+    "./dist/**",
+    "./configs/**"
   ],
   bin: "dist/bin/designsystemet.js",
   exports: {
@@ -2722,22 +2713,22 @@ var package_default = {
   },
   scripts: {
     designsystemet: "tsx ./bin/designsystemet.ts",
-    "build:tokens": "pnpm run designsystemet tokens build -p -t ../../design-tokens -o ../../packages/theme/brand --clean",
-    "build:tokens:debug": "tsx --inspect-brk ./bin/designsystemet.ts tokens build -p -t ../../design-tokens -o ../../packages/theme/brand --clean",
+    "build:tokens": "pnpm run designsystemet tokens build -p -t ../../internal/design-tokens -o ../../packages/theme/brand --clean",
+    "build:tokens:debug": "tsx --inspect-brk ./bin/designsystemet.ts tokens build -p -t ../../internal/design-tokens -o ../../packages/theme/brand --clean",
     build: "tsup && pnpm build:types && pnpm build:json-schema",
     "build:types": "tsc --emitDeclarationOnly --declaration",
     "build:json-schema": "tsx ./src/scripts/createJsonSchema.ts",
     types: "tsc --noEmit",
-    "test:tokens-create-options": 'pnpm run designsystemet tokens create -m dominant:"#007682" -n "#003333" -b 99 -o ./test-tokens/options --theme options --clean',
-    "test:tokens-create-config": "pnpm run designsystemet tokens create --config ./test/test-tokens.config.json",
-    "test:tokens-build": "pnpm run designsystemet tokens build -t ./test-tokens/options -o ./test-tokens/options-build --clean",
-    "test:tokens-build-config": "pnpm run designsystemet tokens build -t ./test-tokens/config -o ./test-tokens/config-build --clean",
+    "test:tokens-create-options": 'pnpm run designsystemet tokens create -m dominant:"#007682" -n "#003333" -b 99 -o ./temp/options/design-tokens --theme options --clean',
+    "test:tokens-create-config": "pnpm run designsystemet tokens create --config ./configs/test-tokens.config.json",
+    "test:tokens-build": "pnpm run designsystemet tokens build -t ./temp/options/design-tokens -o ./temp/options/build --clean",
+    "test:tokens-build-config": "pnpm run designsystemet tokens build -t ./temp/config/design-tokens -o ./temp/config/build --clean",
     "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",
     test: "pnpm test:tokens-create-and-build-options && pnpm test:tokens-create-and-build-config",
-    "internal:tokens-create": "pnpm run designsystemet tokens create --config ./internal.config.json",
+    "digdir:tokens-create": "pnpm run designsystemet tokens create --config ./configs/digdir.config.json",
     "update:template": "tsx ./src/scripts/update-template.ts",
-    "update:design-tokens": "pnpm internal:tokens-create && tsx ./src/scripts/update-design-tokens.ts",
+    "update:design-tokens": "pnpm digdir:tokens-create && tsx ./src/scripts/update-design-tokens.ts",
     verify: "pnpm test && pnpm update:template && pnpm update:design-tokens"
   },
   dependencies: {
@@ -2755,8 +2746,8 @@ var package_default = {
     postcss: "^8.5.3",
     ramda: "^0.30.1",
     "style-dictionary": "^4.4.0",
-    zod: "^3.24.4",
-    "zod-validation-error": "^3.4.0"
+    zod: "^3.25.30",
+    "zod-validation-error": "^3.4.1"
   },
   devDependencies: {
     "@tokens-studio/types": "0.5.2",
@@ -2765,16 +2756,15 @@ var package_default = {
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
     "@types/jscodeshift": "^0.12.0",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.21",
     "@types/object-hash": "^3.0.6",
     "@types/ramda": "^0.30.2",
     "fs-extra": "^11.3.0",
     "ts-toolbelt": "^9.6.0",
     tslib: "^2.8.1",
-    tsup: "^8.4.0",
+    tsup: "^8.5.0",
     tsx: "^4.19.4",
-    typescript: "^5.8.3",
-    "zod-to-json-schema": "^3.24.5"
+    typescript: "^5.8.3"
   }
 };
 
@@ -2828,9 +2818,6 @@ order may change due to nondeterminism.`.trim()
     return sortIndex;
   });
   const header = `@charset "UTF-8";
-
-@layer ds.theme, ds.base, ds.utilities, ds.components;
-
 /*
 ${fileHeader2}
 */
@@ -3985,7 +3972,7 @@ var buildTokens = async (options) => {
   const fileHeader2 = R23.join("")([
     defaultFileHeader,
     $designsystemet ? `
-design-tokens: v${$designsystemet.version} ` : ""
+design-tokens: v${$designsystemet.version}` : ""
   ]);
   await write(createThemeCSSFiles({ processedBuilds, fileHeader: fileHeader2 }), outDir, options.dry);
   console.log(`
@@ -3994,7 +3981,7 @@ design-tokens: v${$designsystemet.version} ` : ""
 };
 
 // src/tokens/create/write.ts
-import path3 from "node:path";
+import path3 from "path";
 import chalk7 from "chalk";
 import * as R24 from "ramda";
 

package/dist/config.schema.json

@@ -1,83 +1,94 @@
 {
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {
     "$schema": {
       "type": "string"
     },
     "outDir": {
-      "type": "string",
-      "description": "Path to the output directory for the created design tokens"
+      "description": "Path to the output directory for the created design tokens",
+      "type": "string"
     },
     "clean": {
-      "type": "boolean",
-      "description": "Delete the output directory before building or creating tokens"
+      "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",
+      "propertyNames": {
+        "type": "string"
+      },
       "additionalProperties": {
+        "description": "An object defining a theme. The property name holding the object becomes the theme name.",
         "type": "object",
         "properties": {
           "colors": {
+            "description": "Defines the colors for this theme",
             "type": "object",
             "properties": {
               "main": {
+                "description": "An object with one or more color definitions. The property name is used as the color name.",
                 "type": "object",
-                "additionalProperties": {
-                  "type": "string",
-                  "pattern": "^#[0-9a-fA-F]{3}|#[0-9a-fA-F]{4}|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{8}$",
-                  "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info, blue, green, orange, purple, red"
-                },
                 "propertyNames": {
+                  "type": "string",
                   "pattern": "^(?!(?:neutral|success|warning|danger|info|blue|green|orange|purple|red)$)"
                 },
-                "description": "One or more color definitions"
+                "additionalProperties": {
+                  "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info, blue, green, orange, purple, red"
+                }
               },
               "support": {
-                "$ref": "#/properties/themes/additionalProperties/properties/colors/properties/main",
-                "default": {}
+                "default": {},
+                "description": "An object with one or more color definitions. The property name is used as the color name.",
+                "type": "object",
+                "propertyNames": {
+                  "type": "string",
+                  "pattern": "^(?!(?:neutral|success|warning|danger|info|blue|green|orange|purple|red)$)"
+                },
+                "additionalProperties": {
+                  "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info, blue, green, orange, purple, red"
+                }
               },
               "neutral": {
-                "$ref": "#/properties/themes/additionalProperties/properties/colors/properties/main/additionalProperties"
+                "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info, blue, green, orange, purple, red"
               }
             },
             "required": [
               "main",
+              "support",
               "neutral"
             ],
-            "additionalProperties": false,
-            "description": "Defines the colors for this theme"
+            "additionalProperties": false
           },
           "typography": {
+            "description": "Defines the typography for a given theme",
             "type": "object",
             "properties": {
               "fontFamily": {
-                "type": "string",
-                "description": "Sets the font-family for this theme"
+                "description": "Sets the font-family for this theme",
+                "type": "string"
               }
             },
             "required": [
               "fontFamily"
             ],
-            "additionalProperties": false,
-            "description": "Defines the typography for a given theme"
+            "additionalProperties": false
           },
           "borderRadius": {
-            "type": "number",
-            "description": "Defines the border-radius for this theme"
+            "description": "Defines the border-radius for this theme",
+            "type": "number"
           }
         },
         "required": [
           "colors"
         ],
-        "additionalProperties": false,
-        "description": "An object defining a theme. The property name holding the object becomes the theme name."
-      },
-      "description": "An object with one or more themes. Each property defines a theme, and the property name is used as the theme name."
+        "additionalProperties": false
+      }
     }
   },
   "required": [
     "themes"
   ],
-  "additionalProperties": false,
-  "$schema": "http://json-schema.org/draft-07/schema#"
+  "additionalProperties": false
 }