@clafoutis/cli 1.1.2 → 1.2.0

package/dist/index.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import * as p2 from '@clack/prompts';
 import { Command } from 'commander';
+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 { logger } from '@clafoutis/shared';
-import path from 'path';
 import StyleDictionary from 'style-dictionary';
 import { register } from 'tsx/esm/api';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { Ajv } from 'ajv';
-import fs from 'fs/promises';
-import fs2 from 'fs';
+import fs2 from 'fs/promises';
 import { spawn } from 'child_process';
 
 // src/utils/errors.ts
@@ -88,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";
@@ -163,8 +260,8 @@ function findUnknownFields(config, schemaProperties, prefix = "") {
   }
   return unknown;
 }
-function hasField(config, path5) {
-  const parts = path5.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) {
@@ -378,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;
@@ -386,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;
@@ -394,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;
@@ -493,12 +590,12 @@ function getConsumerGitignore() {
 `;
 }
 var __filename$1 = fileURLToPath(import.meta.url);
-var __dirname$1 = path.dirname(__filename$1);
+var __dirname$1 = path2.dirname(__filename$1);
 function getTokensDir() {
-  const devPath = path.resolve(__dirname$1, "tokens");
-  if (fs2.existsSync(devPath)) return devPath;
-  const distPath = path.resolve(__dirname$1, "templates", "tokens");
-  if (fs2.existsSync(distPath)) return distPath;
+  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}
@@ -507,15 +604,15 @@ function getTokensDir() {
 }
 function walkTokensDir(dir, base = "") {
   const result = [];
-  for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
-    const relPath = base ? path.join(base, entry.name) : entry.name;
-    const fullPath = path.join(dir, entry.name);
+  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: fs2.readFileSync(fullPath, "utf-8")
+        content: fs.readFileSync(fullPath, "utf-8")
       });
     }
   }
@@ -554,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
 
@@ -796,7 +896,7 @@ async function createProducerConfig(answers, force, dryRun) {
   ];
   const starterTokens = getAllStarterTokens();
   for (const token of starterTokens) {
-    const tokenPath = path.join(answers.tokens, token.path);
+    const tokenPath = path2.join(answers.tokens, token.path);
     if (!force && await fileExists(tokenPath)) {
       continue;
     }
@@ -854,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,
@@ -890,9 +990,9 @@ function showDryRunOutput(files) {
 }
 async function writeFiles(files) {
   for (const file of files) {
-    const dir = path.dirname(file.path);
-    await fs.mkdir(dir, { recursive: true });
-    await fs.writeFile(file.path, file.content);
+    const dir = path2.dirname(file.path);
+    await fs2.mkdir(dir, { recursive: true });
+    await fs2.writeFile(file.path, file.content);
     log3.success(`Created ${file.path}`);
   }
 }
@@ -904,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");
   }
@@ -913,7 +1019,7 @@ function showNextSteps(mode, answers) {
 
 // src/commands/generate.ts
 async function loadPlugin(pluginPath) {
-  const absolutePath = path.resolve(process.cwd(), pluginPath);
+  const absolutePath = path2.resolve(process.cwd(), pluginPath);
   if (pluginPath.endsWith(".ts")) {
     register();
   }
@@ -959,8 +1065,8 @@ async function generateCommand(options) {
   if (options.output) {
     config.output = options.output;
   }
-  const tokensDir = path.resolve(process.cwd(), config.tokens || "./tokens");
-  const outputDir = path.resolve(process.cwd(), config.output || "./build");
+  const tokensDir = path2.resolve(process.cwd(), config.tokens || "./tokens");
+  const outputDir = path2.resolve(process.cwd(), config.output || "./build");
   if (!await fileExists(tokensDir)) {
     throw tokensDirNotFoundError(tokensDir);
   }
@@ -1009,7 +1115,7 @@ async function generateCommand(options) {
       }
       const context = {
         tokensDir,
-        outputDir: path.join(outputDir, name),
+        outputDir: path2.join(outputDir, name),
         config,
         StyleDictionary
       };
@@ -1036,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;
@@ -1045,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;
@@ -1116,9 +1222,9 @@ async function writeOutput(config, files) {
   for (const [assetName, content] of files) {
     const configPath = config.files[assetName];
     if (!configPath) continue;
-    const outputPath = path.resolve(process.cwd(), configPath);
-    await fs.mkdir(path.dirname(outputPath), { recursive: true });
-    await fs.writeFile(outputPath, content);
+    const outputPath = path2.resolve(process.cwd(), configPath);
+    await fs2.mkdir(path2.dirname(outputPath), { recursive: true });
+    await fs2.writeFile(outputPath, content);
     logger.success(`Written: ${outputPath}`);
   }
 }
@@ -1163,7 +1269,7 @@ async function syncCommand(options) {
     }
     return;
   }
-  const resolveOutputPaths = () => Object.values(config.files).map((p5) => path.resolve(process.cwd(), p5));
+  const resolveOutputPaths = () => Object.values(config.files).map((p5) => path2.resolve(process.cwd(), p5));
   if (!isLatest && !options.force && config.version === cachedVersion) {
     const outputPaths = resolveOutputPaths();
     const existsResults = await Promise.all(
@@ -1313,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