intor-cli 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-cli",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "The Intor CLI",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor-cli#readme",
@@ -39,6 +39,7 @@
     "intor": "src/cli/index.ts"
   },
   "dependencies": {
+    "@clack/prompts": "^1.0.0",
     "@intor/reader-json5": "^0.1.0",
     "@intor/reader-md": "^0.1.4",
     "@intor/reader-toml": "^0.1.0",
@@ -64,8 +65,6 @@
     "eslint-plugin-unused-imports": "4.3.0",
     "knip": "5.79.0",
     "prettier": "3.7.4",
-    "remark": "15.0.1",
-    "remark-gfm": "4.0.1",
     "typescript": "5.9.3",
     "typescript-eslint": "8.51.0",
     "vitest": "4.0.16"

package/src/cli/commands/check.ts

@@ -1,33 +1,39 @@
-import type { ExtractUsagesOptions } from "../../core/extract-usages/extract-usages";
+import type { CliOption } from "./options";
 import type { CAC } from "cac";
+import { features } from "../../constants";
 import { check } from "../../features";
+import { options } from "./options";
 
 export function registerCheckCommand(cli: CAC) {
   cli
     // -----------------------------------------------------------------------
     // Command
     // -----------------------------------------------------------------------
-    .command("check", "Validate intor translation usage")
+    .command(features.check.name, features.check.title)
 
     // -----------------------------------------------------------------------
-    // Option
+    // Options
     // -----------------------------------------------------------------------
-    .option(
-      "--tsconfig <path>",
-      "Path to tsconfig.json (default: tsconfig.json)",
-    )
-    .option("--debug", "Enable debug logging")
+    .option(...options.debug)
+    .option(...options.tsconfig)
+    .option(...options.format)
+    .option(...options.output)
 
     // -----------------------------------------------------------------------
     // Action
     // -----------------------------------------------------------------------
-    .action(async (options: ExtractUsagesOptions) => {
-      const { tsconfigPath, debug } = options;
-      try {
-        await check({ tsconfigPath, debug });
-      } catch (error) {
-        console.error(error);
-        process.exitCode = 1;
-      }
-    });
+    .action(
+      async (
+        options: Pick<CliOption, "debug" | "tsconfig" | "format" | "output">,
+      ) => {
+        const { debug, tsconfig, format, output } = options;
+
+        try {
+          await check({ debug, tsconfigPath: tsconfig, format, output });
+        } catch (error) {
+          console.error(error instanceof Error ? error.message : error);
+          process.exitCode = 1;
+        }
+      },
+    );
 }

package/src/cli/commands/discover.ts

@@ -0,0 +1,32 @@
+import type { CliOption } from "./options";
+import type { CAC } from "cac";
+import { features } from "../../constants";
+import { discover } from "../../features";
+import { options } from "./options";
+
+export function registerDiscoverCommand(cli: CAC) {
+  cli
+    // -----------------------------------------------------------------------
+    // Command
+    // -----------------------------------------------------------------------
+    .command(features.discover.name, features.discover.title)
+
+    // -----------------------------------------------------------------------
+    // Options
+    // -----------------------------------------------------------------------
+    .option(...options.debug)
+
+    // -----------------------------------------------------------------------
+    // Action
+    // -----------------------------------------------------------------------
+    .action(async (options: Pick<CliOption, "debug">) => {
+      const { debug } = options;
+
+      try {
+        await discover({ debug });
+      } catch (error) {
+        console.error(error instanceof Error ? error.message : error);
+        process.exitCode = 1;
+      }
+    });
+}

package/src/cli/commands/generate.ts

@@ -1,6 +1,10 @@
-import type { ExtraExt } from "../../core";
+import type { CliOption } from "./options";
 import type { CAC } from "cac";
+import { features } from "../../constants";
 import { generate } from "../../features";
+import { version } from "../version";
+import { options } from "./options";
+import { normalizeMessageFiles } from "./utils/normalize-message-files";
 import { normalizeReaderOptions } from "./utils/normalize-reader-options";
 
 export function registerGenerateCommand(cli: CAC) {
@@ -8,53 +12,44 @@ export function registerGenerateCommand(cli: CAC) {
     // -----------------------------------------------------------------------
     // Command
     // -----------------------------------------------------------------------
-    .command("generate", "Generate intor types and schemas")
+    .command(features.generate.name, features.generate.title)
 
     // -----------------------------------------------------------------------
     // Option
     // -----------------------------------------------------------------------
-    .option(
-      "--messages <path>",
-      "Explicit messages file for schema generation (bypass runtime loader)",
-    )
-    .option(
-      "--ext <ext>",
-      "Enable extra messages file extension (repeatable)",
-      { default: [] },
-    )
-    .option(
-      "--reader <mapping>",
-      "Custom reader mapping in the form <ext=path> (repeatable)",
-      { default: [] },
-    )
-    .option(
-      "--debug",
-      "Print debug information during config discovery and generation",
-    )
+    .option(...options.debug)
+    .option(...options.messageFile)
+    .option(...options.messageFiles)
+    .option(...options.ext)
+    .option(...options.reader)
 
     // -----------------------------------------------------------------------
     // Action
     // -----------------------------------------------------------------------
-    .action(async (options) => {
-      const { messages, ext, reader, debug } = options as {
-        messages?: string;
-        ext?: Array<ExtraExt>;
-        reader?: string[];
-        debug?: boolean;
-      };
+    .action(
+      async (
+        options: Pick<
+          CliOption,
+          "debug" | "messageFile" | "messageFiles" | "ext" | "reader"
+        >,
+      ) => {
+        const { debug, messageFile, messageFiles, ...readerOptions } = options;
 
-      const { exts, customReaders } = normalizeReaderOptions({ ext, reader });
+        const result = normalizeMessageFiles(messageFile, messageFiles);
+        const { exts, customReaders } = normalizeReaderOptions(readerOptions);
 
-      try {
-        await generate({
-          messageFilePath: messages,
-          exts,
-          customReaders,
-          debug,
-        });
-      } catch (error) {
-        console.error(error);
-        process.exitCode = 1;
-      }
-    });
+        try {
+          await generate({
+            debug,
+            messageSource: result,
+            exts,
+            customReaders,
+            toolVersion: version,
+          });
+        } catch (error) {
+          console.error(error instanceof Error ? error.message : error);
+          process.exitCode = 1;
+        }
+      },
+    );
 }

package/src/cli/commands/index.ts

@@ -0,0 +1,4 @@
+export { registerDiscoverCommand } from "./discover";
+export { registerGenerateCommand } from "./generate";
+export { registerCheckCommand } from "./check";
+export { registerValidateCommand } from "./validate";

package/src/cli/commands/options/index.ts

@@ -0,0 +1 @@
+export { options, type CliOptions as CliOption } from "./options";

package/src/cli/commands/options/options.ts

@@ -0,0 +1,55 @@
+import type { CAC } from "cac";
+
+export const options = {
+  debug: ["--debug", "Enable debug logging", { default: false }],
+
+  tsconfig: [
+    "--tsconfig <path>",
+    "Path to tsconfig.json (default: tsconfig.json)",
+  ],
+
+  messageFile: [
+    "--message-file <file>",
+    "Explicit message file for single-config projects",
+  ],
+
+  messageFiles: [
+    "--message-files <mapping...>",
+    "Explicit message file mapping in the form <configId=path> (repeatable)",
+    { default: [] },
+  ],
+
+  ext: [
+    "--ext <ext>",
+    "Enable extra messages file extension (repeatable)",
+    { default: [] },
+  ],
+
+  reader: [
+    "--reader <mapping>",
+    "Custom reader mapping in the form <ext=path> (repeatable)",
+    { default: [] },
+  ],
+
+  format: [
+    "--format <format>",
+    "Output format: human | json",
+    { default: "human" },
+  ],
+
+  output: [
+    "--output <file>",
+    "Write output to file (only applies to json format)",
+  ],
+} as const satisfies Record<string, Parameters<CAC["option"]>>;
+
+export interface CliOptions {
+  debug?: boolean;
+  tsconfig?: string;
+  messageFile?: string;
+  messageFiles?: string[];
+  ext?: string[];
+  reader?: string[];
+  format?: "human" | "json";
+  output?: string;
+}

package/src/cli/commands/utils/normalize-message-files.ts

@@ -0,0 +1,49 @@
+import type { MessageSource } from "../../../features";
+
+/**
+ * Normalize message file CLI options into a MessageSource.
+ */
+export function normalizeMessageFiles(
+  messageFile?: string,
+  messageFiles: string[] = [],
+): MessageSource {
+  if (messageFile && messageFiles.length > 0) {
+    throw new Error(
+      "Cannot use --message-file and --message-files at the same time.",
+    );
+  }
+
+  // --------------------------------------------------
+  // single mode
+  // --------------------------------------------------
+  if (messageFile) {
+    return {
+      mode: "single",
+      file: messageFile,
+    };
+  }
+
+  // --------------------------------------------------
+  // mapping mode
+  // --------------------------------------------------
+  if (messageFiles.length > 0) {
+    const files: Record<string, string> = {};
+
+    for (const messageFile of messageFiles) {
+      const [id, path] = messageFile.split("=", 2);
+      if (!id || !path) {
+        throw new Error(
+          `Invalid --message-files entry: "${messageFile}". Each entry must be in the form: <configId=path>`,
+        );
+      }
+      files[id] = path;
+    }
+
+    return {
+      mode: "mapping",
+      files,
+    };
+  }
+
+  return { mode: "none" };
+}

package/src/cli/commands/utils/normalize-reader-options.ts

@@ -1,46 +1,33 @@
-import type { ExtraExt } from "../../../core";
-
-export interface NormalizedReaderOptions {
-  exts: ExtraExt[];
-  customReaders?: Record<string, string>;
-}
-
-export interface RawReaderOptions {
-  ext?: string | string[];
-  reader?: string[];
-}
+import type { ReaderOptions, ExtraExt } from "../../../core";
+import type { CliOptions } from "../options/options";
 
 /**
- * Normalize CLI reader-related options:
- * - ext: string | string[] → string[]
- * - reader: ["md=./reader.ts"] → { md: "./reader.ts" }
+ * Normalize CLI reader-related options
  */
-export function normalizeReaderOptions(
-  options: RawReaderOptions,
-): NormalizedReaderOptions {
-  // Normalize exts
-  const exts = options.ext
-    ? Array.isArray(options.ext)
-      ? options.ext
-      : [options.ext]
-    : [];
-
+export function normalizeReaderOptions({
+  ext = [],
+  reader = [],
+}: Pick<CliOptions, "ext" | "reader">): ReaderOptions {
   // Normalize custom readers
   let customReaders: Record<string, string> | undefined;
 
-  if (options.reader && options.reader.length > 0) {
+  if (reader && reader.length > 0) {
     customReaders = {};
 
-    for (const item of options.reader) {
+    for (const item of reader) {
       const [key, value] = item.split("=", 2);
-      if (!key || !value) continue;
+      if (!key || !value) {
+        throw new Error(
+          `Invalid --reader entry: "${item}". Each entry must be in the form: <ext=path>`,
+        );
+      }
 
       customReaders[key] = value;
     }
   }
 
   return {
-    exts: exts as ExtraExt[],
+    exts: ext as ExtraExt[],
     customReaders,
   };
 }

package/src/cli/commands/validate.ts

@@ -1,6 +1,8 @@
-import type { ExtraExt } from "../../core";
+import type { CliOptions } from "./options/options";
 import type { CAC } from "cac";
+import { features } from "../../constants";
 import { validate } from "../../features";
+import { options } from "./options";
 import { normalizeReaderOptions } from "./utils/normalize-reader-options";
 
 export function registerValidateCommand(cli: CAC) {
@@ -8,43 +10,37 @@ export function registerValidateCommand(cli: CAC) {
     // -----------------------------------------------------------------------
     // Command
     // -----------------------------------------------------------------------
-    .command("validate", "Validate intor locale translations")
+    .command(features.validate.name, features.validate.title)
 
     // -----------------------------------------------------------------------
     // Option
     // -----------------------------------------------------------------------
-    .option(
-      "--ext <ext>",
-      "Enable extra messages file extension (repeatable)",
-      { default: [] },
-    )
-    .option(
-      "--reader <mapping>",
-      "Custom reader mapping in the form <ext=path> (repeatable)",
-      { default: [] },
-    )
-    .option(
-      "--debug",
-      "Print debug information during config discovery and generation",
-    )
+    .option(...options.debug)
+    .option(...options.ext)
+    .option(...options.reader)
+    .option(...options.format)
+    .option(...options.output)
 
     // -----------------------------------------------------------------------
     // Action
     // -----------------------------------------------------------------------
-    .action(async (options) => {
-      const { ext, reader, debug } = options as {
-        ext?: Array<ExtraExt>;
-        reader?: string[];
-        debug?: boolean;
-      };
+    .action(
+      async (
+        options: Pick<
+          CliOptions,
+          "debug" | "ext" | "reader" | "format" | "output"
+        >,
+      ) => {
+        const { debug, format, output, ...readerOptions } = options;
 
-      const { exts, customReaders } = normalizeReaderOptions({ ext, reader });
+        const { exts, customReaders } = normalizeReaderOptions(readerOptions);
 
-      try {
-        await validate({ exts, customReaders, debug });
-      } catch (error) {
-        console.error(error);
-        process.exitCode = 1;
-      }
-    });
+        try {
+          await validate({ debug, format, output, exts, customReaders });
+        } catch (error) {
+          console.error(error instanceof Error ? error.message : error);
+          process.exitCode = 1;
+        }
+      },
+    );
 }

package/src/cli/index.ts

@@ -1,26 +1,41 @@
 #!/usr/bin/env tsx
 
 import { cac } from "cac";
-import { registerCheckCommand } from "./commands/check";
-import { registerGenerateCommand } from "./commands/generate";
-import { registerValidateCommand } from "./commands/validate";
-
-const cli = cac("intor");
-
-// ---------------------------------------------------------------------
-// Register commands
-// ---------------------------------------------------------------------
-registerGenerateCommand(cli);
-registerCheckCommand(cli);
-registerValidateCommand(cli);
-
-// ---------------------------------------------------------------------
-// Global options / help
-// ---------------------------------------------------------------------
-cli.help();
-cli.version("0.1.10");
-
-// ---------------------------------------------------------------------
-// Parse argv
-// ---------------------------------------------------------------------
-cli.parse();
+import {
+  registerDiscoverCommand,
+  registerGenerateCommand,
+  registerCheckCommand,
+  registerValidateCommand,
+} from "./commands";
+import { run } from "./menu";
+
+const VERSION = "0.1.10";
+
+async function main() {
+  // argv = [node, script, ...args]
+  const args = process.argv.slice(2);
+
+  // -------------------------------------------------------------------
+  // Interactive menu bypasses CAC entirely
+  // -------------------------------------------------------------------
+  if (args.length === 0) {
+    await run();
+    return;
+  }
+
+  // -------------------------------------------------------------------
+  // Command mode (original CAC behavior)
+  // -------------------------------------------------------------------
+  const cli = cac("intor");
+
+  registerDiscoverCommand(cli);
+  registerGenerateCommand(cli);
+  registerCheckCommand(cli);
+  registerValidateCommand(cli);
+
+  cli.help();
+  cli.version(VERSION);
+  cli.parse(process.argv);
+}
+
+await main();

package/src/cli/menu/index.ts

@@ -0,0 +1 @@
+export { run } from "./run";

package/src/cli/menu/prompts/prompt-check.ts

@@ -0,0 +1,74 @@
+import type { CheckOptions } from "../../../features";
+import { text, isCancel, confirm } from "@clack/prompts";
+import {
+  promptMode,
+  promptDebug,
+  printOptionsSummary,
+  promptFormat,
+  promptOutput,
+} from "./shared/shared";
+
+export async function promptCheck(): Promise<CheckOptions | null> {
+  // ------------------------------------------------------------------
+  // Mode
+  // ------------------------------------------------------------------
+  const mode = await promptMode();
+  if (!mode) return null;
+  if (mode === "default") return {};
+
+  const options: CheckOptions = {};
+
+  // ------------------------------------------------------------------
+  // tsconfig path
+  // ------------------------------------------------------------------
+  const useCustomTsconfig = await confirm({
+    message: "Do you want to use a custom tsconfig file?",
+    initialValue: false,
+  });
+  if (isCancel(useCustomTsconfig)) return null;
+
+  if (useCustomTsconfig) {
+    const path = await text({
+      message: "Path to tsconfig file",
+      placeholder: "tsconfig.json",
+      defaultValue: "tsconfig.json",
+    });
+    if (isCancel(path)) return null;
+    options.tsconfigPath = path || undefined;
+  }
+
+  // ------------------------------------------------------------------
+  // Output format
+  // ------------------------------------------------------------------
+  const format = await promptFormat();
+  if (!format) return null;
+  options.format = format;
+
+  // ------------------------------------------------------------------
+  // Output file (only for json)
+  // ------------------------------------------------------------------
+  if (format === "json") {
+    const output = await promptOutput();
+    if (output === null) return null;
+    options.output = output;
+  }
+
+  // ------------------------------------------------------------------
+  // Debug
+  // ------------------------------------------------------------------
+  const debug = await promptDebug();
+  if (debug === null) return null;
+  if (debug) options.debug = true;
+
+  // ------------------------------------------------------------------
+  // Summary
+  // ------------------------------------------------------------------
+  printOptionsSummary("Check options", [
+    ["tsconfig", options.tsconfigPath ?? "tsconfig.json"],
+    ["format", options.format ?? "human"],
+    ["output", options.output ?? "stdout"],
+    ["debug", options.debug ? "on" : "off"],
+  ]);
+
+  return options;
+}

package/src/cli/menu/prompts/prompt-discover.ts

@@ -0,0 +1,25 @@
+import { promptDebug, printOptionsSummary } from "./shared/shared";
+
+export interface DiscoverOptions {
+  debug?: boolean;
+}
+
+export async function promptDiscover(): Promise<DiscoverOptions | null> {
+  const options: DiscoverOptions = {};
+
+  // ------------------------------------------------------------------
+  // Debug
+  // ------------------------------------------------------------------
+  const debug = await promptDebug();
+  if (debug === null) return null;
+  if (debug) options.debug = true;
+
+  // ------------------------------------------------------------------
+  // Summary
+  // ------------------------------------------------------------------
+  printOptionsSummary("Discover options", [
+    ["debug", options.debug ? "on" : "off"],
+  ]);
+
+  return options;
+}