skir 0.0.6 → 0.0.8

package/dist/command_line_parser.d.ts

@@ -4,11 +4,11 @@ export type ParsedArgs = {
     root?: string;
 } | {
     kind: "format";
-    subcommand?: "check";
+    subcommand?: "ci";
     root?: string;
 } | {
     kind: "snapshot";
-    subcommand?: "check" | "view";
+    subcommand?: "ci" | "view" | "dry-run";
     root?: string;
 } | {
     kind: "init";

package/dist/command_line_parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command_line_parser.d.ts","sourceRoot":"","sources":["../src/command_line_parser.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEN;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA0C3D;AA+BD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,EAAE,MAAM;CAI5B"}
+{"version":3,"file":"command_line_parser.d.ts","sourceRoot":"","sources":["../src/command_line_parser.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEN;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA0C3D;AAqCD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,EAAE,MAAM;CAI5B"}

package/dist/command_line_parser.js

@@ -45,30 +45,36 @@ export function parseCommandLine(args) {
 }
 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 {
     constructor(message) {
@@ -84,7 +90,18 @@ function parseOptions(args) {
         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`);
             }
@@ -94,60 +111,112 @@ function parseOptions(args) {
             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}`);
         }
     }
     return options;
 }
 function buildGenCommand(options) {
     validateNoUnknownOptions(options, "gen");
-    if (options.subcommand !== undefined && options.subcommand !== "watch") {
-        throw new CommandLineParseError(`Unknown subcommand for 'gen': ${options.subcommand}`);
+    if (options.ci) {
+        throw new CommandLineParseError(`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) {
     validateNoUnknownOptions(options, "format");
-    if (options.subcommand !== undefined && options.subcommand !== "check") {
-        throw new CommandLineParseError(`Unknown subcommand for 'format': ${options.subcommand}`);
+    if (options.watch) {
+        throw new CommandLineParseError(`Option --watch is not valid for 'format' command`);
+    }
+    if (options.dryRun) {
+        throw new CommandLineParseError(`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) {
     validateNoUnknownOptions(options, "snapshot");
-    if (options.subcommand !== undefined &&
-        options.subcommand !== "check" &&
-        options.subcommand !== "view") {
-        throw new CommandLineParseError(`Unknown subcommand for 'snapshot': ${options.subcommand}`);
+    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(`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) {
     validateNoUnknownOptions(options, "init");
-    if (options.subcommand !== undefined) {
-        throw new CommandLineParseError(`Unknown subcommand for 'init': ${options.subcommand}`);
+    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(`Option --view is not valid for 'init' command`);
     }
     return {
         kind: "init",

package/dist/command_line_parser.js.map

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

package/dist/command_line_parser.test.js

@@ -22,17 +22,38 @@ describe("command_line_parser", () => {
                     root: "path/to/dir",
                 });
             });
-            it("should parse gen with watch subcommand", () => {
-                const result = parseCommandLine(["gen", "watch"]);
+            it("should parse gen with --root=value syntax", () => {
+                const result = parseCommandLine(["gen", "--root=path/to/dir"]);
+                expect(result).toMatch({
+                    kind: "gen",
+                    root: "path/to/dir",
+                });
+            });
+            it("should parse gen with -r=value syntax", () => {
+                const result = parseCommandLine(["gen", "-r=path/to/dir"]);
+                expect(result).toMatch({
+                    kind: "gen",
+                    root: "path/to/dir",
+                });
+            });
+            it("should parse gen with --watch option", () => {
+                const result = parseCommandLine(["gen", "--watch"]);
                 expect(result).toMatch({
                     kind: "gen",
                     subcommand: "watch",
                 });
             });
-            it("should parse gen with watch and --root option", () => {
+            it("should parse gen with -w option", () => {
+                const result = parseCommandLine(["gen", "-w"]);
+                expect(result).toMatch({
+                    kind: "gen",
+                    subcommand: "watch",
+                });
+            });
+            it("should parse gen with --watch and --root option", () => {
                 const result = parseCommandLine([
                     "gen",
-                    "watch",
+                    "--watch",
                     "--root",
                     "path/to/dir",
                 ]);
@@ -42,15 +63,15 @@ describe("command_line_parser", () => {
                     subcommand: "watch",
                 });
             });
-            it("should parse gen with watch and -r option", () => {
-                const result = parseCommandLine(["gen", "watch", "-r", "path/to/dir"]);
+            it("should parse gen with -w and -r option", () => {
+                const result = parseCommandLine(["gen", "-w", "-r", "path/to/dir"]);
                 expect(result).toMatch({
                     kind: "gen",
                     root: "path/to/dir",
                     subcommand: "watch",
                 });
             });
-            it("should return error if unknown subcommand is used with gen", () => {
+            it("should return error if positional argument is used with gen", () => {
                 const result = parseCommandLine(["gen", "build"]);
                 expect(result).toMatch({ kind: "error" });
             });
@@ -62,6 +83,10 @@ describe("command_line_parser", () => {
                 const result = parseCommandLine(["gen", "--root"]);
                 expect(result).toMatch({ kind: "error" });
             });
+            it("should return error if --root= is missing value", () => {
+                const result = parseCommandLine(["gen", "--root="]);
+                expect(result).toMatch({ kind: "error" });
+            });
             it("should return error if --root is specified multiple times", () => {
                 const result = parseCommandLine([
                     "gen",
@@ -72,6 +97,35 @@ describe("command_line_parser", () => {
                 ]);
                 expect(result).toMatch({ kind: "error" });
             });
+            it("should return error if --root is specified multiple times with = syntax", () => {
+                const result = parseCommandLine([
+                    "gen",
+                    "--root=path1",
+                    "--root=path2",
+                ]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --root is specified with both syntaxes", () => {
+                const result = parseCommandLine([
+                    "gen",
+                    "--root",
+                    "path1",
+                    "--root=path2",
+                ]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --ci is used with gen", () => {
+                const result = parseCommandLine(["gen", "--ci"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --dry-run is used with gen", () => {
+                const result = parseCommandLine(["gen", "--dry-run"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --view is used with gen", () => {
+                const result = parseCommandLine(["gen", "--view"]);
+                expect(result).toMatch({ kind: "error" });
+            });
         });
         describe("format command", () => {
             it("should parse basic format command", () => {
@@ -92,40 +146,40 @@ describe("command_line_parser", () => {
                     root: "path/to/dir",
                 });
             });
-            it("should parse format with check subcommand", () => {
-                const result = parseCommandLine(["format", "check"]);
+            it("should parse format with --ci option", () => {
+                const result = parseCommandLine(["format", "--ci"]);
                 expect(result).toMatch({
                     kind: "format",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
-            it("should parse format with check and --root option", () => {
+            it("should parse format with --ci and --root option", () => {
                 const result = parseCommandLine([
                     "format",
-                    "check",
+                    "--ci",
                     "--root",
                     "path/to/dir",
                 ]);
                 expect(result).toMatch({
                     kind: "format",
                     root: "path/to/dir",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
-            it("should parse format with check and -r option", () => {
+            it("should parse format with --ci and -r option", () => {
                 const result = parseCommandLine([
                     "format",
-                    "check",
+                    "--ci",
                     "-r",
                     "path/to/dir",
                 ]);
                 expect(result).toMatch({
                     kind: "format",
                     root: "path/to/dir",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
-            it("should return error if unknown subcommand is used with format", () => {
+            it("should return error if positional argument is used with format", () => {
                 const result = parseCommandLine(["format", "fix"]);
                 expect(result).toMatch({ kind: "error" });
             });
@@ -133,6 +187,18 @@ describe("command_line_parser", () => {
                 const result = parseCommandLine(["format", "--verbose"]);
                 expect(result).toMatch({ kind: "error" });
             });
+            it("should return error if --dry-run is used with format", () => {
+                const result = parseCommandLine(["format", "--dry-run"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --watch is used with format", () => {
+                const result = parseCommandLine(["format", "--watch"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --view is used with format", () => {
+                const result = parseCommandLine(["format", "--view"]);
+                expect(result).toMatch({ kind: "error" });
+            });
         });
         describe("snapshot command", () => {
             it("should parse basic snapshot command", () => {
@@ -153,41 +219,41 @@ describe("command_line_parser", () => {
                     root: "path/to/dir",
                 });
             });
-            it("should return error if unknown subcommand is used with snapshot", () => {
+            it("should return error if positional argument is used with snapshot", () => {
                 const result = parseCommandLine(["snapshot", "build"]);
                 expect(result).toMatch({ kind: "error" });
             });
-            it("should parse snapshot with check subcommand", () => {
-                const result = parseCommandLine(["snapshot", "check"]);
+            it("should parse snapshot with --ci option", () => {
+                const result = parseCommandLine(["snapshot", "--ci"]);
                 expect(result).toMatch({
                     kind: "snapshot",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
-            it("should parse snapshot with view subcommand", () => {
-                const result = parseCommandLine(["snapshot", "view"]);
+            it("should parse snapshot with --view option", () => {
+                const result = parseCommandLine(["snapshot", "--view"]);
                 expect(result).toMatch({
                     kind: "snapshot",
                     subcommand: "view",
                 });
             });
-            it("should parse snapshot with check and --root option", () => {
+            it("should parse snapshot with --ci and --root option", () => {
                 const result = parseCommandLine([
                     "snapshot",
-                    "check",
+                    "--ci",
                     "--root",
                     "path/to/dir",
                 ]);
                 expect(result).toMatch({
                     kind: "snapshot",
                     root: "path/to/dir",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
-            it("should parse snapshot with view and -r option", () => {
+            it("should parse snapshot with --view and -r option", () => {
                 const result = parseCommandLine([
                     "snapshot",
-                    "view",
+                    "--view",
                     "-r",
                     "path/to/dir",
                 ]);
@@ -197,6 +263,51 @@ describe("command_line_parser", () => {
                     subcommand: "view",
                 });
             });
+            it("should return error if both --ci and --view are used with snapshot", () => {
+                const result = parseCommandLine(["snapshot", "--ci", "--view"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should parse snapshot with --dry-run option", () => {
+                const result = parseCommandLine(["snapshot", "--dry-run"]);
+                expect(result).toMatch({
+                    kind: "snapshot",
+                    subcommand: "dry-run",
+                });
+            });
+            it("should parse snapshot with --dry-run and --root option", () => {
+                const result = parseCommandLine([
+                    "snapshot",
+                    "--dry-run",
+                    "--root",
+                    "path/to/dir",
+                ]);
+                expect(result).toMatch({
+                    kind: "snapshot",
+                    root: "path/to/dir",
+                    subcommand: "dry-run",
+                });
+            });
+            it("should return error if both --ci and --dry-run are used with snapshot", () => {
+                const result = parseCommandLine(["snapshot", "--ci", "--dry-run"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if both --dry-run and --view are used with snapshot", () => {
+                const result = parseCommandLine(["snapshot", "--dry-run", "--view"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if all three options are used with snapshot", () => {
+                const result = parseCommandLine([
+                    "snapshot",
+                    "--ci",
+                    "--dry-run",
+                    "--view",
+                ]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --watch is used with snapshot", () => {
+                const result = parseCommandLine(["snapshot", "--watch"]);
+                expect(result).toMatch({ kind: "error" });
+            });
         });
         describe("init command", () => {
             it("should parse basic init command", () => {
@@ -217,10 +328,26 @@ describe("command_line_parser", () => {
                     root: "path/to/dir",
                 });
             });
-            it("should return error if unknown subcommand is used with init", () => {
+            it("should return error if positional argument is used with init", () => {
                 const result = parseCommandLine(["init", "template"]);
                 expect(result).toMatch({ kind: "error" });
             });
+            it("should return error if --watch is used with init", () => {
+                const result = parseCommandLine(["init", "--watch"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --dry-run is used with init", () => {
+                const result = parseCommandLine(["init", "--dry-run"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --ci is used with init", () => {
+                const result = parseCommandLine(["init", "--ci"]);
+                expect(result).toMatch({ kind: "error" });
+            });
+            it("should return error if --view is used with init", () => {
+                const result = parseCommandLine(["init", "--view"]);
+                expect(result).toMatch({ kind: "error" });
+            });
         });
         describe("help command", () => {
             it("should return help for help command", () => {
@@ -246,7 +373,7 @@ describe("command_line_parser", () => {
                 expect(result).toMatch({ kind: "error" });
             });
             it("should return error for unexpected positional argument", () => {
-                const result = parseCommandLine(["gen", "watch", "extra-arg"]);
+                const result = parseCommandLine(["gen", "--watch", "extra-arg"]);
                 expect(result).toMatch({ kind: "error" });
             });
             it("should return error for option with missing value at end", () => {
@@ -254,18 +381,18 @@ describe("command_line_parser", () => {
                 expect(result).toMatch({ kind: "error" });
             });
             it("should return error if --watch specified multiple times", () => {
-                const result = parseCommandLine(["gen", "watch", "watch"]);
+                const result = parseCommandLine(["gen", "--watch", "--watch"]);
                 expect(result).toMatch({ kind: "error" });
             });
-            it("should return error if --check specified multiple times", () => {
-                const result = parseCommandLine(["format", "check", "check"]);
+            it("should return error if --ci specified multiple times", () => {
+                const result = parseCommandLine(["format", "--ci", "--ci"]);
                 expect(result).toMatch({ kind: "error" });
             });
         });
         describe("option order", () => {
             it("should parse options in any order for gen", () => {
-                const result1 = parseCommandLine(["gen", "watch", "--root", "dir"]);
-                const result2 = parseCommandLine(["gen", "--root", "dir", "watch"]);
+                const result1 = parseCommandLine(["gen", "--watch", "--root", "dir"]);
+                const result2 = parseCommandLine(["gen", "--root", "dir", "--watch"]);
                 expect(result1).toMatch({
                     kind: "gen",
                     root: "dir",
@@ -278,17 +405,17 @@ describe("command_line_parser", () => {
                 });
             });
             it("should parse options in any order for format", () => {
-                const result1 = parseCommandLine(["format", "check", "--root", "dir"]);
-                const result2 = parseCommandLine(["format", "--root", "dir", "check"]);
+                const result1 = parseCommandLine(["format", "--ci", "--root", "dir"]);
+                const result2 = parseCommandLine(["format", "--root", "dir", "--ci"]);
                 expect(result1).toMatch({
                     kind: "format",
                     root: "dir",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
                 expect(result2).toMatch({
                     kind: "format",
                     root: "dir",
-                    subcommand: "check",
+                    subcommand: "ci",
                 });
             });
         });