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

package/dist/bin/config.d.ts

@@ -6,6 +6,7 @@ export declare const colorRegex: RegExp;
  */
 export declare const configFileSchema: z.ZodObject<{
     outDir: z.ZodOptional<z.ZodString>;
+    clean: z.ZodOptional<z.ZodBoolean>;
     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>>;
@@ -61,6 +62,7 @@ export declare const configFileSchema: z.ZodObject<{
         };
         borderRadius: number;
     }>;
+    clean?: boolean | undefined;
     outDir?: string | undefined;
 }, {
     themes: Record<string, {
@@ -74,6 +76,7 @@ export declare const configFileSchema: z.ZodObject<{
         };
         borderRadius: number;
     }>;
+    clean?: boolean | undefined;
     outDir?: string | undefined;
 }>;
 /**
@@ -82,6 +85,7 @@ export declare const configFileSchema: z.ZodObject<{
  */
 export declare const combinedConfigSchema: z.ZodObject<{
     outDir: z.ZodString;
+    clean: z.ZodBoolean;
     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>>;
@@ -126,6 +130,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
         borderRadius: number;
     }>>;
 }, "strip", z.ZodTypeAny, {
+    clean: boolean;
     themes: Record<string, {
         colors: {
             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)`>;
@@ -139,6 +144,7 @@ export declare const combinedConfigSchema: z.ZodObject<{
     }>;
     outDir: string;
 }, {
+    clean: boolean;
     themes: Record<string, {
         colors: {
             main: Record<string, string>;

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,sBAQ5D;AAUD,eAAO,MAAM,UAAU,QAA2C,CAAC;AA6BnE;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM3B,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAA8B,CAAC;AAChE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,sBAQ5D;AAUD,eAAO,MAAM,UAAU,QAA2C,CAAC;AA6BnE;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAO3B,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAA8B,CAAC;AAChE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/bin/config.js

@@ -0,0 +1,56 @@
+import * as R from "ramda";
+import { z } from "zod";
+import { convertToHex } from "../src/colors/index.js";
+import { cliOptions } from "../src/tokens/create.js";
+function mapPathToOptionName(path) {
+  const normalisedPath = path[0] === "themes" ? ["theme", ...R.drop(2, path)] : path;
+  const option = R.path(normalisedPath, cliOptions);
+  if (typeof option !== "string") {
+    return;
+  }
+  return option;
+}
+const hexPatterns = [
+  // Hex colors: #000, #0000, #000000, #00000000
+  `#[0-9a-fA-F]{3}`,
+  `#[0-9a-fA-F]{4}`,
+  `#[0-9a-fA-F]{6}`,
+  `#[0-9a-fA-F]{8}`
+];
+const colorRegex = new RegExp(`^${hexPatterns.join("|")}$`);
+const colorSchema = z.string({ description: "A hex color, which is used for creating a color scale" }).regex(colorRegex).transform(convertToHex);
+const colorCategorySchema = z.record(colorSchema, { description: "One or more color definitions" });
+const themeSchema = z.object(
+  {
+    colors: z.object(
+      {
+        main: colorCategorySchema,
+        support: colorCategorySchema,
+        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" }
+    ),
+    borderRadius: z.number({ description: "Defines the border-radius for this theme" })
+  },
+  { description: "An object defining a theme. The property name holding the object becomes the theme name." }
+);
+const 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, {
+    description: "An object with one or more themes. Each property defines a theme, and the property name is used as the theme name."
+  })
+});
+const combinedConfigSchema = configFileSchema.required();
+export {
+  colorRegex,
+  combinedConfigSchema,
+  configFileSchema,
+  mapPathToOptionName
+};

package/dist/bin/designsystemet.js

@@ -15,27 +15,30 @@ import { getDefaultOrExplicitOption, getExplicitOptionOnly } from "./options.js"
 program.name("designsystemet").description("CLI for working with Designsystemet").showHelpAfterError();
 function makeTokenCommands() {
   const tokenCmd = createCommand("tokens");
-  const DEFAULT_TOKENS_DIR = "./design-tokens";
-  const DEFAULT_BUILD_DIR = "./design-tokens-build";
+  const DEFAULT_TOKENS_CREATE_DIR = "./design-tokens";
+  const DEFAULT_TOKENS_BUILD_DIR = "./design-tokens-build";
   const DEFAULT_FONT = "Inter";
   const DEFAULT_THEME_NAME = "theme";
   const DEFAULT_CONFIG_FILE = "designsystemet.config.json";
-  tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${chalk.blue("design-tokens")}`, DEFAULT_TOKENS_DIR).option("-o, --out-dir <string>", `Output directory for built ${chalk.blue("design-tokens")}`, DEFAULT_BUILD_DIR).option("--dry [boolean]", `Dry run for built ${chalk.blue("design-tokens")}`, false).option("-p, --preview", "Generate preview token.ts files", false).option("--verbose", "Enable verbose output", false).action((opts) => {
-    const { preview, verbose } = opts;
-    const tokens = typeof opts.tokens === "string" ? opts.tokens : DEFAULT_TOKENS_DIR;
+  tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${chalk.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option(
+    "-o, --out-dir <string>",
+    `Output directory for built ${chalk.blue("design-tokens")}`,
+    DEFAULT_TOKENS_BUILD_DIR
+  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before building tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for built ${chalk.blue("design-tokens")}`, parseBoolean, false).option("-p, --preview", "Generate preview token.ts files", false).option("--verbose", "Enable verbose output", false).action((opts) => {
+    const { preview, verbose, clean, dry } = opts;
+    const tokens = typeof opts.tokens === "string" ? opts.tokens : DEFAULT_TOKENS_CREATE_DIR;
     const outDir = typeof opts.outDir === "string" ? opts.outDir : "./dist/tokens";
-    const dry = Boolean(opts.dry);
     console.log(`Building tokens in ${chalk.green(tokens)}`);
     if (dry) {
       console.log(`Performing dry run, no files will be written`);
     }
-    return buildTokens({ tokens, outDir, preview, verbose, dry });
+    return buildTokens({ tokens, outDir, preview, verbose, dry, clean });
   });
   tokenCmd.command("create").description("Create Designsystemet tokens").option(`-m, --${cliOptions.theme.colors.main} <name:hex...>`, `Main colors`, parseColorValues).option(`-s, --${cliOptions.theme.colors.support} <name:hex...>`, `Support colors`, parseColorValues).option(`-n, --${cliOptions.theme.colors.neutral} <hex>`, `Neutral hex color`, convertToHex).option(
     `-o, --${cliOptions.outDir} <string>`,
     `Output directory for created ${chalk.blue("design-tokens")}`,
-    DEFAULT_TOKENS_DIR
-  ).option("--dry [boolean]", `Dry run for created ${chalk.blue("design-tokens")}`, false).option(`-f, --${cliOptions.theme.typography.fontFamily} <string>`, `Font family`, DEFAULT_FONT).option(
+    DEFAULT_TOKENS_CREATE_DIR
+  ).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before creating tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for created ${chalk.blue("design-tokens")}`, parseBoolean, false).option(`-f, --${cliOptions.theme.typography.fontFamily} <string>`, `Font family`, DEFAULT_FONT).option(
     `-b, --${cliOptions.theme.borderRadius} <number>`,
     `Unitless base border-radius in px`,
     (radiusAsString) => Number(radiusAsString),
@@ -45,8 +48,7 @@ function makeTokenCommands() {
     `Path to JSON config file (default: "${DEFAULT_CONFIG_FILE}")`,
     (value) => parseJsonConfig(value, { allowFileNotFound: false })
   ).action(async (opts, cmd) => {
-    const dry = Boolean(opts.dry);
-    if (dry) {
+    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 }));
@@ -84,6 +86,7 @@ function makeTokenCommands() {
     });
     const unvalidatedConfig = noUndefined({
       outDir: propsFromJson?.outDir ?? getDefaultOrExplicitOption(cmd, "outDir"),
+      clean: propsFromJson?.clean ?? getDefaultOrExplicitOption(cmd, "clean"),
       themes: propsFromJson?.themes ? (
         // For each theme specified in the JSON config, we override the config values
         // with the explicitly set options from the CLI.
@@ -109,7 +112,7 @@ function makeTokenCommands() {
     for (const [name, themeWithoutName] of Object.entries(config.themes)) {
       const theme = { name, ...themeWithoutName };
       const tokens = createTokens(theme);
-      await writeTokens({ outDir: config.outDir, tokens, theme, dry });
+      await writeTokens({ outDir: config.outDir, tokens, theme, dry: opts.dry, clean: config.clean });
     }
   });
   return tokenCmd;
@@ -139,6 +142,7 @@ async function parseJsonConfig(jsonPath, options) {
   let jsonFile;
   try {
     jsonFile = await fs.readFile(resolvedPath, { encoding: "utf-8" });
+    console.log(`Found JSON config file: ${chalk.green(resolvedPath)}`);
   } catch (err) {
     if (err instanceof Error) {
       const nodeErr = err;
@@ -177,3 +181,6 @@ function parseColorValues(value, previous = {}) {
   previous[name] = convertToHex(hex);
   return previous;
 }
+function parseBoolean(value, previous) {
+  return value === "true" || value === true;
+}

package/dist/bin/options.js

@@ -0,0 +1,12 @@
+const getOptionIfMatchingSource = (...sources) => (command, option) => {
+  const source = command.getOptionValueSource(option);
+  if (sources.includes(source)) {
+    return command.getOptionValue(option);
+  }
+};
+const getExplicitOptionOnly = getOptionIfMatchingSource("cli");
+const getDefaultOrExplicitOption = getOptionIfMatchingSource("cli", "default");
+export {
+  getDefaultOrExplicitOption,
+  getExplicitOptionOnly
+};

package/dist/config.schema.json

@@ -8,6 +8,10 @@
       "type": "string",
       "description": "Path to the output directory for the created design tokens"
     },
+    "clean": {
+      "type": "boolean",
+      "description": "Delete the output directory before building or creating tokens"
+    },
     "themes": {
       "type": "object",
       "additionalProperties": {

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

@@ -10,8 +10,10 @@ type Options = {
     verbose: boolean;
     /** Set the default "accent" color, if not overridden with data-color */
     accentColor?: string;
-    /** Dry run */
+    /** Dry run, no files will be written */
     dry?: boolean;
+    /** Clean the output path before building tokens */
+    clean?: boolean;
 };
 export declare let buildOptions: Options | undefined;
 export declare function buildTokens(options: Options): Promise<void>;

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,cAAc;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,IAAI,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC;AAwC7C,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAiFjE"}
+{"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"}

package/dist/src/tokens/build.js

@@ -7,7 +7,7 @@ import { configs, getConfigsForThemeDimensions } from "./build/configs.js";
 import { colorCategories } from "./build/types.js";
 import { makeEntryFile } from "./build/utils/entryfile.js";
 import { processThemeObject } from "./build/utils/getMultidimensionalThemes.js";
-import { copyFile, writeFile } from "./utils.js";
+import { cleanDir, copyFile, writeFile } from "./utils.js";
 const DEFAULT_COLOR = "accent";
 let buildOptions;
 const sd = new StyleDictionary();
@@ -42,7 +42,7 @@ const buildConfigs = {
   }
 };
 async function buildTokens(options) {
-  const { dry } = options;
+  const { dry, clean } = options;
   const tokensDir = options.tokens;
   const targetDir = path.resolve(options.outDir);
   buildOptions = options;
@@ -66,6 +66,9 @@ async function buildTokens(options) {
     }),
     buildConfigs
   );
+  if (clean) {
+    await cleanDir(targetDir, dry);
+  }
   try {
     for (const [key, { buildConfig, sdConfigs }] of R.toPairs(buildAndSdConfigs)) {
       if (!(buildConfig.enabled?.() ?? true)) {

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

@@ -1,6 +1,7 @@
 import type { Theme, Tokens } from './types.js';
 export declare const cliOptions: {
     readonly outDir: "out-dir";
+    readonly clean: "clean";
     readonly theme: {
         readonly colors: {
             readonly main: "main-colors";

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

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/tokens/create.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,KAAK,EAAE,MAAM,EAAqC,MAAM,YAAY,CAAC;AAE3F,eAAO,MAAM,UAAU;;;;;;;;;;;;;CAab,CAAC;AAgFX,eAAO,MAAM,YAAY,SAAU,KAAK,WAqBvC,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/tokens/create.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,KAAK,EAAE,MAAM,EAAqC,MAAM,YAAY,CAAC;AAE3F,eAAO,MAAM,UAAU;;;;;;;;;;;;;;CAcb,CAAC;AAgFX,eAAO,MAAM,YAAY,SAAU,KAAK,WAqBvC,CAAC"}

package/dist/src/tokens/create.js

@@ -2,6 +2,7 @@ import * as R from "ramda";
 import { baseColors, generateColorScale } from "../colors/index.js";
 const cliOptions = {
   outDir: "out-dir",
+  clean: "clean",
   theme: {
     colors: {
       main: "main-colors",

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

@@ -30,4 +30,5 @@ export declare const writeFile: (path: string, data: string, dry?: boolean) => P
 export declare const cp: (src: string, dest: string, dry?: boolean) => Promise<void>;
 export declare const copyFile: (src: string, dest: string, dry?: boolean) => Promise<void>;
 export declare const isDigit: (s: string) => boolean;
+export declare const cleanDir: (dir: string, dry?: boolean) => Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tokens/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM5E;;;;GAIG;AACH,eAAO,MAAM,OAAO,UAAW,gBAAgB,WAAkD,CAAC;AAElG;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,gBAAgB,GAAG,WAAW,KAAG,CAAuC,CAAC;AAE5G;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,4DAAmB,MAAM,EAAE,GAAG,MAAM,SAAS,gBAAgB,aAMlF,CAAC;AAEH,eAAO,MAAM,mBAAmB,4DAAmB,MAAM,EAAE,SAAS,gBAAgB,aASlF,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAEhE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKpG;AAED,eAAO,MAAM,KAAK,QAAe,MAAM,QAAQ,OAAO,2BAOrD,CAAC;AAEF,eAAO,MAAM,SAAS,SAAgB,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOxE,CAAC;AAEF,eAAO,MAAM,EAAE,QAAe,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOhE,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAe,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOtE,CAAC;AAEF,eAAO,MAAM,OAAO,MAAO,MAAM,YAAoB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tokens/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM5E;;;;GAIG;AACH,eAAO,MAAM,OAAO,UAAW,gBAAgB,WAAkD,CAAC;AAElG;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,gBAAgB,GAAG,WAAW,KAAG,CAAuC,CAAC;AAE5G;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,4DAAmB,MAAM,EAAE,GAAG,MAAM,SAAS,gBAAgB,aAMlF,CAAC;AAEH,eAAO,MAAM,mBAAmB,4DAAmB,MAAM,EAAE,SAAS,gBAAgB,aASlF,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAEhE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKpG;AAED,eAAO,MAAM,KAAK,QAAe,MAAM,QAAQ,OAAO,2BAOrD,CAAC;AAEF,eAAO,MAAM,SAAS,SAAgB,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOxE,CAAC;AAEF,eAAO,MAAM,EAAE,QAAe,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOhE,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAe,MAAM,QAAQ,MAAM,QAAQ,OAAO,kBAOtE,CAAC;AAEF,eAAO,MAAM,OAAO,MAAO,MAAM,YAAoB,CAAC;AAEtD,eAAO,MAAM,QAAQ,QAAe,MAAM,QAAQ,OAAO,kBASxD,CAAC"}

package/dist/src/tokens/utils.js

@@ -60,7 +60,16 @@ const copyFile = async (src, dest, dry) => {
   return await fs.copyFile(src, dest);
 };
 const isDigit = (s) => /^\d+$/.test(s);
+const cleanDir = async (dir, dry) => {
+  if (dry) {
+    console.log(`${chalk.blue("cleanDir")} ${dir}`);
+    return Promise.resolve();
+  }
+  console.log(`${chalk.red("Cleaning outputDir: ")} ${dir}`);
+  return await fs.rm(dir, { recursive: true, force: true });
+};
 export {
+  cleanDir,
   copyFile,
   cp,
   getType,

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

@@ -4,7 +4,10 @@ type WriteTokensOptions = {
     outDir: string;
     tokens: Tokens;
     theme: Theme;
+    /** Dry run, no files will be written */
     dry?: boolean;
+    /** Clean output directory before writing tokens */
+    clean?: boolean;
 };
 export declare const writeTokens: (options: WriteTokensOptions) => Promise<void>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/tokens/write.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,EAA8B,MAAM,YAAY,CAAC;AAS9F,eAAO,MAAM,SAAS,SAAU,OAAO,WAAkC,CAAC;AAyB1E,KAAK,kBAAkB,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,WAAW,YAAmB,kBAAkB,kBA4K5D,CAAC"}
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/tokens/write.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,EAA8B,MAAM,YAAY,CAAC;AAS9F,eAAO,MAAM,SAAS,SAAU,OAAO,WAAkC,CAAC;AAyB1E,KAAK,kBAAkB,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,WAAW,YAAmB,kBAAkB,kBAiL5D,CAAC"}

package/dist/src/tokens/write.js

@@ -7,7 +7,7 @@ import customColorTemplate from "./design-tokens/template/semantic/modes/categor
 import semanticColorTemplate from "./design-tokens/template/semantic/semantic-color-template.json" with { type: "json" };
 import themeBaseFile from "./design-tokens/template/themes/theme-base-file.json" with { type: "json" };
 import themeColorTemplate from "./design-tokens/template/themes/theme-color-template.json" with { type: "json" };
-import { cp, mkdir, writeFile } from "./utils.js";
+import { cleanDir, cp, mkdir, writeFile } from "./utils.js";
 import { generateMetadataJson } from "./write/generate$metadata.js";
 import { generateThemesJson } from "./write/generate$themes.js";
 const DIRNAME = import.meta.dirname || __dirname;
@@ -35,12 +35,16 @@ const writeTokens = async (options) => {
     outDir,
     tokens,
     theme: { name: themeName, colors, borderRadius },
-    dry
+    dry,
+    clean
   } = options;
   const targetDir = path.resolve(process.cwd(), String(outDir));
   const $themesPath = path.join(targetDir, "$themes.json");
   const $metadataPath = path.join(targetDir, "$metadata.json");
   let themes = [themeName];
+  if (clean) {
+    await cleanDir(targetDir, dry);
+  }
   await mkdir(targetDir, dry);
   try {
     const $themes = await fs.readFile($themesPath, "utf-8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digdir/designsystemet",
-  "version": "1.0.0-next.46",
+  "version": "1.0.0-next.47",
   "description": "CLI for Designsystemet",
   "author": "Designsystemet team",
   "engines": {
@@ -34,26 +34,23 @@
   },
   "scripts": {
     "designsystemet": "tsx ./bin/designsystemet.ts",
-    "build:tokens": "yarn clean:theme && yarn designsystemet tokens build -p -t ../../design-tokens -o ../../packages/theme/brand",
-    "build:tokens:debug": "yarn clean:theme && tsx --inspect-brk ./bin/designsystemet.ts tokens build -p -t ../../design-tokens -o ../../packages/theme/brand",
+    "build:tokens": "yarn 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": "tsup && yarn build:types && yarn build:json-schema",
     "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",
+    "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-build": "yarn designsystemet tokens build -t ./test-tokens-create -o ./test-tokens-build",
-    "test:tokens-create-and-build-options": "yarn clean:test-tokens && yarn test:tokens-create-options && yarn test:tokens-build",
-    "test:tokens-create-and-build-json": "yarn clean:test-tokens && yarn test:tokens-create-json && yarn test:tokens-build",
+    "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",
-    "clean": "rimraf dist",
-    "clean:test-tokens": "rimraf test-tokens-create && rimraf test-tokens-build",
-    "clean:theme": "yarn workspace @digdir/designsystemet-theme clean",
     "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",
-    "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-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-all": "yarn internal:tokens-create-digdir && yarn internal:tokens-create-altinn && yarn internal:tokens-create-uutilsynet && yarn internal:tokens-create-portal"
   },
   "dependencies": {
@@ -71,7 +68,6 @@
     "postcss": "^8.4.41",
     "prompts": "^2.4.2",
     "ramda": "^0.30.1",
-    "rimraf": "^6.0.1",
     "style-dictionary": "^4.0.1",
     "zod": "^3.23.8",
     "zod-validation-error": "^3.4.0"