wip

Author: mimarz

designsystemet.config.json

@@ -2,7 +2,7 @@
   "$schema": "packages/cli/dist/config-next.schema.json",
   "outDir": "design-tokens",
   "clean": true,
-  "output": [],
+  "output": [{ "type": "design-tokens" }, { "type": "css" }],
   "themes": {
     "designsystemet": {
       "colors": {

packages/cli/bin/designsystemet.ts

@@ -8,8 +8,9 @@ import { checkAutomigrate } from '../src/automigrate.ts';
 import { convertToHex } from '../src/colors/index.ts';
 import type { CssColor } from '../src/colors/types.ts';
 import migrations from '../src/migrations/index.ts';
-import { parseConfig } from '../src/schemas/helpers.ts';
-import type { RootConfigSchema, rootConfig } from '../src/schemas/next/schema.ts';
+import { getSchemaDefaults, parseConfig } from '../src/schemas/helpers.ts';
+import type { RootConfigSchema } from '../src/schemas/next/schema.ts';
+import { rootConfig } from '../src/schemas/next/schema.ts';
 import { buildTokens } from '../src/tokens/build.ts';
 import { createTokens, systemTokenToFiles, tokenSetDimensions, tokenSetsToFiles } from '../src/tokens/create.ts';
 import { generateConfigFromTokens } from '../src/tokens/generate-config.ts';
@@ -300,8 +301,12 @@ program
       process.exit(1);
     }
 
-    const parsedConfig = await parseConfig<RootConfigSchema>(configFile, configFilePath);
-    const config = parsedConfig ? parsedConfig : parseConfig<RootConfigSchema>(configFile, configFilePath);
+    const parsedConfig = parseConfig<RootConfigSchema>(configFile, configFilePath);
+    const defaultConfig = getSchemaDefaults(rootConfig);
+    const config = { ...defaultConfig, ...parsedConfig };
+
+    console.log('Default config:', defaultConfig);
+    console.log('Merged config:', config);
 
     const themeNames = Object.keys(config.themes);
     if (themeNames.length > 0) {

packages/cli/src/schemas/helpers.ts

@@ -1,7 +1,7 @@
 import { type ParseError, parse as parseJsoncRaw, printParseErrorCode } from 'jsonc-parser';
 import pc from 'picocolors';
 import * as R from 'ramda';
-import type { z } from 'zod';
+import { z } from 'zod';
 import { fromError } from 'zod-validation-error';
 
 export const deprecatedCLIOptions = {
@@ -97,6 +97,41 @@ export function parseJsonc<T>(content: string): T {
   return result;
 }
 
+/**
+ * Recursively extracts default values from a Zod schema.
+ *
+ * Fields with `.default()` return their default value, nested objects are
+ * traversed recursively, optional/nullable wrappers are unwrapped, and
+ * single-value literals return their literal value. Fields without a
+ * resolvable default are omitted from the result.
+ *
+ * @template T - The Zod schema type.
+ * @param schema - The Zod schema to extract default values from.
+ * @returns The default values described by the schema.
+ */
+export function getSchemaDefaults<T extends z.ZodType>(schema: T): Partial<z.infer<T>> {
+  return getDefaultValue(schema) as Partial<z.infer<T>>;
+}
+
+function getDefaultValue(schema: z.ZodType): unknown {
+  if (schema instanceof z.ZodDefault) {
+    return schema.def.defaultValue;
+  }
+  if (schema instanceof z.ZodOptional || schema instanceof z.ZodNullable) {
+    return getDefaultValue(schema.def.innerType as z.ZodType);
+  }
+  if (schema instanceof z.ZodObject) {
+    const entries = Object.entries(schema.shape)
+      .map(([key, value]) => [key, getDefaultValue(value as z.ZodType)] as const)
+      .filter(([, value]) => value !== undefined);
+    return Object.fromEntries(entries);
+  }
+  if (schema instanceof z.ZodLiteral && schema.def.values.length === 1) {
+    return schema.def.values[0];
+  }
+  return undefined;
+}
+
 export function parseConfig<T>(configFile: string): T {
   if (!configFile) {
     return {} as T;
@@ -109,3 +144,12 @@ export function parseConfig<T>(configFile: string): T {
     throw new Error(validationError?.toString());
   }
 }
+
+// export function getDefaults<Schema extends z.ZodObject>(schema: Schema) {
+//   return Object.fromEntries(
+//     Object.entries(schema.shape).map(([key, value]) => {
+//       if (value instanceof z.ZodDefault) return [key, (value.def.defaultValue as () => unknown)()];
+//       return [key, undefined];
+//     }),
+//   );
+// }

packages/cli/src/schemas/next/defaults.ts

@@ -24,4 +24,4 @@ export const rootConfig = configFileCreateSchema.extend({
   output: z.array(outputSchema).describe('An array of output files'),
 });
 
-export type RootConfigSchema = z.input<typeof rootConfig>;
+export type RootConfigSchema = z.infer<typeof rootConfig>;