intor-cli 0.0.10 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-cli",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "📟 CLI tool for intor",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor-cli#readme",

package/src/build/build-types/build-types.ts

@@ -1,5 +1,6 @@
 import type { BuildInput } from "../types";
 import { appendHeader, appendConfigBlock, appendFooter } from "./output";
+import { normalizeRichInferNode } from "./utils/normalize-rich-infer-node";
 import { renderInferNode } from "./utils/render-infer-node";
 
 const GENERATED_INTERFACE_NAME = "IntorGeneratedTypes";
@@ -18,7 +19,9 @@ export function buildTypes(inputs: BuildInput[]): string {
     const localesType = input.locales.map((l) => `"${l}"`).join(" | ");
     const messagesType = renderInferNode(input.schemas.messagesSchema);
     const replacementsType = renderInferNode(input.schemas.replacementsSchema);
-    const richType = renderInferNode(input.schemas.richSchema);
+    const richType = renderInferNode(
+      normalizeRichInferNode(input.schemas.richSchema),
+    );
 
     if (index === 0) {
       appendConfigBlock(lines, {

package/src/build/build-types/utils/normalize-rich-infer-node.ts

@@ -0,0 +1,40 @@
+import type { InferNode } from "../../../core";
+
+/**
+ * Normalize inferred rich schema before type emission.
+ *
+ * Rich schema normalization rules:
+ *
+ * - `none` means: the tag exists but has no nested structure
+ *   → normalize to `record` so it emits `Record<string, never>`
+ *   → this preserves tag presence while preventing arbitrary indexing
+ *
+ * - `object` nodes are recursively normalized
+ *
+ * This normalization is required to keep rich tag autocompletion working.
+ */
+export function normalizeRichInferNode(node: InferNode): InferNode {
+  // Leaf rich tag: presence marker only
+  if (node.kind === "none") {
+    return {
+      kind: "record",
+    };
+  }
+
+  // Recursively normalize nested rich tag trees
+  if (node.kind === "object") {
+    return {
+      kind: "object",
+      properties: Object.fromEntries(
+        Object.entries(node.properties).map(([key, child]) => [
+          key,
+          normalizeRichInferNode(child),
+        ]),
+      ),
+    };
+  }
+
+  // Other kinds should not appear in rich schema,
+  // but are passed through defensively
+  return node;
+}

package/src/build/build-types/utils/render-infer-node.ts

@@ -13,7 +13,9 @@ export function renderInferNode(node: InferNode, indentLevel = 4): string {
       return `${renderInferNode(node.element, indentLevel)}[]`;
     }
     case "record": {
-      return "Record<string, unknown>";
+      // Rich leaf nodes must be non-indexable to preserve
+      // key narrowing and autocomplete behavior
+      return "Record<string, never>";
     }
     case "object": {
       return `{

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/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]);