skir 0.0.6 → 0.0.8

package/dist/project_initializer.js

@@ -1,31 +1,113 @@
-import * as fs from "fs";
-import * as paths from "path";
+import * as FileSystem from "fs";
+import * as Paths from "path";
+import { rewritePathForRendering } from "./io.js";
 export function initializeProject(rootDir) {
-    const skirYmlPath = paths.join(rootDir, "skir.yml");
+    const skirYmlPath = Paths.join(rootDir, "skir.yml");
     // Check if skir.yml already exists
-    if (fs.existsSync(skirYmlPath)) {
+    if (FileSystem.existsSync(skirYmlPath)) {
         console.log("A skir.yml file already exists in this directory. Skipping project initialization.");
         return;
     }
     // Create skir.yml file
-    fs.writeFileSync(skirYmlPath, SKIR_YML_CONTENT, "utf-8");
+    FileSystem.writeFileSync(skirYmlPath, SKIR_YML_CONTENT, "utf-8");
     // Check if skir-src directory exists
-    const skirSrcDir = paths.join(rootDir, "skir-src");
-    if (!fs.existsSync(skirSrcDir)) {
+    const skirSrcDir = Paths.join(rootDir, "skir-src");
+    if (!FileSystem.existsSync(skirSrcDir)) {
         // Create skir-src directory
-        fs.mkdirSync(skirSrcDir, { recursive: true });
+        FileSystem.mkdirSync(skirSrcDir, { recursive: true });
         // Create hello_world.skir file
-        const helloWorldPath = paths.join(skirSrcDir, "hello_world.skir");
-        fs.writeFileSync(helloWorldPath, HELLO_WORLD_SKIR_CONTENT, "utf-8");
+        const helloWorldPath = Paths.join(skirSrcDir, "hello_world.skir");
+        FileSystem.writeFileSync(helloWorldPath, HELLO_WORLD_SKIR_CONTENT, "utf-8");
     }
-    console.log(`Done. Please edit: ${paths.resolve(skirYmlPath)}`);
+    console.log(`Done. Please edit: ${rewritePathForRendering(skirYmlPath)}`);
 }
-const SKIR_YML_CONTENT = `srcDir: skir-src
+const SKIR_YML_CONTENT = `# Configuration file for Skir code generator
+#
+# Documentation: https://skir.build/
+#
+# Cheat sheet:
+#   npx skir gen          Generate code from .skir files
+#   npx skir gen --watch  Watch for changes and regenerate automatically
+#   npx skir format       Format all .skir files
+#   npx skir snapshot     Take a snapshot of the source directory, verify no
+#                         breaking changes since last snapshot
 
+# Directory containing .skir files
+srcDir: skir-src
+
+# Uncomment and configure the generators for your target language(s).
 generators:
-  - mod: skir-python-gen
-    skiroutDir: ./skirout
-    config: {}
+  # # --------------------------------------------------------------------------
+  # # C++ code generator
+  # # Home: https://github.com/gepheum/skir-cc-gen
+  # # To install runtime dependencies, follow instructions in repository README
+  # # --------------------------------------------------------------------------
+  # - mod: skir-cc-gen
+  #   outDir: ./skirout
+  #   config:
+  #     # Set to true if you use GoogleTest
+  #     writeGoogleTestHeaders: false
+
+  # # --------------------------------------------------------------------------
+  # # Dart code generator
+  # # Home: https://github.com/gepheum/skir-dart-gen
+  # # To install runtime dependencies: dart pub add skir_client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-dart-gen
+  #   outDir: ./skirout
+  #   config: {}
+
+  # # --------------------------------------------------------------------------
+  # # Java code generator
+  # # Home: https://github.com/gepheum/skir-java-gen
+  # # Add the following line to your build.gradle dependencies:
+  # #    implementation("build.skir:skir-client:latest.release")
+  # # --------------------------------------------------------------------------
+  # - mod: skir-java-gen
+  #   outDir: ./src/main/java/skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./src/main/java/skirout/my/project
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # Kotlin code generator
+  # # Home: https://github.com/gepheum/skir-kotlin-gen
+  # # Add the following line to your build.gradle dependencies:
+  # #   implementation("build.skir:skir-client:latest.release")
+  # # --------------------------------------------------------------------------
+  # - mod: skir-kotlin-gen
+  #   outDir: ./src/main/kotlin/skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./src/main/kotlin/skirout/my/project
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # Python code generator
+  # # Home: https://github.com/gepheum/skir-python-gen
+  # # To install runtime dependencies: pip install skir-client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-python-gen
+  #   outDir: ./skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./my/project/skirout
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # TypeScript/JavaScript code generator
+  # # Home: https://github.com/gepheum/skir-typescript-gen
+  # # To install runtime dependencies: npm i skir-client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-typescript-gen
+  #   outDir: ./src/skirout
+  #   config:
+  #     # Use ".js" for ES modules, "" for CommonJS
+  #     importPathExtension: ".js"
 `;
 const HELLO_WORLD_SKIR_CONTENT = `/// A point in 2D space.
 struct Point {

package/dist/project_initializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAE9B,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEzD,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,4BAA4B;QAC5B,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;CAMxB,CAAC;AAEF,MAAM,wBAAwB,GAAG;;;;;;;CAOhC,CAAC"}
+{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,IAAI,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEjE,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,4BAA4B;QAC5B,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtD,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFxB,CAAC;AAEF,MAAM,wBAAwB,GAAG;;;;;;;CAOhC,CAAC"}

package/dist/snapshotter.d.ts

@@ -1,9 +1,16 @@
+import { ModuleSet } from "./module_set.js";
 export declare function takeSnapshot(args: {
     rootDir: string;
     srcDir: string;
-    check: boolean;
-}): Promise<void>;
+    subcommand: "ci" | "dry-run" | undefined;
+}): Promise<boolean>;
+interface CorruptedError {
+    kind: "corrupted";
+    error: any;
+}
+export declare function snapshotFileContentToModuleSet(fileContent: string): ModuleSet | CorruptedError;
 export declare function viewSnapshot(args: {
     rootDir: string;
 }): Promise<void>;
+export {};
 //# sourceMappingURL=snapshotter.d.ts.map

package/dist/snapshotter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshotter.d.ts","sourceRoot":"","sources":["../src/snapshotter.ts"],"names":[],"mappings":"AAaA,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ChB;AAoDD,wBAAsB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC3E"}
+{"version":3,"file":"snapshotter.d.ts","sourceRoot":"","sources":["../src/snapshotter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,IAAI,GAAG,SAAS,GAAG,SAAS,CAAC;CAC1C,GAAG,OAAO,CAAC,OAAO,CAAC,CAkDnB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,GAAG,CAAC;CACZ;AAqBD,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,MAAM,GAClB,SAAS,GAAG,cAAc,CAmC5B;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC3E"}

package/dist/snapshotter.js

@@ -2,22 +2,23 @@ import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { checkBackwardCompatibility } from "./compatibility_checker.js";
 import { formatError, makeGreen, makeRed, renderBreakingChanges, renderErrors, } from "./error_renderer.js";
+import { rewritePathForRendering } from "./io.js";
 import { collectModules } from "./module_collector.js";
 import { ModuleSet } from "./module_set.js";
 export async function takeSnapshot(args) {
     const newModuleSet = await collectModules(args.srcDir);
     if (newModuleSet.errors.length) {
         renderErrors(newModuleSet.errors);
-        process.exit(1);
+        return false;
     }
     const snapshotPath = join(args.rootDir, "skir-snapshot.json");
-    const oldModuleSet = await readLastSnapshot(join(args.rootDir, snapshotPath));
+    const oldModuleSet = await readLastSnapshot(snapshotPath);
     if (!(oldModuleSet instanceof ModuleSet)) {
-        console.error(makeRed(`Corrupted snapshot file: ${snapshotPath}`));
+        console.error(makeRed(`Corrupted snapshot file: ${rewritePathForRendering(snapshotPath)}`));
         console.error(`Error: ${oldModuleSet.error.toString()}`);
         console.log("If the snapshot file cannot be restored to a valid state, delete it and run again. " +
             "Breaking changes from recent commits will not be detected, but a valid snapshot will be created for future comparisons.");
-        process.exit(1);
+        return false;
     }
     const breakingChanges = checkBackwardCompatibility({
         before: oldModuleSet,
@@ -28,27 +29,49 @@ export async function takeSnapshot(args) {
             before: oldModuleSet,
             after: newModuleSet,
         });
-        process.exit(1);
+        return false;
     }
     const now = new Date();
     const newSnapshot = makeSnapshot(newModuleSet, now);
     if (sameModules(newSnapshot, makeSnapshot(oldModuleSet, now))) {
         console.log("No changes detected since last snapshot.");
-        return;
+        return true;
     }
-    if (args.check) {
-        console.error(makeRed(`Modules have changed since the last snapshot. ` +
-            `Run the command without 'check' to take a new snapshot.`));
-        process.exit(1);
+    if (args.subcommand === "ci") {
+        console.error(makeRed("Modules have changed since the last snapshot."));
+        console.log("Run 'npx skir snapshot' to take a new snapshot.");
+        return false;
+    }
+    else if (args.subcommand === "dry-run") {
+        console.log(makeGreen("Changes detected since last snapshot."));
+        console.log("No breaking changes found.");
+        return true;
     }
     await writeFile(snapshotPath, JSON.stringify(newSnapshot, null, 2), "utf-8");
     console.log("Snapshot taken. No breaking changes detected.");
+    return true;
 }
 async function readLastSnapshot(snapshotPath) {
+    let textContent;
+    try {
+        textContent = await readFile(snapshotPath, "utf-8");
+    }
+    catch (error) {
+        const isNotFoundError = error instanceof Error && "code" in error && error.code === "ENOENT";
+        if (isNotFoundError) {
+            return ModuleSet.fromMap(new Map());
+        }
+        else {
+            // Rethrow I/O error
+            throw error;
+        }
+    }
+    return snapshotFileContentToModuleSet(textContent);
+}
+export function snapshotFileContentToModuleSet(fileContent) {
     let snapshot;
     try {
-        const textContent = await readFile(snapshotPath, "utf-8");
-        snapshot = JSON.parse(textContent);
+        snapshot = JSON.parse(fileContent);
     }
     catch (error) {
         if (error instanceof SyntaxError) {
@@ -57,12 +80,7 @@ async function readLastSnapshot(snapshotPath) {
                 error: error,
             };
         }
-        const isNotFoundError = error instanceof Error && "code" in error && error.code === "ENOENT";
-        if (isNotFoundError) {
-            return ModuleSet.fromMap(new Map());
-        }
         else {
-            // Rethrow I/O error
             throw error;
         }
     }

package/dist/snapshotter.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshotter.js","sourceRoot":"","sources":["../src/snapshotter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshotter.js","sourceRoot":"","sources":["../src/snapshotter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skir",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "",
   "homepage": "https://github.com/gepheum/skir#readme",
   "bugs": {
@@ -54,17 +54,19 @@
     "zod": "^4.2.1"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.6.0",
-    "@typescript-eslint/eslint-plugin": "^6.13.0",
-    "@typescript-eslint/parser": "^6.13.0",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@typescript-eslint/parser": "^8.50.1",
     "buckwheat": "^1.1.2",
-    "eslint": "^8.54.0",
-    "mocha": "^10.8.2",
+    "eslint": "^9.39.2",
+    "mocha": "^11.7.5",
     "prettier": "^3.2.4",
     "prettier-plugin-organize-imports": "^4.2.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "typescript-eslint": "^8.50.1"
   }
 }

package/src/command_line_parser.ts

@@ -6,12 +6,12 @@ export type ParsedArgs =
     }
   | {
       kind: "format";
-      subcommand?: "check";
+      subcommand?: "ci";
       root?: string;
     }
   | {
       kind: "snapshot";
-      subcommand?: "check" | "view";
+      subcommand?: "ci" | "view" | "dry-run";
       root?: string;
     }
   | {
@@ -80,30 +80,36 @@ export function parseCommandLine(args: string[]): ParsedArgs {
 const COMMAND_BASE = "npx skir";
 
 const HELP_TEXT = `
-Usage: ${COMMAND_BASE} <command> [subcommand] [options]
+Usage: ${COMMAND_BASE} <command> [options]
 
 Commands:
-  gen [watch]           Generate code from Skir source files to target languages
-                        watch: Automatically regenerate when .skir files change
-  format [check]        Format all .skir files in the specified directory
-                        check: Fail if code is not properly formatted
-  snapshot [check|view] Manage .skir file snapshots for compatibility checking
-                        check: Fail if there are breaking changes since last snapshot
-                        view: Display the last snapshot
-  init                  Initialize a new Skir project with a minimal skir.yml file
-  help                  Display this help message
+  init               Initialize a new Skir project in the current directory
+  gen                Generate code from .skir files to target languages
+  format             Format all .skir files in the source directory
+  snapshot           Take a snapshot of the source directory, look for
+                       breaking changes since the last snapshot
+  help               Display this help message
 
 Options:
-  --root, -r <path>    Path to the directory containing the skir.yml configuration file
+  --root, -r <path>  Path to the directory containing the skir.yml file
+  --watch, -w        Automatically run code generation when .skir files change
+                       (gen only)
+  --ci               Fail if code is not properly formatted (format) or if code
+                       has changed since the last snapshot (snapshot)
+  --dry-run          Look for breaking changes since the last snapshot without
+                       taking a new snapshot (snapshot only)
+  --view             Display the last snapshot (snapshot only)
 
 Examples:
+  ${COMMAND_BASE} init
   ${COMMAND_BASE} gen
-  ${COMMAND_BASE} gen watch
+  ${COMMAND_BASE} gen --watch
   ${COMMAND_BASE} format --root path/to/root/dir
-  ${COMMAND_BASE} format check -r path/to/root/dir
+  ${COMMAND_BASE} format --ci -r path/to/root/dir
   ${COMMAND_BASE} snapshot
-  ${COMMAND_BASE} snapshot check
-  ${COMMAND_BASE} snapshot view --root path/to/root/dir
+  ${COMMAND_BASE} snapshot --ci
+  ${COMMAND_BASE} snapshot --dry-run
+  ${COMMAND_BASE} snapshot --view --root path/to/root/dir
 `;
 
 export class CommandLineParseError extends Error {
@@ -115,7 +121,10 @@ export class CommandLineParseError extends Error {
 
 type ParsedOptions = {
   root?: string;
-  subcommand?: string;
+  watch?: boolean;
+  ci?: boolean;
+  dryRun?: boolean;
+  view?: boolean;
   unknown: string[];
 };
 
@@ -128,7 +137,21 @@ function parseOptions(args: string[]): ParsedOptions {
     const arg = args[i];
     if (!arg) continue;
 
-    if (arg === "--root" || arg === "-r") {
+    // Check for --option=value syntax
+    if (arg.startsWith("--root=") || arg.startsWith("-r=")) {
+      const value = arg.substring(arg.indexOf("=") + 1);
+      if (!value) {
+        throw new CommandLineParseError(
+          `Option ${arg.split("=")[0]} requires a value`,
+        );
+      }
+      if (options.root !== undefined) {
+        throw new CommandLineParseError(
+          `Option ${arg.split("=")[0]} specified multiple times`,
+        );
+      }
+      options.root = value;
+    } else if (arg === "--root" || arg === "-r") {
       if (i + 1 >= args.length) {
         throw new CommandLineParseError(`Option ${arg} requires a value`);
       }
@@ -139,14 +162,37 @@ function parseOptions(args: string[]): ParsedOptions {
       }
       options.root = args[i + 1];
       i++; // Skip the next argument as it's the value
+    } else if (arg === "--watch" || arg === "-w") {
+      if (options.watch) {
+        throw new CommandLineParseError(
+          `Option ${arg} specified multiple times`,
+        );
+      }
+      options.watch = true;
+    } else if (arg === "--ci") {
+      if (options.ci) {
+        throw new CommandLineParseError(`Option --ci specified multiple times`);
+      }
+      options.ci = true;
+    } else if (arg === "--dry-run") {
+      if (options.dryRun) {
+        throw new CommandLineParseError(
+          `Option --dry-run specified multiple times`,
+        );
+      }
+      options.dryRun = true;
+    } else if (arg === "--view") {
+      if (options.view) {
+        throw new CommandLineParseError(
+          `Option --view specified multiple times`,
+        );
+      }
+      options.view = true;
     } else if (arg.startsWith("-")) {
       options.unknown.push(arg);
     } else {
-      // Positional argument - treat as subcommand
-      if (options.subcommand !== undefined) {
-        throw new CommandLineParseError(`Unexpected argument: ${arg}`);
-      }
-      options.subcommand = arg;
+      // Positional argument - not allowed anymore
+      throw new CommandLineParseError(`Unexpected argument: ${arg}`);
     }
   }
 
@@ -156,64 +202,110 @@ function parseOptions(args: string[]): ParsedOptions {
 function buildGenCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "gen");
 
-  if (options.subcommand !== undefined && options.subcommand !== "watch") {
+  if (options.ci) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'gen': ${options.subcommand}`,
+      `Option --ci is not valid for 'gen' command`,
+    );
+  }
+  if (options.dryRun) {
+    throw new CommandLineParseError(
+      `Option --dry-run is not valid for 'gen' command`,
+    );
+  }
+  if (options.view) {
+    throw new CommandLineParseError(
+      `Option --view is not valid for 'gen' command`,
     );
   }
 
   return {
     kind: "gen",
     root: options.root,
-    subcommand: options.subcommand === "watch" ? "watch" : undefined,
+    subcommand: options.watch ? "watch" : undefined,
   };
 }
 
 function buildFormatCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "format");
 
-  if (options.subcommand !== undefined && options.subcommand !== "check") {
+  if (options.watch) {
+    throw new CommandLineParseError(
+      `Option --watch is not valid for 'format' command`,
+    );
+  }
+  if (options.dryRun) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'format': ${options.subcommand}`,
+      `Option --dry-run is not valid for 'format' command`,
+    );
+  }
+  if (options.view) {
+    throw new CommandLineParseError(
+      `Option --view is not valid for 'format' command`,
     );
   }
 
   return {
     kind: "format",
     root: options.root,
-    subcommand: options.subcommand === "check" ? "check" : undefined,
+    subcommand: options.ci ? "ci" : undefined,
   };
 }
 
 function buildSnapshotCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "snapshot");
 
-  if (
-    options.subcommand !== undefined &&
-    options.subcommand !== "check" &&
-    options.subcommand !== "view"
-  ) {
+  if (options.watch) {
+    throw new CommandLineParseError(
+      `Option --watch is not valid for 'snapshot' command`,
+    );
+  }
+
+  const activeOptions = [
+    options.ci && "--ci",
+    options.dryRun && "--dry-run",
+    options.view && "--view",
+  ].filter(Boolean);
+
+  if (activeOptions.length > 1) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'snapshot': ${options.subcommand}`,
+      `Options ${activeOptions.join(" and ")} cannot be used together`,
     );
   }
 
   return {
     kind: "snapshot",
     root: options.root,
-    subcommand:
-      options.subcommand === "check" || options.subcommand === "view"
-        ? options.subcommand
-        : undefined,
+    subcommand: options.ci
+      ? "ci"
+      : options.dryRun
+        ? "dry-run"
+        : options.view
+          ? "view"
+          : undefined,
   };
 }
 
 function buildInitCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "init");
 
-  if (options.subcommand !== undefined) {
+  if (options.watch) {
+    throw new CommandLineParseError(
+      `Option --watch is not valid for 'init' command`,
+    );
+  }
+  if (options.ci) {
+    throw new CommandLineParseError(
+      `Option --ci is not valid for 'init' command`,
+    );
+  }
+  if (options.dryRun) {
+    throw new CommandLineParseError(
+      `Option --dry-run is not valid for 'init' command`,
+    );
+  }
+  if (options.view) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'init': ${options.subcommand}`,
+      `Option --view is not valid for 'init' command`,
     );
   }