@digdir/designsystemet 1.0.6 → 1.0.7

package/dist/src/config.d.ts

@@ -1,49 +1,17 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 export declare function mapPathToOptionName(path: (string | number)[]): string | undefined;
 export declare const colorRegex: RegExp;
 declare const themeSchema: z.ZodObject<{
     colors: z.ZodObject<{
-        main: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>;
-        support: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>>>;
-        neutral: z.ZodEffects<z.ZodString, `#${string}`, string>;
-    }, "strip", z.ZodTypeAny, {
-        neutral: `#${string}`;
-        main: Record<string, `#${string}`>;
-        support: Record<string, `#${string}`>;
-    }, {
-        neutral: string;
-        main: Record<string, string>;
-        support?: Record<string, string> | undefined;
-    }>;
+        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;
-    }, "strip", z.ZodTypeAny, {
-        fontFamily: string;
-    }, {
-        fontFamily: string;
-    }>>;
+    }, z.core.$strip>>;
     borderRadius: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    colors: {
-        neutral: `#${string}`;
-        main: Record<string, `#${string}`>;
-        support: Record<string, `#${string}`>;
-    };
-    typography?: {
-        fontFamily: string;
-    } | undefined;
-    borderRadius?: number | undefined;
-}, {
-    colors: {
-        neutral: string;
-        main: Record<string, string>;
-        support?: Record<string, string> | undefined;
-    };
-    typography?: {
-        fontFamily: string;
-    } | undefined;
-    borderRadius?: number | undefined;
-}>;
+}, z.core.$strip>;
 /**
  * This defines the structure of the JSON config file
  */
@@ -52,155 +20,35 @@ export declare const configFileSchema: z.ZodObject<{
     clean: z.ZodOptional<z.ZodBoolean>;
     themes: z.ZodRecord<z.ZodString, z.ZodObject<{
         colors: z.ZodObject<{
-            main: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>;
-            support: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>>>;
-            neutral: z.ZodEffects<z.ZodString, `#${string}`, string>;
-        }, "strip", z.ZodTypeAny, {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        }, {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        }>;
+            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;
-        }, "strip", z.ZodTypeAny, {
-            fontFamily: string;
-        }, {
-            fontFamily: string;
-        }>>;
+        }, z.core.$strip>>;
         borderRadius: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        colors: {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }, {
-        colors: {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    themes: Record<string, {
-        colors: {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>;
-    clean?: boolean | undefined;
-    outDir?: string | undefined;
-}, {
-    themes: Record<string, {
-        colors: {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>;
-    clean?: boolean | undefined;
-    outDir?: string | undefined;
-}>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 /**
  * This defines the structure of the final configuration after combining the config file,
  * command-line options and default values.
  */
 export declare const combinedConfigSchema: z.ZodObject<{
-    outDir: z.ZodString;
-    clean: z.ZodBoolean;
-    themes: z.ZodRecord<z.ZodString, z.ZodObject<{
+    outDir: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
+    clean: z.ZodNonOptional<z.ZodOptional<z.ZodBoolean>>;
+    themes: z.ZodNonOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         colors: z.ZodObject<{
-            main: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>;
-            support: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodString, `#${string}`, string>>, Record<string, `#${string}`>, Record<string, string>>>>;
-            neutral: z.ZodEffects<z.ZodString, `#${string}`, string>;
-        }, "strip", z.ZodTypeAny, {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        }, {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        }>;
+            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;
-        }, "strip", z.ZodTypeAny, {
-            fontFamily: string;
-        }, {
-            fontFamily: string;
-        }>>;
+        }, z.core.$strip>>;
         borderRadius: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        colors: {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }, {
-        colors: {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    clean: boolean;
-    themes: Record<string, {
-        colors: {
-            neutral: `#${string}`;
-            main: Record<string, `#${string}`>;
-            support: Record<string, `#${string}`>;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>;
-    outDir: string;
-}, {
-    clean: boolean;
-    themes: Record<string, {
-        colors: {
-            neutral: string;
-            main: Record<string, string>;
-            support?: Record<string, string> | undefined;
-        };
-        typography?: {
-            fontFamily: string;
-        } | undefined;
-        borderRadius?: number | undefined;
-    }>;
-    outDir: string;
-}>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>;
 export type Config = z.infer<typeof combinedConfigSchema>;
 export type ThemeConfig = z.infer<typeof themeSchema>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,sBAQ5D;AAWD,eAAO,MAAM,UAAU,QAA2C,CAAC;AAwBnE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqBhB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAO3B,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAA8B,CAAC;AAChE,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAK3B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,sBAQ5D;AAWD,eAAO,MAAM,UAAU,QAA2C,CAAC;AAyBnE,QAAA,MAAM,WAAW;;;;;;;;;;iBAiBmG,CAAC;AAErH;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;iBAO3B,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;iBAA8B,CAAC;AAChE,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/src/config.js

@@ -1,6 +1,6 @@
 // src/config.ts
 import * as R7 from "ramda";
-import { z } from "zod";
+import { z } from "zod/v4";
 
 // src/colors/utils.ts
 import chroma from "chroma-js";
@@ -327,45 +327,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((colors) => !Object.keys(colors).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."
   })
 });

package/dist/src/index.js

@@ -3499,11 +3499,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",
@@ -3514,7 +3514,8 @@ var package_default = {
   type: "module",
   main: "./dist/src/index.js",
   files: [
-    "./dist/**"
+    "./dist/**",
+    "./configs/**"
   ],
   bin: "dist/bin/designsystemet.js",
   exports: {
@@ -3533,22 +3534,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: {
@@ -3566,8 +3567,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",
@@ -3576,16 +3577,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"
   }
 };
 
@@ -3639,9 +3639,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}
 */

package/dist/src/migrations/beta-to-v1.js

@@ -42,12 +42,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 readFile = async (path, dry) => {
   if (dry) {

package/dist/src/migrations/codemods/css/run.js

@@ -1,10 +1,10 @@
 // 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 chalk from "chalk";
 var readFile = async (path, dry) => {
   if (dry) {

package/dist/src/migrations/color-rename-next49.js

@@ -33,12 +33,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 readFile = async (path, dry) => {
   if (dry) {

package/dist/src/migrations/index.js

@@ -42,12 +42,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 readFile = async (path, dry) => {
   if (dry) {