intor-cli 0.0.11 → 0.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "intor-cli",
-  "version": "0.0.11",
-  "description": "📟 CLI tool for intor",
+  "version": "0.0.13",
+  "description": "The Intor CLI",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor-cli#readme",
   "repository": {
@@ -39,8 +39,10 @@
     "intor": "src/cli/index.ts"
   },
   "dependencies": {
-    "@intor/reader-md": "0.1.4",
-    "@intor/reader-yaml": "0.1.1",
+    "@intor/reader-json5": "^0.1.0",
+    "@intor/reader-md": "^0.1.4",
+    "@intor/reader-toml": "^0.1.0",
+    "@intor/reader-yaml": "^0.1.1",
     "cac": "6.7.14",
     "fast-glob": "3.3.3",
     "intor": "2.3.26",

package/src/cli/commands/generate.ts

@@ -13,6 +13,10 @@ export function registerGenerateCommand(cli: CAC) {
     // -----------------------------------------------------------------------
     // Option
     // -----------------------------------------------------------------------
+    .option(
+      "--messages <path>",
+      "Explicit messages file for schema generation (bypass runtime loader)",
+    )
     .option(
       "--ext <ext>",
       "Enable extra messages file extension (repeatable)",
@@ -32,7 +36,8 @@ export function registerGenerateCommand(cli: CAC) {
     // Action
     // -----------------------------------------------------------------------
     .action(async (options) => {
-      const { ext, reader, debug } = options as {
+      const { messages, ext, reader, debug } = options as {
+        messages?: string;
         ext?: Array<ExtraExt>;
         reader?: string[];
         debug?: boolean;
@@ -41,7 +46,12 @@ export function registerGenerateCommand(cli: CAC) {
       const { exts, customReaders } = normalizeReaderOptions({ ext, reader });
 
       try {
-        await generate({ exts, customReaders, debug });
+        await generate({
+          messageFilePath: messages,
+          exts,
+          customReaders,
+          debug,
+        });
       } catch (error) {
         console.error(error);
         process.exitCode = 1;

package/src/core/collect-messages/readers.ts

@@ -1,11 +1,15 @@
 import type { ExtraExt } from "../../core/constants";
 import type { MessagesReader, MessagesReaders } from "intor";
+import { json5Reader } from "@intor/reader-json5";
 import { mdReader } from "@intor/reader-md";
+import { tomlReader } from "@intor/reader-toml";
 import { yamlReader } from "@intor/reader-yaml";
 
 export const BUILTIN_READERS: Record<ExtraExt, MessagesReader> = {
   md: mdReader,
   yaml: yamlReader,
+  toml: tomlReader,
+  json5: json5Reader,
 };
 
 export const getBuiltInReaders = (

package/src/core/constants/extra-exts.ts

@@ -1,2 +1,2 @@
-export const EXTRA_EXTS = ["md", "yaml"] as const;
+export const EXTRA_EXTS = ["md", "yaml", "toml", "json5"] as const;
 export type ExtraExt = (typeof EXTRA_EXTS)[number];

package/src/features/generate/generate.ts

@@ -1,5 +1,8 @@
 /* eslint-disable unicorn/no-process-exit */
 import type { ExtraExt } from "../../core";
+import type { MergeOverrides } from "../../core/collect-messages/types";
+import type { LocaleMessages } from "intor";
+import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { buildTypes, buildSchemas, type BuildInput } from "../../build";
 import {
@@ -16,12 +19,14 @@ import { printOverrides } from "./print-overrides";
 import { printSummary } from "./print-summary";
 
 export interface GenerateOptions {
+  messageFilePath?: string;
   exts?: Array<ExtraExt>;
   customReaders?: Record<string, string>;
   debug?: boolean;
 }
 
 export async function generate({
+  messageFilePath,
   exts = [],
   customReaders,
   debug,
@@ -30,6 +35,8 @@ export async function generate({
   spinner.start();
   const start = performance.now();
 
+  const hasTarget = !!messageFilePath;
+
   try {
     // -----------------------------------------------------------------------
     // Discover configs from the current workspace
@@ -53,12 +60,21 @@ export async function generate({
       print(`${dim("Config:")} ${cyan(config.id)}  ${dim(`⚲ ${filePath}`)}`);
       spinner.start();
 
-      const { messages, overrides } = await collectRuntimeMessages(
-        config,
-        config.defaultLocale,
-        exts,
-        customReaders,
-      );
+      let messages: LocaleMessages;
+      let overrides: MergeOverrides[] = [];
+      if (!hasTarget) {
+        const result = await collectRuntimeMessages(
+          config,
+          config.defaultLocale,
+          exts,
+          customReaders,
+        );
+        messages = result.messages;
+        overrides = result.overrides;
+      } else {
+        const content = await readFile(messageFilePath, "utf8");
+        messages = { [config.defaultLocale]: JSON.parse(content) };
+      }
 
       printOverrides(overrides);
       const schemas = inferSchemas(messages[config.defaultLocale]);