@clafoutis/cli 1.2.0 → 1.2.2

package/dist/index.js

@@ -2,7 +2,7 @@
 import * as p2 from '@clack/prompts';
 import { Command } from 'commander';
 import fs from 'fs';
-import path2 from 'path';
+import path from 'path';
 import { logger } from '@clafoutis/shared';
 import { generate } from '@clafoutis/generators/figma';
 import { generate as generate$1 } from '@clafoutis/generators/tailwind';
@@ -88,6 +88,28 @@ function tokensDirNotFoundError(tokensDir) {
   );
 }
 
+// src/utils/cwd.ts
+function resolveCommandCwd(cwdOverride) {
+  const cwd = cwdOverride?.trim() ? cwdOverride : process.cwd();
+  return path.resolve(cwd);
+}
+function resolveInCwd(commandCwd, targetPath) {
+  return path.isAbsolute(targetPath) ? path.resolve(targetPath) : path.resolve(commandCwd, targetPath);
+}
+function displayPath(commandCwd, absolutePath) {
+  const rel = path.relative(commandCwd, absolutePath);
+  return rel && !rel.startsWith("..") ? rel : absolutePath;
+}
+function validateCwdOption(cwdOverride) {
+  if (cwdOverride !== void 0 && cwdOverride.trim() === "") {
+    throw new ClafoutisError(
+      "Invalid --cwd value",
+      "--cwd cannot be empty",
+      "Provide a valid directory path, for example: --cwd ./packages/design-system"
+    );
+  }
+}
+
 // src/commands/format.ts
 function loadTokenFiles(dirPath) {
   const files = [];
@@ -96,7 +118,7 @@ function loadTokenFiles(dirPath) {
       return;
     }
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-      const fullPath = path2.join(dir, entry.name);
+      const fullPath = path.join(dir, entry.name);
       const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         walk(fullPath, relativePath);
@@ -120,7 +142,9 @@ function formatJson(content) {
   return JSON.stringify(parsed, null, 2) + "\n";
 }
 function formatCommand(options) {
-  const tokensDir = options.tokens || "./tokens";
+  validateCwdOption(options.cwd);
+  const commandCwd = resolveCommandCwd(options.cwd);
+  const tokensDir = resolveInCwd(commandCwd, options.tokens || "./tokens");
   if (!fs.existsSync(tokensDir)) {
     throw tokensDirNotFoundError(tokensDir);
   }
@@ -260,8 +284,8 @@ function findUnknownFields(config, schemaProperties, prefix = "") {
   }
   return unknown;
 }
-function hasField(config, path6) {
-  const parts = path6.split(".");
+function hasField(config, path8) {
+  const parts = path8.split(".");
   let current = config;
   for (const part of parts) {
     if (current && typeof current === "object" && part in current) {
@@ -590,11 +614,11 @@ function getConsumerGitignore() {
 `;
 }
 var __filename$1 = fileURLToPath(import.meta.url);
-var __dirname$1 = path2.dirname(__filename$1);
+var __dirname$1 = path.dirname(__filename$1);
 function getTokensDir() {
-  const devPath = path2.resolve(__dirname$1, "tokens");
+  const devPath = path.resolve(__dirname$1, "tokens");
   if (fs.existsSync(devPath)) return devPath;
-  const distPath = path2.resolve(__dirname$1, "templates", "tokens");
+  const distPath = path.resolve(__dirname$1, "templates", "tokens");
   if (fs.existsSync(distPath)) return distPath;
   throw new Error(
     `Starter token templates not found. Searched:
@@ -605,8 +629,8 @@ function getTokensDir() {
 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);
+    const relPath = base ? path.join(base, entry.name) : entry.name;
+    const fullPath = path.join(dir, entry.name);
     if (entry.isDirectory()) {
       result.push(...walkTokensDir(fullPath, relPath));
     } else if (entry.name.endsWith(".json")) {
@@ -632,6 +656,7 @@ on:
     branches: [main]
     paths:
       - 'tokens/**'
+      - '.clafoutis/producer.json'
 
 jobs:
   release:
@@ -657,6 +682,18 @@ jobs:
       - name: Generate tokens
         run: npx clafoutis generate
 
+      - name: Commit generated build artifacts
+        run: |
+          if [ -z "$(git status --porcelain build)" ]; then
+            echo "No build changes to commit"
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add build
+          git commit -m "chore: update generated build artifacts"
+          git push
+
       - name: Get next version
         id: version
         run: |
@@ -740,15 +777,17 @@ async function initCommand(options) {
       "Choose one: --producer for design system repos, --consumer for application repos"
     );
   }
+  validateCwdOption(options.cwd);
+  const commandCwd = resolveCommandCwd(options.cwd);
   const isInteractive = !options.nonInteractive && process.stdin.isTTY;
   const isDryRun = options.dryRun ?? false;
   if (isInteractive) {
-    await runInteractiveInit(options, isDryRun);
+    await runInteractiveInit(options, isDryRun, commandCwd);
   } else {
-    await runNonInteractiveInit(options, isDryRun);
+    await runNonInteractiveInit(options, isDryRun, commandCwd);
   }
 }
-async function runInteractiveInit(options, isDryRun) {
+async function runInteractiveInit(options, isDryRun, commandCwd) {
   showIntro(isDryRun);
   let mode;
   if (options.producer) {
@@ -768,13 +807,23 @@ async function runInteractiveInit(options, isDryRun) {
     if (!answers) {
       return;
     }
-    await createProducerConfig(answers, options.force ?? false, isDryRun);
+    await createProducerConfig(
+      answers,
+      options.force ?? false,
+      isDryRun,
+      commandCwd
+    );
   } else {
     const answers = await runConsumerWizard();
     if (!answers) {
       return;
     }
-    await createConsumerConfig(answers, options.force ?? false, isDryRun);
+    await createConsumerConfig(
+      answers,
+      options.force ?? false,
+      isDryRun,
+      commandCwd
+    );
   }
   if (isDryRun) {
     showOutro("No files were written. Remove --dry-run to apply changes.");
@@ -782,7 +831,7 @@ async function runInteractiveInit(options, isDryRun) {
     showOutro("Setup complete!");
   }
 }
-async function runNonInteractiveInit(options, isDryRun) {
+async function runNonInteractiveInit(options, isDryRun, commandCwd) {
   if (!options.producer && !options.consumer) {
     throw new ClafoutisError(
       "Mode required",
@@ -805,7 +854,12 @@ async function runNonInteractiveInit(options, isDryRun) {
       output: options.output ?? "./build",
       workflow: options.workflow ?? true
     };
-    await createProducerConfig(answers, options.force ?? false, isDryRun);
+    await createProducerConfig(
+      answers,
+      options.force ?? false,
+      isDryRun,
+      commandCwd
+    );
   } else {
     const errors = validateConsumerFlags(options);
     if (errors.length > 0) {
@@ -859,11 +913,16 @@ async function runNonInteractiveInit(options, isDryRun) {
       repo: options.repo,
       files
     };
-    await createConsumerConfig(answers, options.force ?? false, isDryRun);
+    await createConsumerConfig(
+      answers,
+      options.force ?? false,
+      isDryRun,
+      commandCwd
+    );
   }
 }
-async function createProducerConfig(answers, force, dryRun) {
-  const configPath = ".clafoutis/producer.json";
+async function createProducerConfig(answers, force, dryRun, commandCwd) {
+  const configPath = resolveInCwd(commandCwd, ".clafoutis/producer.json");
   if (!force && await fileExists(configPath)) {
     throw new ClafoutisError(
       "Configuration already exists",
@@ -896,7 +955,10 @@ async function createProducerConfig(answers, force, dryRun) {
   ];
   const starterTokens = getAllStarterTokens();
   for (const token of starterTokens) {
-    const tokenPath = path2.join(answers.tokens, token.path);
+    const tokenPath = resolveInCwd(
+      commandCwd,
+      path.join(answers.tokens, token.path)
+    );
     if (!force && await fileExists(tokenPath)) {
       continue;
     }
@@ -907,7 +969,7 @@ async function createProducerConfig(answers, force, dryRun) {
     });
   }
   if (answers.workflow) {
-    const workflowPath = getWorkflowPath();
+    const workflowPath = resolveInCwd(commandCwd, getWorkflowPath());
     if (force || !await fileExists(workflowPath)) {
       filesToCreate.push({
         path: workflowPath,
@@ -916,22 +978,23 @@ async function createProducerConfig(answers, force, dryRun) {
       });
     }
   }
-  if (force || !await fileExists(".gitignore")) {
+  const gitignorePath = resolveInCwd(commandCwd, ".gitignore");
+  if (force || !await fileExists(gitignorePath)) {
     filesToCreate.push({
-      path: ".gitignore",
+      path: gitignorePath,
       content: getProducerGitignore(),
       description: "Ignore build artifacts and release-assets"
     });
   }
   if (dryRun) {
-    showDryRunOutput(filesToCreate);
+    showDryRunOutput(filesToCreate, commandCwd);
   } else {
-    await writeFiles(filesToCreate);
+    await writeFiles(filesToCreate, commandCwd);
     showNextSteps("producer", answers);
   }
 }
-async function createConsumerConfig(answers, force, dryRun) {
-  const configPath = ".clafoutis/consumer.json";
+async function createConsumerConfig(answers, force, dryRun, commandCwd) {
+  const configPath = resolveInCwd(commandCwd, ".clafoutis/consumer.json");
   if (!force && await fileExists(configPath)) {
     throw new ClafoutisError(
       "Configuration already exists",
@@ -951,7 +1014,7 @@ async function createConsumerConfig(answers, force, dryRun) {
       description: `repo: "${answers.repo}"`
     }
   ];
-  const gitignorePath = ".gitignore";
+  const gitignorePath = resolveInCwd(commandCwd, ".gitignore");
   const consumerIgnore = getConsumerGitignore();
   if (await fileExists(gitignorePath)) {
     const existingContent = await fs2.readFile(gitignorePath, "utf-8");
@@ -970,30 +1033,30 @@ async function createConsumerConfig(answers, force, dryRun) {
     });
   }
   if (dryRun) {
-    showDryRunOutput(filesToCreate);
+    showDryRunOutput(filesToCreate, commandCwd);
   } else {
-    await writeFiles(filesToCreate);
+    await writeFiles(filesToCreate, commandCwd);
     showNextSteps("consumer", answers);
   }
 }
-function showDryRunOutput(files) {
+function showDryRunOutput(files, commandCwd) {
   log3.message("");
   log3.step("Would create the following files:");
   log3.message("");
   for (const file of files) {
-    log3.message(`  ${file.path}`);
+    log3.message(`  ${displayPath(commandCwd, file.path)}`);
     if (file.description) {
       log3.message(`  \u2514\u2500 ${file.description}`);
     }
   }
   log3.message("");
 }
-async function writeFiles(files) {
+async function writeFiles(files, commandCwd) {
   for (const file of files) {
-    const dir = path2.dirname(file.path);
+    const dir = path.dirname(file.path);
     await fs2.mkdir(dir, { recursive: true });
     await fs2.writeFile(file.path, file.content);
-    log3.success(`Created ${file.path}`);
+    log3.success(`Created ${displayPath(commandCwd, file.path)}`);
   }
 }
 function showNextSteps(mode, answers) {
@@ -1018,15 +1081,20 @@ function showNextSteps(mode, answers) {
 }
 
 // src/commands/generate.ts
-async function loadPlugin(pluginPath) {
-  const absolutePath = path2.resolve(process.cwd(), pluginPath);
+async function loadPlugin(pluginPath, commandCwd) {
+  const absolutePath = resolveInCwd(commandCwd, pluginPath);
   if (pluginPath.endsWith(".ts")) {
     register();
   }
   return import(pathToFileURL(absolutePath).href);
 }
 async function generateCommand(options) {
-  const configPath = options.config || ".clafoutis/producer.json";
+  validateCwdOption(options.cwd);
+  const commandCwd = resolveCommandCwd(options.cwd);
+  const configPath = resolveInCwd(
+    commandCwd,
+    options.config || ".clafoutis/producer.json"
+  );
   let config = await readProducerConfig(configPath);
   if (!config) {
     if (await fileExists(configPath)) {
@@ -1039,7 +1107,7 @@ async function generateCommand(options) {
     if (process.stdin.isTTY) {
       const shouldRunWizard = await offerWizard("producer");
       if (shouldRunWizard) {
-        await initCommand({ producer: true });
+        await initCommand({ producer: true, cwd: commandCwd });
         config = await readProducerConfig(configPath);
         if (!config) {
           throw configNotFoundError(configPath, false);
@@ -1065,8 +1133,8 @@ async function generateCommand(options) {
   if (options.output) {
     config.output = options.output;
   }
-  const tokensDir = path2.resolve(process.cwd(), config.tokens || "./tokens");
-  const outputDir = path2.resolve(process.cwd(), config.output || "./build");
+  const tokensDir = resolveInCwd(commandCwd, config.tokens || "./tokens");
+  const outputDir = resolveInCwd(commandCwd, config.output || "./build");
   if (!await fileExists(tokensDir)) {
     throw tokensDirNotFoundError(tokensDir);
   }
@@ -1092,7 +1160,7 @@ async function generateCommand(options) {
       let generatorModule;
       if (typeof value === "string") {
         try {
-          generatorModule = await loadPlugin(value);
+          generatorModule = await loadPlugin(value, commandCwd);
         } catch (err) {
           const errorMessage = err instanceof Error ? err.message : String(err);
           throw pluginLoadError(value, errorMessage);
@@ -1105,8 +1173,12 @@ async function generateCommand(options) {
         }
       } else {
         const builtInGenerators = {
-          tailwind: { generate: () => generate$1() },
-          figma: { generate: () => generate() }
+          tailwind: {
+            generate: async (ctx) => generate$1(commandCwd, ctx.outputDir)
+          },
+          figma: {
+            generate: async (ctx) => generate(commandCwd, ctx.outputDir)
+          }
         };
         if (!builtInGenerators[name]) {
           throw generatorNotFoundError(name);
@@ -1115,7 +1187,7 @@ async function generateCommand(options) {
       }
       const context = {
         tokensDir,
-        outputDir: path2.join(outputDir, name),
+        outputDir: path.join(outputDir, name),
         config,
         StyleDictionary
       };
@@ -1139,10 +1211,18 @@ async function generateCommand(options) {
   logger.success("Generation complete");
 }
 var CACHE_DIR = ".clafoutis";
-var CACHE_FILE = `${CACHE_DIR}/cache`;
-async function readCache() {
+var CACHE_FILE = "cache";
+function getCachePaths(commandCwd) {
+  const dir = path.resolve(commandCwd, CACHE_DIR);
+  return {
+    dir,
+    file: path.join(dir, CACHE_FILE)
+  };
+}
+async function readCache(commandCwd = process.cwd()) {
+  const { file } = getCachePaths(commandCwd);
   try {
-    return (await fs2.readFile(CACHE_FILE, "utf-8")).trim();
+    return (await fs2.readFile(file, "utf-8")).trim();
   } catch (err) {
     if (err instanceof Error && err.code === "ENOENT") {
       return null;
@@ -1150,9 +1230,10 @@ async function readCache() {
     throw err;
   }
 }
-async function writeCache(version) {
-  await fs2.mkdir(CACHE_DIR, { recursive: true });
-  await fs2.writeFile(CACHE_FILE, version);
+async function writeCache(version, commandCwd = process.cwd()) {
+  const { dir, file } = getCachePaths(commandCwd);
+  await fs2.mkdir(dir, { recursive: true });
+  await fs2.writeFile(file, version);
 }
 async function downloadRelease(config) {
   const token = process.env.CLAFOUTIS_REPO_TOKEN;
@@ -1218,18 +1299,23 @@ async function downloadRelease(config) {
 }
 
 // src/commands/sync.ts
-async function writeOutput(config, files) {
+async function writeOutput(config, files, commandCwd) {
   for (const [assetName, content] of files) {
     const configPath = config.files[assetName];
     if (!configPath) continue;
-    const outputPath = path2.resolve(process.cwd(), configPath);
-    await fs2.mkdir(path2.dirname(outputPath), { recursive: true });
+    const outputPath = resolveInCwd(commandCwd, configPath);
+    await fs2.mkdir(path.dirname(outputPath), { recursive: true });
     await fs2.writeFile(outputPath, content);
     logger.success(`Written: ${outputPath}`);
   }
 }
 async function syncCommand(options) {
-  const configPath = options.config || ".clafoutis/consumer.json";
+  validateCwdOption(options.cwd);
+  const commandCwd = resolveCommandCwd(options.cwd);
+  const configPath = resolveInCwd(
+    commandCwd,
+    options.config || ".clafoutis/consumer.json"
+  );
   let config = await readConfig(configPath);
   if (!config) {
     if (await fileExists(configPath)) {
@@ -1242,7 +1328,7 @@ async function syncCommand(options) {
     if (process.stdin.isTTY) {
       const shouldRunWizard = await offerWizard("consumer");
       if (shouldRunWizard) {
-        await initCommand({ consumer: true });
+        await initCommand({ consumer: true, cwd: commandCwd });
         config = await readConfig(configPath);
         if (!config) {
           throw configNotFoundError(configPath, true);
@@ -1255,7 +1341,7 @@ async function syncCommand(options) {
     }
   }
   validateConsumerConfig(config);
-  const cachedVersion = await readCache();
+  const cachedVersion = await readCache(commandCwd);
   const isLatest = config.version === "latest";
   logger.info(`Repo: ${config.repo}`);
   logger.info(`Pinned: ${config.version}`);
@@ -1269,7 +1355,7 @@ async function syncCommand(options) {
     }
     return;
   }
-  const resolveOutputPaths = () => Object.values(config.files).map((p5) => path2.resolve(process.cwd(), p5));
+  const resolveOutputPaths = () => Object.values(config.files).map((p5) => resolveInCwd(commandCwd, p5));
   if (!isLatest && !options.force && config.version === cachedVersion) {
     const outputPaths = resolveOutputPaths();
     const existsResults = await Promise.all(
@@ -1294,14 +1380,14 @@ async function syncCommand(options) {
       return;
     }
   }
-  await writeOutput(config, files);
-  await writeCache(resolvedTag);
+  await writeOutput(config, files, commandCwd);
+  await writeCache(resolvedTag, commandCwd);
   logger.success(`Synced to ${resolvedTag}`);
   if (config.postSync) {
-    await runPostSync(config.postSync);
+    await runPostSync(config.postSync, commandCwd);
   }
 }
-async function runPostSync(command) {
+async function runPostSync(command, commandCwd) {
   logger.info(`Running postSync: ${command}`);
   const isWindows = process.platform === "win32";
   const shell = isWindows ? "cmd.exe" : "/bin/sh";
@@ -1309,7 +1395,8 @@ async function runPostSync(command) {
   return new Promise((resolve, reject) => {
     const child = spawn(shell, shellArgs, {
       stdio: ["inherit", "pipe", "pipe"],
-      env: process.env
+      env: process.env,
+      cwd: commandCwd
     });
     let stdout = "";
     let stderr = "";
@@ -1406,23 +1493,23 @@ program.command("generate").description("Generate platform outputs from design t
   "-c, --config <path>",
   "Path to config file",
   ".clafoutis/producer.json"
-).option("--tailwind", "Generate Tailwind output").option("--figma", "Generate Figma variables").option("-o, --output <dir>", "Output directory", "./build").option("--dry-run", "Preview changes without writing files").action(withErrorHandling(generateCommand));
+).option("--tailwind", "Generate Tailwind output").option("--figma", "Generate Figma variables").option("-o, --output <dir>", "Output directory", "./build").option("--cwd <path>", "Run command as if from this directory").option("--dry-run", "Preview changes without writing files").action(withErrorHandling(generateCommand));
 program.command("sync").description("Sync design tokens from GitHub Release (for consumers)").option("-f, --force", "Force sync even if versions match").option(
   "-c, --config <path>",
   "Path to config file",
   ".clafoutis/consumer.json"
-).option("--dry-run", "Preview changes without writing files").action(withErrorHandling(syncCommand));
+).option("--cwd <path>", "Run command as if from this directory").option("--dry-run", "Preview changes without writing files").action(withErrorHandling(syncCommand));
 program.command("init").description("Initialize Clafoutis configuration").option("--producer", "Set up as a design token producer").option("--consumer", "Set up as a design token consumer").option("-r, --repo <repo>", "GitHub repo for consumer mode (org/name)").option("-t, --tokens <path>", "Token directory path (default: ./tokens)").option("-o, --output <path>", "Output directory path (default: ./build)").option(
   "-g, --generators <list>",
   "Comma-separated generators: tailwind, figma"
 ).option("--workflow", "Create GitHub Actions workflow (default: true)").option("--no-workflow", "Skip GitHub Actions workflow").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));
+).option("--force", "Overwrite existing configuration").option("--dry-run", "Preview changes without writing files").option("--non-interactive", "Skip prompts, use defaults or flags").option("--cwd <path>", "Run command as if from this directory").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));
+).option("--cwd <path>", "Run command as if from this directory").option("--dry-run", "Preview changes without writing files").action(withErrorHandling(formatCommand));
 program.parse();
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map