@digdir/designsystemet 1.1.0 → 1.1.2

package/dist/bin/config.d.ts

@@ -1,12 +1,12 @@
 import type { Command, OptionValues } from '@commander-js/extra-typings';
-import { type ConfigSchemaBuild, type ConfigSchemaCreate } from '../src/config.js';
+import { type BuildConfigSchema, type CreateConfigSchema } from '../src/config.js';
 export declare function readConfigFile(configPath: string, allowFileNotFound?: boolean): Promise<string>;
 export declare function parseCreateConfig(configFile: string, options: {
     theme: string;
     cmd: Command<unknown[], OptionValues>;
     configPath: string;
-}): Promise<ConfigSchemaCreate>;
+}): Promise<CreateConfigSchema>;
 export declare function parseBuildConfig(configFile: string, { configPath }: {
     configPath: string;
-}): Promise<ConfigSchemaBuild>;
+}): 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":"AACA,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,UAAU,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBlG;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,UAAU,EAAE,MAAM,CAAA;CAAE,GACpF,OAAO,CAAC,kBAAkB,CAAC,CAqE7B;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAI5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AACA,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,UAAU,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBlG;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,UAAU,EAAE,MAAM,CAAA;CAAE,GACpF,OAAO,CAAC,kBAAkB,CAAC,CAiE7B;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAI5B"}

package/dist/bin/config.js

@@ -7,7 +7,7 @@ import * as R8 from "ramda";
 import chalk from "chalk";
 import * as R7 from "ramda";
 import { z } from "zod/v4";
-import { fromError } from "zod-validation-error";
+import { fromError } from "zod-validation-error/v4";
 
 // src/colors/colorMetadata.ts
 import * as R from "ramda";
@@ -327,16 +327,21 @@ function mapPathToOptionName(path3) {
   return option;
 }
 function makeFriendlyError(err) {
-  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 ${chalk.red(issuePath)}${optionMessage}:
-    ${issue.message} ${chalk.dim(errorCode)}`;
-    }).join("\n")
-  });
+  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 ${chalk.red(issuePath)}${optionMessage}:
+      ${issue.message} ${chalk.dim(errorCode)}`;
+      }).join("\n")
+    });
+  } catch (_err2) {
+    console.error(chalk.red(err instanceof Error ? err.message : "Unknown error occurred while parsing config file"));
+    console.error(err instanceof Error ? err.stack : "No stack trace available");
+  }
 }
 function validateConfig(schema, unvalidatedConfig, configPath) {
   try {
@@ -344,21 +349,20 @@ function validateConfig(schema, unvalidatedConfig, configPath) {
   } catch (err) {
     console.error(chalk.redBright(`Invalid config file at ${chalk.red(configPath)}`));
     const validationError = makeFriendlyError(err);
-    console.error(validationError.toString());
+    console.error(validationError?.toString());
     process.exit(1);
   }
 }
-function parseConfig(schema, configFile, configPath) {
+function parseConfig(configFile, configPath) {
   if (!configFile) {
     return {};
   }
   try {
-    const parsedConfig = JSON.parse(configFile);
-    return schema.parse(parsedConfig);
+    return JSON.parse(configFile);
   } catch (err) {
     console.error(chalk.redBright(`Failed parsing config file at ${chalk.red(configPath)}`));
     const validationError = makeFriendlyError(err);
-    console.error(validationError.toString());
+    console.error(validationError?.toString());
     process.exit(1);
   }
 }
@@ -396,17 +400,16 @@ var themeSchema = z.object({
   }).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 configFileBuildSchema = z.object({
+var commonConfig = z.object({
   clean: z.boolean().meta({ description: "Delete the output directory before building or creating tokens" }).optional()
 });
-var configFileCreateSchema = z.object({
+var _configFileCreateSchema = z.object({
   outDir: z.string().meta({ description: "Path to the output directory for the created design tokens" }),
-  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."
   })
 }).required();
-var combinedConfigSchema = configFileCreateSchema.extend(configFileBuildSchema.shape);
+var configFileCreateSchema = _configFileCreateSchema.extend(commonConfig.shape);
 
 // src/utils.ts
 import fs from "fs/promises";
@@ -457,11 +460,7 @@ async function readConfigFile(configPath, allowFileNotFound = true) {
 }
 async function parseCreateConfig(configFile, options) {
   const { cmd, theme = "theme", configPath } = options;
-  const configParsed = parseConfig(
-    configFileCreateSchema,
-    configFile,
-    configPath
-  );
+  const configParsed = parseConfig(configFile, configPath);
   const themeColors = Object.values(configParsed?.themes ?? {}).map(
     (x) => /* @__PURE__ */ new Set([...R8.keys(x.colors.main), ...R8.keys(x.colors.support)])
   );
@@ -507,8 +506,8 @@ async function parseCreateConfig(configFile, options) {
   return validateConfig(configFileCreateSchema, unvalidatedConfig, configPath);
 }
 async function parseBuildConfig(configFile, { configPath }) {
-  const configParsed = parseConfig(configFileBuildSchema, configFile, configPath);
-  return validateConfig(configFileBuildSchema, configParsed, configPath);
+  const configParsed = parseConfig(configFile, configPath);
+  return validateConfig(commonConfig, configParsed, configPath);
 }
 export {
   parseBuildConfig,