@digdir/designsystemet 1.16.0 → 1.17.0

package/README.md

@@ -14,7 +14,7 @@ Read the Designsystemet [README](https://github.com/digdir/designsystemet) to ge
 Use `npx @digdir/designsystemet tokens create <options>` to create design tokens for use with Designsystemet.
 
 This allows you to define themes including custom colors, font-family, and border-radius.
-We recommend using the [Designsystemet theme builder](https://theme.designsystemet.no/) for generating a valid command with correct options.
+We recommend using the [Designsystemet theme builder](https://theme.designsystemet.no/) for generating a valid config.
 
 #### Update tokens
 
@@ -67,18 +67,6 @@ To get started, use this template for a `designsystemet.config.json` file:
 In editors which support JSON Schema, the `$schema` will then  give you editor hints for the structure of the file.
 
 #### Minimal config example
-As a minimal example, the following CLI snippet from the theme builder
-
-```
-npx @digdir/designsystemet tokens create \
---main-colors "primary:#0062BA" "accent:#1E98F5" \
---neutral-color "#1E2B3C" \
---support-colors "extra1:#F45F63" "extra2:#E5AA20" \
---border-radius 4 \
---theme "theme"
-```
-
-...is equivalent to this `designsystemet.config.json` file
 ```jsonc
 {
   "$schema": "./node_modules/@digdir/designsystemet/dist/config.schema.json",
@@ -86,9 +74,8 @@ npx @digdir/designsystemet tokens create \
   "themes": {
     "theme": {
       "colors": {
-        "main": { "primary": "#0062BA", "accent": "#1E98F5" },
+        "accent": "#1E98F5",
         "neutral": "#1E2B3C",
-        "support": { "extra1": "#F45F63", "extra2": "#E5AA20" }
       },
       "borderRadius": 4
     }

package/dist/bin/config.d.ts

@@ -1,12 +1,10 @@
 import type { Command, OptionValues } from '@commander-js/extra-typings';
-import { type BuildConfigSchema, type CreateConfigSchema } from '../src/config.js';
+import { type CreateConfigSchema } from '../src/schemas/v1.1/schema.js';
+export { deprecatedCLIOptions } from '../src/schemas/helpers.js';
 export declare function readConfigFile(configFilePath: string, allowFileNotFound?: boolean): Promise<string>;
 export declare function parseCreateConfig(configFile: string, options: {
     theme: string;
     cmd: Command<unknown[], OptionValues>;
     configFilePath: string;
 }): Promise<CreateConfigSchema>;
-export declare function parseBuildConfig(configFile: string, { configFilePath }: {
-    configFilePath: string;
-}): Promise<BuildConfigSchema>;
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGzE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAKxB,MAAM,kBAAkB,CAAC;AAI1B,wBAAsB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBtG;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAiE7B;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,EAAE,cAAc,EAAE,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAAC,iBAAiB,CAAC,CAI5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIzE,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,+BAA+B,CAAC;AAIhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,wBAAsB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBtG;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CA+D7B"}

package/dist/bin/config.js

@@ -1,4 +1,5 @@
-import { commonConfig, configFileCreateSchema, parseConfig, validateConfig } from "../src/config.js";
+import { deprecatedCLIOptions, parseConfig, validateConfig } from "../src/schemas/helpers.js";
+import { configFileCreateSchema } from "../src/schemas/v1.1/schema.js";
 import { dsfs } from "../src/utils/filesystem.js";
 import { getCliOption, getDefaultCliOption, getSuppliedCliOption } from "./options.js";
 import pc from "picocolors";
@@ -19,7 +20,7 @@ async function readConfigFile(configFilePath, allowFileNotFound = true) {
 async function parseCreateConfig(configFile, options) {
 	const { cmd, theme = "theme", configFilePath } = options;
 	const configParsed = parseConfig(configFile, configFilePath);
-	const themeColors = Object.values(configParsed?.themes ?? {}).map((x) => new Set([...R.keys(x.colors.main), ...R.keys(x.colors.support)]));
+	const themeColors = Object.values(configParsed?.themes ?? {}).map((x) => new Set(R.keys(x.colors)));
 	if (!R.all(R.equals(R.__, themeColors[0]), themeColors)) {
 		console.error(pc.redBright(`In config, all themes must have the same custom color names, but we found:`));
 		const themeNames = R.keys(configParsed.themes ?? {});
@@ -33,8 +34,8 @@ async function parseCreateConfig(configFile, options) {
 	const noUndefined = R.reject(R.isNil);
 	const getThemeOptions = (optionGetter) => noUndefined({
 		colors: noUndefined({
-			main: optionGetter(cmd, "mainColors"),
-			support: optionGetter(cmd, "supportColors"),
+			...optionGetter(cmd, "mainColors"),
+			...optionGetter(cmd, "supportColors"),
 			neutral: optionGetter(cmd, "neutralColor")
 		}),
 		typography: noUndefined({ fontFamily: optionGetter(cmd, "fontFamily") }),
@@ -51,8 +52,5 @@ async function parseCreateConfig(configFile, options) {
 		}, configParsed.themes) : { [theme]: getThemeOptions(getCliOption) }
 	}), configFilePath);
 }
-async function parseBuildConfig(configFile, { configFilePath }) {
-	return validateConfig(commonConfig, parseConfig(configFile, configFilePath), configFilePath);
-}
 //#endregion
-export { parseBuildConfig, parseCreateConfig, readConfigFile };
+export { deprecatedCLIOptions, parseCreateConfig, readConfigFile };

package/dist/bin/designsystemet.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-export declare const figletAscii = "\n _____            _                           _                      _\n|  __ \\          (_)                         | |                    | |\n| |  | | ___  ___ _  __ _ _ __  ___ _   _ ___| |_ ___ _ __ ___   ___| |_\n| |  | |/ _ \\/ __| |/ _` | '_ \\/ __| | | / __| __/ _ \\ '_ ` _ \\ / _ \\ __|\n| |__| |  __/\\__ \\ | (_| | | | \\__ \\ |_| \\__ \\ ||  __/ | | | | |  __/ |_\n|_____/ \\___||___/_|\\__, |_| |_|___/\\__, |___/\\__\\___|_| |_| |_|\\___|\\__|\n                     __/ |           __/ |\n                    |___/           |___/\n";
+export {};
 //# sourceMappingURL=designsystemet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"designsystemet.d.ts","sourceRoot":"","sources":["../../bin/designsystemet.ts"],"names":[],"mappings":";AAiBA,eAAO,MAAM,WAAW,4iBASvB,CAAC"}
+{"version":3,"file":"designsystemet.d.ts","sourceRoot":"","sources":["../../bin/designsystemet.ts"],"names":[],"mappings":""}

package/dist/bin/designsystemet.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env node
+import { deprecatedCLIOptions } from "../src/schemas/helpers.js";
 import { convertToHex } from "../src/colors/utils.js";
 import "../src/colors/index.js";
-import { cliOptions, createTokens, tokenSetDimensions } from "../src/tokens/create.js";
 import { dsfs } from "../src/utils/filesystem.js";
 import { parseCreateConfig, readConfigFile } from "./config.js";
 import migrations_default from "../src/migrations/index.js";
-import { colorNamesByCategory } from "../src/tokens/utils.js";
+import { checkAutomigrate } from "../src/automigrate.js";
+import { toColorNames } from "../src/tokens/utils.js";
 import { buildTokens } from "../src/tokens/build.js";
 import { createSystemTokenFiles, tokenSetsToFiles } from "../src/tokens/create/files.js";
+import { createTokens, tokenSetDimensions } from "../src/tokens/create.js";
 import { generateConfigFromTokens } from "../src/tokens/generate-config.js";
 import pc from "picocolors";
 import * as R from "ramda";
@@ -30,9 +32,9 @@ const DEFAULT_TOKENS_BUILD_DIR = "./design-tokens-build";
 const DEFAULT_FONT = "Inter";
 const DEFAULT_THEME_NAME = "theme";
 const DEFAULT_CONFIG_FILEPATH = "designsystemet.config.json";
-function makeTokenCommands() {
+function _makeTokenCommands() {
 	const tokenCmd = createCommand("tokens");
-	tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${pc.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option("-o, --out-dir <string>", `Output directory for built ${pc.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 ${pc.blue("design-tokens")}`, parseBoolean, false).option("--verbose", "Enable verbose output", false).option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option("--experimental-tailwind", "Generate Tailwind CSS classes for tokens", false).action(async (opts) => {
+	tokenCmd.command("build").description("Build Designsystemet tokens").option("-t, --tokens <string>", `Path to ${pc.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option("-o, --out-dir <string>", `Output directory for built ${pc.blue("design-tokens")}`, DEFAULT_TOKENS_BUILD_DIR).option(`--${deprecatedCLIOptions.clean} [boolean]`, "Clean output directory before building tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for built ${pc.blue("design-tokens")}`, parseBoolean, false).option("--verbose", "Enable verbose output", false).option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option("--experimental-tailwind", "Generate Tailwind CSS classes for tokens", false).action(async (opts) => {
 		console.log(figletAscii);
 		const { verbose, clean, dry, experimentalTailwind, tokens } = opts;
 		dsfs.init({
@@ -52,14 +54,14 @@ function makeTokenCommands() {
 		console.log(`\n✅ Finished building tokens in ${pc.green(outDir)}`);
 		return Promise.resolve();
 	});
-	tokenCmd.command("create").description("Create Designsystemet tokens").option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option(`--${cliOptions.clean} [boolean]`, "Clean output directory before creating tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for created ${pc.blue("design-tokens")}`, parseBoolean, false).option(`-m, --${cliOptions.theme.colors.main} <name:hex...>`, `Main colors (deprecated, use JSON config file instead)`, parseColorValues).option(`-s, --${cliOptions.theme.colors.support} <name:hex...>`, `Support colors (deprecated, use JSON config file instead)`, parseColorValues).option(`-n, --${cliOptions.theme.colors.neutral} <hex>`, `Neutral hex color (deprecated, use JSON config file instead)`, convertToHex).option(`-o, --${cliOptions.outDir} <string>`, `Output directory for created ${pc.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option(`-f, --${cliOptions.theme.typography.fontFamily} <string>`, `Font family (experimental, deprecated, use JSON config file instead)`, DEFAULT_FONT).option(`-b, --${cliOptions.theme.borderRadius} <number>`, `Unitless base border-radius in px (deprecated, use JSON config file instead)`, (radiusAsString) => Number(radiusAsString), 4).option("--theme <string>", "Theme name (deprecated, use JSON config file instead)", DEFAULT_THEME_NAME).action(async (opts, cmd) => {
+	tokenCmd.command("create").description("Create Designsystemet tokens").option("--config <string>", `Path to config file (default: "${DEFAULT_CONFIG_FILEPATH}")`).option(`--${deprecatedCLIOptions.clean} [boolean]`, "Clean output directory before creating tokens", parseBoolean, false).option("--dry [boolean]", `Dry run for created ${pc.blue("design-tokens")}`, parseBoolean, false).option("--skip-check", "Skip migration check", false).option("-y, --yes", "Skip user prompts", false).option(`-m, --${deprecatedCLIOptions.theme.colors.main} <name:hex...>`, `Main colors (deprecated, use JSON config file instead)`, parseColorValues).option(`-s, --${deprecatedCLIOptions.theme.colors.support} <name:hex...>`, `Support colors (deprecated, use JSON config file instead)`, parseColorValues).option(`-n, --${deprecatedCLIOptions.theme.colors.neutral} <hex>`, `Neutral hex color (deprecated, use JSON config file instead)`, convertToHex).option(`-o, --${deprecatedCLIOptions.outDir} <string>`, `Output directory for created ${pc.blue("design-tokens")}`, DEFAULT_TOKENS_CREATE_DIR).option(`-f, --${deprecatedCLIOptions.theme.typography.fontFamily} <string>`, `Font family (experimental, deprecated, use JSON config file instead)`, DEFAULT_FONT).option(`-b, --${deprecatedCLIOptions.theme.borderRadius} <number>`, `Unitless base border-radius in px (deprecated, use JSON config file instead)`, (radiusAsString) => Number(radiusAsString), 4).option("--theme <string>", "Theme name (deprecated, use JSON config file instead)", DEFAULT_THEME_NAME).action(async (opts, cmd) => {
 		if (opts.mainColors || opts.supportColors || opts.neutralColor || opts.borderRadius && opts.borderRadius !== 4 || opts.theme && opts.theme !== DEFAULT_THEME_NAME || opts.fontFamily && opts.fontFamily !== DEFAULT_FONT) console.warn(pc.yellow(`\n ⚠️  Using CLI options for ${pc.bold(`colors, border radius, theme, or font family is deprecated`)} and will be removed in a future release.
            \n ⚠️  Please use a JSON config file instead.`));
 		console.log(figletAscii);
 		if (opts.dry) console.log(`Performing dry run, no files will be written`);
 		const themeName = opts.theme;
 		const { configFile, configFilePath } = await getConfigFile(opts.config);
-		const config = await parseCreateConfig(configFile, {
+		const config = await parseCreateConfig((opts.skipCheck ? configFile : await checkAutomigrate(configFile, configFilePath, opts.yes)) || configFile, {
 			theme: themeName,
 			cmd,
 			configFilePath
@@ -72,6 +74,7 @@ function makeTokenCommands() {
 		});
 		const outDir = dsfs.outDir;
 		const files = [];
+		const colorNames = toColorNames(config.themes?.[themeNames[0]]?.colors);
 		for (const [name, themeConfig] of Object.entries(config.themes)) {
 			const { tokenSets } = await createTokens({
 				name,
@@ -79,14 +82,10 @@ function makeTokenCommands() {
 			});
 			files.push(...tokenSetsToFiles(tokenSets));
 		}
-		const colors = config.themes?.[themeNames[0]]?.colors ?? {
-			main: {},
-			support: {}
-		};
 		files.push(...await createSystemTokenFiles({
 			tokenSetDimensions,
 			themeNames,
-			colors: colorNamesByCategory(colors)
+			colorNames
 		}));
 		if (config.clean) await dsfs.cleanDir(outDir);
 		await dsfs.mkdir(outDir);
@@ -96,7 +95,7 @@ function makeTokenCommands() {
 	});
 	return tokenCmd;
 }
-program.addCommand(makeTokenCommands());
+program.addCommand(_makeTokenCommands());
 program.command("generate-config-from-tokens").description("Generate a config file from existing design tokens. Will not include overrides.").option("-d, --dir <string>", "Path to design tokens directory", DEFAULT_TOKENS_CREATE_DIR).option("-o, --out <string>", "Output path for config file", DEFAULT_CONFIG_FILEPATH).option("--dry [boolean]", "Dry run - show config without writing file", parseBoolean, false).action(async (opts) => {
 	console.log(figletAscii);
 	const { dry } = opts;
@@ -160,4 +159,4 @@ async function getConfigFile(userConfigFilePath) {
 	};
 }
 //#endregion
-export { figletAscii };
+export {};

package/dist/config.schema.json

@@ -19,40 +19,12 @@
         "properties": {
           "colors": {
             "type": "object",
-            "properties": {
-              "main": {
-                "type": "object",
-                "propertyNames": {
-                  "type": "string",
-                  "pattern": "^(?!(?:neutral|success|warning|danger|info)$)"
-                },
-                "additionalProperties": {
-                  "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info"
-                },
-                "description": "An object with one or more color definitions. The property name is used as the color name."
-              },
-              "support": {
-                "default": {},
-                "type": "object",
-                "propertyNames": {
-                  "type": "string",
-                  "pattern": "^(?!(?:neutral|success|warning|danger|info)$)"
-                },
-                "additionalProperties": {
-                  "description": "A hex color, which is used for creating a color scale. Invalid color names: neutral, success, warning, danger, info"
-                },
-                "description": "An object with one or more color definitions. The property name is used as the color name."
-              },
-              "neutral": {
-                "description": "A hex color, which is used for creating a color scale."
-              }
+            "propertyNames": {
+              "type": "string"
+            },
+            "additionalProperties": {
+              "description": "A hex color, which is used for creating a color scale."
             },
-            "required": [
-              "main",
-              "support",
-              "neutral"
-            ],
-            "additionalProperties": false,
             "description": "Defines the colors for this theme"
           },
           "typography": {

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
 var name = "@digdir/designsystemet";
-var version = "1.16.0";
+var version = "1.17.0";
 //#endregion
 export { name, version };

package/dist/src/automigrate.d.ts

@@ -0,0 +1,2 @@
+export declare const checkAutomigrate: (configFile: string, configFilePath: string, yes: boolean) => Promise<string | null>;
+//# sourceMappingURL=automigrate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"automigrate.d.ts","sourceRoot":"","sources":["../../src/automigrate.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,GAAU,YAAY,MAAM,EAAE,gBAAgB,MAAM,EAAE,KAAK,OAAO,2BAwC9F,CAAC"}

package/dist/src/automigrate.js

@@ -0,0 +1,33 @@
+import { dsfs } from "./utils/filesystem.js";
+import { automigrations } from "./migrations/index.js";
+import pc from "picocolors";
+import confirm from "@inquirer/confirm";
+//#region src/automigrate.ts
+const checkAutomigrate = async (configFile, configFilePath, yes) => {
+	if (!configFile) return null;
+	let migratedConfigFile = null;
+	const eligibleMigrations = Object.values(automigrations).filter((migration) => {
+		try {
+			return migration.check(configFile);
+		} catch {
+			return false;
+		}
+	});
+	if (eligibleMigrations.length === 0) return null;
+	for (const migration of eligibleMigrations) {
+		console.log(pc.red(`\n ✋ Automigration detected \n`));
+		console.log(pc.yellow(`Config file ${pc.blue(configFilePath)} is eligible for migration: ${pc.blue(migration.name)}\n`));
+		console.log(`${migration.message}`);
+		let answer = true;
+		if (!yes) answer = await confirm({ message: `Do you want to migrate?` });
+		else console.log(pc.green(`Auto-confirming migration with --yes flag`));
+		if (!answer) migratedConfigFile = migration.no(migratedConfigFile ?? configFile);
+		else {
+			migratedConfigFile = migration.yes(migratedConfigFile ?? configFile);
+			await dsfs.writeFile(configFilePath, migratedConfigFile);
+		}
+	}
+	return migratedConfigFile;
+};
+//#endregion
+export { checkAutomigrate };

package/dist/src/colors/types.d.ts

@@ -23,7 +23,7 @@ export declare const semanticColorMap: {
     readonly 'base-contrast-default': 16;
 };
 export declare const semanticColorNames: ("background-default" | "background-tinted" | "surface-default" | "surface-tinted" | "surface-hover" | "surface-active" | "border-subtle" | "border-default" | "border-strong" | "text-subtle" | "text-default" | "base-default" | "base-hover" | "base-active" | "base-contrast-subtle" | "base-contrast-default")[];
-export declare const semanticColorNumbers: (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16)[];
+export declare const semanticColorNumbers: (2 | 1 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16)[];
 type SemanticColorMap = typeof semanticColorMap;
 type SemanticColorMapping = {
     [K in keyof SemanticColorMap]: {

package/dist/src/index.d.ts

@@ -1,4 +1,4 @@
 export * from './colors/index.js';
-export { type CreateConfigSchema as ConfigSchema, configFileCreateSchema as configSchema, } from './config.js';
+export { type CreateConfigSchema as ConfigSchema, configFileCreateSchema as configSchema, } from './schemas/v1.1/schema.js';
 export * from './tokens/index.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,KAAK,kBAAkB,IAAI,YAAY,EACvC,sBAAsB,IAAI,YAAY,GACvC,MAAM,aAAa,CAAC;AACrB,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,KAAK,kBAAkB,IAAI,YAAY,EACvC,sBAAsB,IAAI,YAAY,GACvC,MAAM,0BAA0B,CAAC;AAClC,cAAc,mBAAmB,CAAC"}

package/dist/src/index.js

@@ -1,10 +1,11 @@
+import { deprecatedCLIOptions } from "./schemas/helpers.js";
 import { baseColorNames, baseColors, colorMetadata, colorNames, dsLinkColor, getColorMetadataByNumber } from "./colors/colorMetadata.js";
 import { HSLToHex, areColorsContrasting, canTextBeUsedOnColors, convertColor, convertToHex, getContrastFromHex, getContrastFromLightness, getLightnessFromHex, getLuminanceFromColor, getLuminanceFromLightness, hexToCssHsl, hexToHSL, hexToHsluv, hexToRgb, hslArrToCss, isHexColor, rgbToHex } from "./colors/utils.js";
 import { RESERVED_COLORS, generateColorContrast, generateColorScale, generateColorSchemes, getCssVariable } from "./colors/theme.js";
 import { semanticColorMap, semanticColorNames, semanticColorNumbers } from "./colors/types.js";
 import "./colors/index.js";
-import { cliOptions, createTokens } from "./tokens/create.js";
-import { configFileCreateSchema } from "./config.js";
+import { configFileCreateSchema } from "./schemas/v1.1/schema.js";
+import { createTokens } from "./tokens/create.js";
 import { formatThemeCSS, formatTokens } from "./tokens/format.js";
 import "./tokens/index.js";
-export { HSLToHex, RESERVED_COLORS, areColorsContrasting, baseColorNames, baseColors, canTextBeUsedOnColors, cliOptions, colorMetadata, colorNames, configFileCreateSchema as configSchema, convertColor, convertToHex, createTokens, dsLinkColor, formatThemeCSS, formatTokens, generateColorContrast, generateColorScale, generateColorSchemes, getColorMetadataByNumber, getContrastFromHex, getContrastFromLightness, getCssVariable, getLightnessFromHex, getLuminanceFromColor, getLuminanceFromLightness, hexToCssHsl, hexToHSL, hexToHsluv, hexToRgb, hslArrToCss, isHexColor, rgbToHex, semanticColorMap, semanticColorNames, semanticColorNumbers };
+export { HSLToHex, RESERVED_COLORS, areColorsContrasting, baseColorNames, baseColors, canTextBeUsedOnColors, deprecatedCLIOptions as cliOptions, colorMetadata, colorNames, configFileCreateSchema as configSchema, convertColor, convertToHex, createTokens, dsLinkColor, formatThemeCSS, formatTokens, generateColorContrast, generateColorScale, generateColorSchemes, getColorMetadataByNumber, getContrastFromHex, getContrastFromLightness, getCssVariable, getLightnessFromHex, getLuminanceFromColor, getLuminanceFromLightness, hexToCssHsl, hexToHSL, hexToHsluv, hexToRgb, hslArrToCss, isHexColor, rgbToHex, semanticColorMap, semanticColorNames, semanticColorNumbers };

package/dist/src/migrations/flatten-color-categories.d.ts

@@ -0,0 +1,10 @@
+type Automigrate = {
+    name: string;
+    check: (config: any) => boolean;
+    message: string;
+    yes: (config: string) => string;
+    no: (config: string) => string;
+};
+declare const migration: Automigrate;
+export default migration;
+//# sourceMappingURL=flatten-color-categories.d.ts.map

package/dist/src/migrations/flatten-color-categories.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flatten-color-categories.d.ts","sourceRoot":"","sources":["../../../src/migrations/flatten-color-categories.ts"],"names":[],"mappings":"AAGA,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;IAChC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;CAChC,CAAC;AAyDF,QAAA,MAAM,SAAS,EAAE,WAgBhB,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/migrations/flatten-color-categories.js

@@ -0,0 +1,51 @@
+import pc from "picocolors";
+//#region src/migrations/flatten-color-categories.ts
+const isOldColorSchema = (theme) => {
+	return theme.colors && Object.keys(theme.colors).length === 3 && theme.colors.main && theme.colors.support && theme.colors.neutral;
+};
+const isConfigWithOldColorSchema = (config) => {
+	const currentConfig = JSON.parse(config);
+	if (!currentConfig.themes) return false;
+	return Object.values(currentConfig.themes).some(isOldColorSchema);
+};
+const yes = (config) => {
+	const currentConfig = JSON.parse(config);
+	const updatedThemes = {};
+	if (currentConfig.themes) for (const [themeName, _] of Object.entries(currentConfig.themes)) {
+		const theme = currentConfig.themes[themeName];
+		if (isOldColorSchema(theme)) {
+			const { main, support, neutral, ...restColors } = theme.colors;
+			updatedThemes[themeName] = {
+				...theme,
+				colors: {
+					...restColors,
+					...main,
+					...support,
+					neutral
+				}
+			};
+		} else updatedThemes[themeName] = theme;
+	}
+	const migratedConfig = {
+		...currentConfig,
+		themes: updatedThemes
+	};
+	return JSON.stringify(migratedConfig, null, 2).concat("\n");
+};
+const migration = {
+	name: "Flatten color categories",
+	check: isConfigWithOldColorSchema,
+	message: `Your config file uses the old color schema with ${pc.yellow("main")} and ${pc.yellow("support")} categories.\nThis required migration will move all colors under a single ${pc.yellow("colors")} per theme.\n`,
+	yes: (config) => {
+		const migratedConfig = yes(config);
+		console.log(pc.green(`\nConfig file successfully migrated.`));
+		return migratedConfig;
+	},
+	no: (config) => {
+		const migratedConfig = yes(config);
+		console.log(pc.yellow("\nUsing existing config file but migration was skipped.\n"));
+		return migratedConfig;
+	}
+};
+//#endregion
+export { migration as default };

package/dist/src/migrations/index.d.ts

@@ -1,3 +1,12 @@
+export declare const automigrations: {
+    colorCategoryFlattening: {
+        name: string;
+        check: (config: any) => boolean;
+        message: string;
+        yes: (config: string) => string;
+        no: (config: string) => string;
+    };
+};
 declare const _default: {
     'css-beta-to-v1': (glob?: string) => Promise<void>;
     'css-renames-next48-to-next49': (glob?: string) => Promise<void>;

package/dist/src/migrations/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/index.ts"],"names":[],"mappings":";;;;AAGA,wBAGE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc;;;;;;;;CAE1B,CAAC;;;;;AAEF,wBAGE"}

package/dist/src/migrations/index.js

@@ -1,9 +1,11 @@
 import beta_to_v1_default from "./beta-to-v1.js";
 import color_rename_next49_default from "./color-rename-next49.js";
+import migration from "./flatten-color-categories.js";
 //#region src/migrations/index.ts
+const automigrations = { colorCategoryFlattening: migration };
 var migrations_default = {
 	"css-beta-to-v1": beta_to_v1_default,
 	"css-renames-next48-to-next49": color_rename_next49_default
 };
 //#endregion
-export { migrations_default as default };
+export { automigrations, migrations_default as default };

package/dist/src/schemas/helpers.d.ts

@@ -0,0 +1,29 @@
+import type { z } from 'zod';
+export declare const deprecatedCLIOptions: {
+    readonly outDir: "out-dir";
+    readonly clean: "clean";
+    readonly tailwind: "tailwind";
+    readonly theme: {
+        readonly colors: {
+            readonly main: "main-colors";
+            readonly support: "support-colors";
+            readonly neutral: "neutral-color";
+        };
+        readonly typography: {
+            readonly fontFamily: "font-family";
+        };
+        readonly borderRadius: "border-radius";
+    };
+};
+/**
+ * Validates a configuration object against a provided Zod schema.
+ *
+ * @template T - The expected type of the validated configuration.
+ * @param schema - A Zod schema used to validate the configuration object.
+ * @param unvalidatedConfig - The configuration object to validate.
+ * @returns The validated configuration object, typed as T.
+ * @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>, configFilePath: string): T;
+export declare function parseConfig<T>(configFile: string, configFilePath: string): T;
+//# sourceMappingURL=helpers.d.ts.map

package/dist/src/schemas/helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/schemas/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAG7B,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;CAevB,CAAC;AAkCX;;;;;;;;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,cAAc,EAAE,MAAM,GACrB,CAAC,CAUH;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC,CAe5E"}

package/dist/src/schemas/helpers.js

@@ -0,0 +1,71 @@
+import pc from "picocolors";
+import * as R from "ramda";
+import { fromError } from "zod-validation-error";
+//#region src/schemas/helpers.ts
+const deprecatedCLIOptions = {
+	outDir: "out-dir",
+	clean: "clean",
+	tailwind: "tailwind",
+	theme: {
+		colors: {
+			main: "main-colors",
+			support: "support-colors",
+			neutral: "neutral-color"
+		},
+		typography: { fontFamily: "font-family" },
+		borderRadius: "border-radius"
+	}
+};
+function mapPathToOptionName(path) {
+	const normalisedPath = path[0] === "themes" ? ["theme", ...R.drop(2, path)] : path;
+	const option = R.path(normalisedPath, deprecatedCLIOptions);
+	if (typeof option !== "string") return;
+	return option;
+}
+function makeFriendlyError(err) {
+	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 ${pc.red(issuePath)}${optionMessage}:
+      ${issue.message} ${pc.dim(errorCode)}`;
+		}).join("\n") });
+	} catch (_err2) {
+		console.error(pc.red(err instanceof Error ? err.message : "Unknown error occurred while parsing config file"));
+		console.error(err instanceof Error ? err.stack : "No stack trace available");
+	}
+}
+/**
+* Validates a configuration object against a provided Zod schema.
+*
+* @template T - The expected type of the validated configuration.
+* @param schema - A Zod schema used to validate the configuration object.
+* @param unvalidatedConfig - The configuration object to validate.
+* @returns The validated configuration object, typed as T.
+* @throws Exits the process with code 1 if validation fails, after logging a friendly error message.
+*/
+function validateConfig(schema, unvalidatedConfig, configFilePath) {
+	try {
+		return schema.parse(unvalidatedConfig);
+	} catch (err) {
+		console.error(pc.redBright(`Invalid config file at ${pc.red(configFilePath)}`));
+		const validationError = makeFriendlyError(err);
+		console.error(validationError?.toString());
+		process.exit(1);
+	}
+}
+function parseConfig(configFile, configFilePath) {
+	if (!configFile) return {};
+	try {
+		return JSON.parse(configFile);
+	} catch (err) {
+		console.error(pc.redBright(`Failed parsing config file at ${pc.red(configFilePath)}`));
+		const validationError = makeFriendlyError(err);
+		console.error(validationError?.toString());
+		process.exit(1);
+	}
+}
+//#endregion
+export { deprecatedCLIOptions, parseConfig, validateConfig };

package/dist/src/{config.d.ts → schemas/v1/schema.d.ts}

@@ -1,15 +1,4 @@
 import { z } from 'zod';
-/**
- * Validates a configuration object against a provided Zod schema.
- *
- * @template T - The expected type of the validated configuration.
- * @param schema - A Zod schema used to validate the configuration object.
- * @param unvalidatedConfig - The configuration object to validate.
- * @returns The validated configuration object, typed as T.
- * @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>, configFilePath: string): T;
-export declare function parseConfig<T>(configFile: string, configFilePath: string): T;
 export declare const colorRegex: RegExp;
 declare const overridesSchema: z.ZodOptional<z.ZodObject<{
     colors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodEnum<{
@@ -178,4 +167,4 @@ export type CreateConfigSchema = z.infer<typeof configFileCreateSchema>;
 export type ConfigSchemaTheme = z.infer<typeof themeSchema>;
 export type ColorOverrideSchema = z.infer<typeof overridesSchema>;
 export {};
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=schema.d.ts.map

package/dist/src/schemas/v1/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/schemas/v1/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,eAAO,MAAM,UAAU,QAA2C,CAAC;AAuEnE,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAQR,CAAC;AAEd,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBmG,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;AAC5D,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}