@clafoutis/cli 1.1.1 → 1.2.0

package/dist/index.js

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 import * as p2 from '@clack/prompts';
 import { Command } from 'commander';
-import { logger } from '@clafoutis/shared';
+import fs from 'fs';
 import path2 from 'path';
+import { logger } from '@clafoutis/shared';
+import { generate } from '@clafoutis/generators/figma';
+import { generate as generate$1 } from '@clafoutis/generators/tailwind';
 import StyleDictionary from 'style-dictionary';
-import { pathToFileURL } from 'url';
+import { register } from 'tsx/esm/api';
+import { fileURLToPath, pathToFileURL } from 'url';
 import { Ajv } from 'ajv';
-import fs from 'fs/promises';
+import fs2 from 'fs/promises';
 import { spawn } from 'child_process';
 
 // src/utils/errors.ts
@@ -84,7 +88,104 @@ function tokensDirNotFoundError(tokensDir) {
   );
 }
 
-// src/cli/validation.ts
+// src/commands/format.ts
+function loadTokenFiles(dirPath) {
+  const files = [];
+  function walk(dir, prefix) {
+    if (!fs.existsSync(dir)) {
+      return;
+    }
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const fullPath = path2.join(dir, entry.name);
+      const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) {
+        walk(fullPath, relativePath);
+      } else if (entry.name.endsWith(".json")) {
+        try {
+          const content = fs.readFileSync(fullPath, "utf-8");
+          files.push({ relativePath, fullPath, content });
+        } catch (err) {
+          logger.warn(
+            `Failed to read ${relativePath}: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+    }
+  }
+  walk(dirPath, "");
+  return files;
+}
+function formatJson(content) {
+  const parsed = JSON.parse(content);
+  return JSON.stringify(parsed, null, 2) + "\n";
+}
+function formatCommand(options) {
+  const tokensDir = options.tokens || "./tokens";
+  if (!fs.existsSync(tokensDir)) {
+    throw tokensDirNotFoundError(tokensDir);
+  }
+  logger.info(`Formatting token files in ${tokensDir}...`);
+  const files = loadTokenFiles(tokensDir);
+  const fileCount = files.length;
+  if (fileCount === 0) {
+    logger.warn(`No JSON files found in ${tokensDir}`);
+    return;
+  }
+  let changedCount = 0;
+  const unformattedFiles = [];
+  for (const { relativePath, fullPath, content } of files) {
+    try {
+      const formatted = formatJson(content);
+      if (content !== formatted) {
+        if (options.check) {
+          unformattedFiles.push(relativePath);
+          changedCount++;
+        } else if (options.dryRun) {
+          logger.info(`Would format: ${relativePath}`);
+          changedCount++;
+        } else {
+          fs.writeFileSync(fullPath, formatted, "utf-8");
+          logger.info(`Formatted: ${relativePath}`);
+          changedCount++;
+        }
+      }
+    } catch (err) {
+      logger.error(
+        `Failed to format ${relativePath}: ${err instanceof Error ? err.message : String(err)}`
+      );
+      throw err;
+    }
+  }
+  if (options.check) {
+    if (changedCount > 0) {
+      logger.error(
+        `${changedCount} of ${fileCount} files are not formatted correctly:`
+      );
+      for (const file of unformattedFiles) {
+        logger.error(`  - ${file}`);
+      }
+      logger.info(
+        `Run 'npx clafoutis format --tokens ${tokensDir}' to fix formatting.`
+      );
+      process.exit(1);
+    }
+    logger.success(`All ${fileCount} files are correctly formatted`);
+    return;
+  }
+  if (options.dryRun) {
+    if (changedCount > 0) {
+      logger.info(`Would format ${changedCount} of ${fileCount} files`);
+    } else {
+      logger.info(`All ${fileCount} files are already formatted`);
+    }
+    return;
+  }
+  if (changedCount > 0) {
+    logger.success(`Formatted ${changedCount} of ${fileCount} files`);
+  } else {
+    logger.success(`All ${fileCount} files are already formatted`);
+  }
+}
 function validateRepo(value) {
   if (!value) {
     return "Repository is required";
@@ -159,8 +260,8 @@ function findUnknownFields(config, schemaProperties, prefix = "") {
   }
   return unknown;
 }
-function hasField(config, path4) {
-  const parts = path4.split(".");
+function hasField(config, path6) {
+  const parts = path6.split(".");
   let current = config;
   for (const part of parts) {
     if (current && typeof current === "object" && part in current) {
@@ -374,7 +475,7 @@ var log3 = {
 };
 async function readConfig(configPath) {
   try {
-    const content = await fs.readFile(configPath, "utf-8");
+    const content = await fs2.readFile(configPath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -382,7 +483,7 @@ async function readConfig(configPath) {
 }
 async function readProducerConfig(configPath) {
   try {
-    const content = await fs.readFile(configPath, "utf-8");
+    const content = await fs2.readFile(configPath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -390,7 +491,7 @@ async function readProducerConfig(configPath) {
 }
 async function fileExists(filePath) {
   try {
-    await fs.access(filePath);
+    await fs2.access(filePath);
     return true;
   } catch {
     return false;
@@ -488,232 +589,38 @@ function getConsumerGitignore() {
 .clafoutis/cache
 `;
 }
-
-// src/templates/tokens.ts
-var colorPrimitives = {
-  color: {
-    gray: {
-      50: { $value: "#fafafa" },
-      100: { $value: "#f5f5f5" },
-      200: { $value: "#e5e5e5" },
-      300: { $value: "#d4d4d4" },
-      400: { $value: "#a3a3a3" },
-      500: { $value: "#737373" },
-      600: { $value: "#525252" },
-      700: { $value: "#404040" },
-      800: { $value: "#262626" },
-      900: { $value: "#171717" }
-    },
-    blue: {
-      50: { $value: "#eff6ff" },
-      100: { $value: "#dbeafe" },
-      200: { $value: "#bfdbfe" },
-      300: { $value: "#93c5fd" },
-      400: { $value: "#60a5fa" },
-      500: { $value: "#3b82f6" },
-      600: { $value: "#2563eb" },
-      700: { $value: "#1d4ed8" },
-      800: { $value: "#1e40af" },
-      900: { $value: "#1e3a8a" }
-    },
-    green: {
-      50: { $value: "#f0fdf4" },
-      100: { $value: "#dcfce7" },
-      200: { $value: "#bbf7d0" },
-      300: { $value: "#86efac" },
-      400: { $value: "#4ade80" },
-      500: { $value: "#22c55e" },
-      600: { $value: "#16a34a" },
-      700: { $value: "#15803d" },
-      800: { $value: "#166534" },
-      900: { $value: "#14532d" }
-    },
-    red: {
-      50: { $value: "#fef2f2" },
-      100: { $value: "#fee2e2" },
-      200: { $value: "#fecaca" },
-      300: { $value: "#fca5a5" },
-      400: { $value: "#f87171" },
-      500: { $value: "#ef4444" },
-      600: { $value: "#dc2626" },
-      700: { $value: "#b91c1c" },
-      800: { $value: "#991b1b" },
-      900: { $value: "#7f1d1d" }
-    },
-    amber: {
-      50: { $value: "#fffbeb" },
-      100: { $value: "#fef3c7" },
-      200: { $value: "#fde68a" },
-      300: { $value: "#fcd34d" },
-      400: { $value: "#fbbf24" },
-      500: { $value: "#f59e0b" },
-      600: { $value: "#d97706" },
-      700: { $value: "#b45309" },
-      800: { $value: "#92400e" },
-      900: { $value: "#78350f" }
-    }
-  }
-};
-var colorSemantics = {
-  color: {
-    primary: {
-      50: { $value: "{color.blue.50}" },
-      100: { $value: "{color.blue.100}" },
-      200: { $value: "{color.blue.200}" },
-      300: { $value: "{color.blue.300}" },
-      400: { $value: "{color.blue.400}" },
-      500: { $value: "{color.blue.500}" },
-      600: { $value: "{color.blue.600}" },
-      700: { $value: "{color.blue.700}" },
-      800: { $value: "{color.blue.800}" },
-      900: { $value: "{color.blue.900}" }
-    },
-    neutral: {
-      50: { $value: "{color.gray.50}" },
-      100: { $value: "{color.gray.100}" },
-      200: { $value: "{color.gray.200}" },
-      300: { $value: "{color.gray.300}" },
-      400: { $value: "{color.gray.400}" },
-      500: { $value: "{color.gray.500}" },
-      600: { $value: "{color.gray.600}" },
-      700: { $value: "{color.gray.700}" },
-      800: { $value: "{color.gray.800}" },
-      900: { $value: "{color.gray.900}" }
-    },
-    success: {
-      50: { $value: "{color.green.50}" },
-      100: { $value: "{color.green.100}" },
-      200: { $value: "{color.green.200}" },
-      300: { $value: "{color.green.300}" },
-      400: { $value: "{color.green.400}" },
-      500: { $value: "{color.green.500}" },
-      600: { $value: "{color.green.600}" },
-      700: { $value: "{color.green.700}" },
-      800: { $value: "{color.green.800}" },
-      900: { $value: "{color.green.900}" }
-    },
-    warning: {
-      50: { $value: "{color.amber.50}" },
-      100: { $value: "{color.amber.100}" },
-      200: { $value: "{color.amber.200}" },
-      300: { $value: "{color.amber.300}" },
-      400: { $value: "{color.amber.400}" },
-      500: { $value: "{color.amber.500}" },
-      600: { $value: "{color.amber.600}" },
-      700: { $value: "{color.amber.700}" },
-      800: { $value: "{color.amber.800}" },
-      900: { $value: "{color.amber.900}" }
-    },
-    error: {
-      50: { $value: "{color.red.50}" },
-      100: { $value: "{color.red.100}" },
-      200: { $value: "{color.red.200}" },
-      300: { $value: "{color.red.300}" },
-      400: { $value: "{color.red.400}" },
-      500: { $value: "{color.red.500}" },
-      600: { $value: "{color.red.600}" },
-      700: { $value: "{color.red.700}" },
-      800: { $value: "{color.red.800}" },
-      900: { $value: "{color.red.900}" }
-    },
-    background: {
-      default: { $value: "{color.gray.50}" },
-      subtle: { $value: "{color.gray.100}" },
-      muted: { $value: "{color.gray.200}" }
-    },
-    foreground: {
-      default: { $value: "{color.gray.900}" },
-      muted: { $value: "{color.gray.600}" },
-      subtle: { $value: "{color.gray.500}" }
-    },
-    border: {
-      default: { $value: "{color.gray.200}" },
-      muted: { $value: "{color.gray.100}" }
-    }
-  }
-};
-var colorSemanticsDark = {
-  color: {
-    background: {
-      default: { $value: "{color.gray.900}" },
-      subtle: { $value: "{color.gray.800}" },
-      muted: { $value: "{color.gray.700}" }
-    },
-    foreground: {
-      default: { $value: "{color.gray.50}" },
-      muted: { $value: "{color.gray.400}" },
-      subtle: { $value: "{color.gray.500}" }
-    },
-    border: {
-      default: { $value: "{color.gray.700}" },
-      muted: { $value: "{color.gray.800}" }
+var __filename$1 = fileURLToPath(import.meta.url);
+var __dirname$1 = path2.dirname(__filename$1);
+function getTokensDir() {
+  const devPath = path2.resolve(__dirname$1, "tokens");
+  if (fs.existsSync(devPath)) return devPath;
+  const distPath = path2.resolve(__dirname$1, "templates", "tokens");
+  if (fs.existsSync(distPath)) return distPath;
+  throw new Error(
+    `Starter token templates not found. Searched:
+  ${devPath}
+  ${distPath}`
+  );
+}
+function walkTokensDir(dir, base = "") {
+  const result = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const relPath = base ? path2.join(base, entry.name) : entry.name;
+    const fullPath = path2.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      result.push(...walkTokensDir(fullPath, relPath));
+    } else if (entry.name.endsWith(".json")) {
+      result.push({
+        path: relPath,
+        content: fs.readFileSync(fullPath, "utf-8")
+      });
     }
   }
-};
-var spacingPrimitives = {
-  spacing: {
-    0: { $value: "0" },
-    1: { $value: "0.25rem" },
-    2: { $value: "0.5rem" },
-    3: { $value: "0.75rem" },
-    4: { $value: "1rem" },
-    5: { $value: "1.25rem" },
-    6: { $value: "1.5rem" },
-    8: { $value: "2rem" },
-    10: { $value: "2.5rem" },
-    12: { $value: "3rem" },
-    16: { $value: "4rem" },
-    20: { $value: "5rem" },
-    24: { $value: "6rem" }
-  }
-};
-var typographyPrimitives = {
-  fontFamily: {
-    sans: { $value: "ui-sans-serif, system-ui, sans-serif" },
-    serif: { $value: "ui-serif, Georgia, serif" },
-    mono: { $value: "ui-monospace, monospace" }
-  },
-  fontSize: {
-    xs: { $value: "0.75rem" },
-    sm: { $value: "0.875rem" },
-    base: { $value: "1rem" },
-    lg: { $value: "1.125rem" },
-    xl: { $value: "1.25rem" },
-    "2xl": { $value: "1.5rem" },
-    "3xl": { $value: "1.875rem" },
-    "4xl": { $value: "2.25rem" }
-  },
-  fontWeight: {
-    normal: { $value: "400" },
-    medium: { $value: "500" },
-    semibold: { $value: "600" },
-    bold: { $value: "700" }
-  },
-  lineHeight: {
-    tight: { $value: "1.25" },
-    normal: { $value: "1.5" },
-    relaxed: { $value: "1.75" }
-  }
-};
-var starterTokens = {
-  "colors/primitives.json": colorPrimitives,
-  "colors/semantic.json": colorSemantics,
-  "colors/semantic.dark.json": colorSemanticsDark,
-  "spacing/primitives.json": spacingPrimitives,
-  "typography/primitives.json": typographyPrimitives
-};
-function getStarterTokenContent(fileName) {
-  const tokens = starterTokens[fileName];
-  if (!tokens) {
-    throw new Error(`Unknown starter token file: ${fileName}`);
-  }
-  return JSON.stringify(tokens, null, 2) + "\n";
+  return result;
 }
 function getAllStarterTokens() {
-  return Object.keys(starterTokens).map((fileName) => ({
-    path: fileName,
-    content: getStarterTokenContent(fileName)
-  }));
+  const tokensDir = getTokensDir();
+  return walkTokensDir(tokensDir);
 }
 
 // src/templates/workflow.ts
@@ -744,6 +651,9 @@ jobs:
       - name: Install Clafoutis
         run: npm install -D @clafoutis/cli
 
+      - name: Check token file formatting
+        run: npx clafoutis format --tokens tokens --check
+
       - name: Generate tokens
         run: npx clafoutis generate
 
@@ -984,8 +894,8 @@ async function createProducerConfig(answers, force, dryRun) {
       description: `tokens: "${answers.tokens}", output: "${answers.output}"`
     }
   ];
-  const starterTokens2 = getAllStarterTokens();
-  for (const token of starterTokens2) {
+  const starterTokens = getAllStarterTokens();
+  for (const token of starterTokens) {
     const tokenPath = path2.join(answers.tokens, token.path);
     if (!force && await fileExists(tokenPath)) {
       continue;
@@ -1044,7 +954,7 @@ async function createConsumerConfig(answers, force, dryRun) {
   const gitignorePath = ".gitignore";
   const consumerIgnore = getConsumerGitignore();
   if (await fileExists(gitignorePath)) {
-    const existingContent = await fs.readFile(gitignorePath, "utf-8");
+    const existingContent = await fs2.readFile(gitignorePath, "utf-8");
     if (!existingContent.includes(".clafoutis/cache")) {
       filesToCreate.push({
         path: gitignorePath,
@@ -1081,8 +991,8 @@ function showDryRunOutput(files) {
 async function writeFiles(files) {
   for (const file of files) {
     const dir = path2.dirname(file.path);
-    await fs.mkdir(dir, { recursive: true });
-    await fs.writeFile(file.path, file.content);
+    await fs2.mkdir(dir, { recursive: true });
+    await fs2.writeFile(file.path, file.content);
     log3.success(`Created ${file.path}`);
   }
 }
@@ -1094,8 +1004,14 @@ function showNextSteps(mode, answers) {
     log3.message(
       `  1. Edit ${producerAnswers.tokens}/colors/primitives.json with your design tokens`
     );
-    log3.message("  2. Run: npx clafoutis generate");
-    log3.message("  3. Push to GitHub - releases will be created automatically");
+    if (producerAnswers.workflow) {
+      log3.message(
+        "  2. Push to GitHub - the workflow will generate outputs and create a release automatically"
+      );
+    } else {
+      log3.message("  2. Run: npx clafoutis generate");
+      log3.message("  3. Push to GitHub to share your design system");
+    }
   } else {
     log3.message("  1. Run: npx clafoutis sync");
   }
@@ -1105,7 +1021,6 @@ function showNextSteps(mode, answers) {
 async function loadPlugin(pluginPath) {
   const absolutePath = path2.resolve(process.cwd(), pluginPath);
   if (pluginPath.endsWith(".ts")) {
-    const { register } = await import('tsx/esm/api');
     register();
   }
   return import(pathToFileURL(absolutePath).href);
@@ -1190,18 +1105,13 @@ async function generateCommand(options) {
         }
       } else {
         const builtInGenerators = {
-          tailwind: async () => import('@clafoutis/generators/tailwind'),
-          figma: async () => import('@clafoutis/generators/figma')
+          tailwind: { generate: () => generate$1() },
+          figma: { generate: () => generate() }
         };
         if (!builtInGenerators[name]) {
           throw generatorNotFoundError(name);
         }
-        try {
-          generatorModule = await builtInGenerators[name]();
-        } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
-          throw pluginLoadError(`@clafoutis/generators/${name}`, errorMessage);
-        }
+        generatorModule = builtInGenerators[name];
       }
       const context = {
         tokensDir,
@@ -1232,7 +1142,7 @@ var CACHE_DIR = ".clafoutis";
 var CACHE_FILE = `${CACHE_DIR}/cache`;
 async function readCache() {
   try {
-    return (await fs.readFile(CACHE_FILE, "utf-8")).trim();
+    return (await fs2.readFile(CACHE_FILE, "utf-8")).trim();
   } catch (err) {
     if (err instanceof Error && err.code === "ENOENT") {
       return null;
@@ -1241,8 +1151,8 @@ async function readCache() {
   }
 }
 async function writeCache(version) {
-  await fs.mkdir(CACHE_DIR, { recursive: true });
-  await fs.writeFile(CACHE_FILE, version);
+  await fs2.mkdir(CACHE_DIR, { recursive: true });
+  await fs2.writeFile(CACHE_FILE, version);
 }
 async function downloadRelease(config) {
   const token = process.env.CLAFOUTIS_REPO_TOKEN;
@@ -1313,8 +1223,8 @@ async function writeOutput(config, files) {
     const configPath = config.files[assetName];
     if (!configPath) continue;
     const outputPath = path2.resolve(process.cwd(), configPath);
-    await fs.mkdir(path2.dirname(outputPath), { recursive: true });
-    await fs.writeFile(outputPath, content);
+    await fs2.mkdir(path2.dirname(outputPath), { recursive: true });
+    await fs2.writeFile(outputPath, content);
     logger.success(`Written: ${outputPath}`);
   }
 }
@@ -1509,6 +1419,10 @@ program.command("init").description("Initialize Clafoutis configuration").option
   "--files <mapping>",
   "File mappings for consumer: asset:dest,asset:dest"
 ).option("--force", "Overwrite existing configuration").option("--dry-run", "Preview changes without writing files").option("--non-interactive", "Skip prompts, use defaults or flags").action(withErrorHandling(initCommand));
+program.command("format").description("Format token JSON files for consistent formatting").option("-t, --tokens <path>", "Token directory path", "./tokens").option(
+  "--check",
+  "Check formatting without modifying files (fails if unformatted)"
+).option("--dry-run", "Preview changes without writing files").action(withErrorHandling(formatCommand));
 program.parse();
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map