intor-cli 0.0.9 → 0.0.11

package/src/core/infer-schema/utils/infer-object.ts

@@ -1,5 +1,6 @@
 import type { InferNode } from "../types";
 import type { MessageObject, MessageValue } from "intor";
+import { shouldSkipKey } from "./should-skip-key";
 
 /**
  * Infer an object-like semantic node by aggregating inferred children.
@@ -8,13 +9,17 @@ import type { MessageObject, MessageValue } from "intor";
  * - Prunes branches without semantic meaning
  * - Returns `none` if no children remain
  */
+
 export function inferObject(
   value: MessageObject,
   inferChild: (value: MessageValue) => InferNode,
+  mode: "messages" | "replacements" | "rich",
 ): InferNode {
   const properties: Record<string, InferNode> = {};
 
   for (const [key, val] of Object.entries(value)) {
+    if (shouldSkipKey(key, mode)) continue;
+
     const child = inferChild(val);
 
     // Skip branches without semantic meaning
@@ -23,10 +28,7 @@ export function inferObject(
     properties[key] = child;
   }
 
-  // No inferred children => no semantic result
-  if (Object.keys(properties).length === 0) {
-    return { kind: "none" };
-  }
-
-  return { kind: "object", properties };
+  return Object.keys(properties).length === 0
+    ? { kind: "none" }
+    : { kind: "object", properties };
 }

package/src/core/infer-schema/utils/should-skip-key.ts

@@ -0,0 +1,15 @@
+/**
+ * Determine whether a message object key should be ignored during schema inference.
+ *
+ * - Internal Intor metadata keys (`__intor_*`) are never part of semantic schemas
+ * - Markdown payload (`content`) is only meaningful in Messages schema,
+ *   and must be excluded from Replacements / Rich inference
+ */
+export function shouldSkipKey(
+  key: string,
+  mode: "messages" | "replacements" | "rich",
+) {
+  if (key.startsWith("__intor_")) return true;
+  if (mode !== "messages" && key === "content") return true;
+  return false;
+}

package/src/core/infer-schema/utils/strip-internal-keys.ts

@@ -0,0 +1,30 @@
+import { INTOR_PREFIX } from "intor";
+
+/**
+ * Remove internal Intor keys from inferred schema objects.
+ *
+ * This runs after schema inference to avoid leaking
+ * internal metadata into generated types.
+ */
+export function stripInternalKeys(target: unknown): void {
+  if (!target || typeof target !== "object") return;
+
+  // Handle arrays explicitly
+  if (Array.isArray(target)) {
+    for (const item of target) {
+      stripInternalKeys(item);
+    }
+    return;
+  }
+
+  const record = target as Record<string, unknown>;
+
+  for (const key of Object.keys(record)) {
+    if (key.startsWith(INTOR_PREFIX)) {
+      delete record[key];
+      continue;
+    }
+
+    stripInternalKeys(record[key]);
+  }
+}

package/src/features/check/check.ts

@@ -1,15 +1,10 @@
 /* eslint-disable unicorn/no-process-exit */
-import type { ReadGeneratedSchemaOptions } from "../../core";
-import type { ExtractUsagesOptions } from "../../core/extract-usages/extract-usages";
-import {
-  readGeneratedSchema,
-  extractUsages,
-  collectDiagnostics,
-  groupDiagnostics,
-} from "../../core";
-import { printTitle } from "../../features/print-title";
+import type { ExtractUsagesOptions } from "../../core";
+import { extractUsages, readSchema } from "../../core";
+import { printTitle } from "../print";
 import { spinner } from "../spinner";
 import { dedupePreKeyUsages } from "./dedupe-pre-key-usages";
+import { collectDiagnostics, groupDiagnostics } from "./diagnostics";
 import { printSummary } from "./print-summary";
 
 function resolveConfigKey(
@@ -21,18 +16,15 @@ function resolveConfigKey(
   return usageConfigKey;
 }
 
-export async function check(
-  readOptions?: ReadGeneratedSchemaOptions,
-  extractOptions?: ExtractUsagesOptions,
-) {
-  printTitle("Checking intor diagnostics");
+export async function check(extractOptions?: ExtractUsagesOptions) {
+  printTitle("Checking intor usages");
   spinner.start();
 
   try {
     // -----------------------------------------------------------------------
     // Read generated schema
     // -----------------------------------------------------------------------
-    const generatedSchema = await readGeneratedSchema(readOptions);
+    const generatedSchema = await readSchema();
 
     // -----------------------------------------------------------------------
     // Extract usages

package/src/{core → features/check}/diagnostics/collect.ts

@@ -1,6 +1,5 @@
 import type { Diagnostic } from "./types";
-import type { ExtractedUsages } from "../extract-usages";
-import type { InferredSchemas } from "../infer-schema/types";
+import type { ExtractedUsages, InferredSchemas } from "../../../core";
 import { enforceMissingReplacements } from "./rules/enforce-missing-replacements";
 import { enforceMissingRich } from "./rules/enforce-missing-rich";
 import { keyEmpty, keyNotFound } from "./rules/key";

package/src/{core → features/check}/diagnostics/rules/enforce-missing-replacements.ts

@@ -1,5 +1,4 @@
-import type { KeyUsage, ReplacementUsage } from "../../extract-usages";
-import type { InferNode } from "../../infer-schema";
+import type { KeyUsage, ReplacementUsage, InferNode } from "../../../../core";
 import type { Diagnostic } from "../types";
 import { DIAGNOSTIC_MESSAGES } from "../messages";
 import { getSchemaNodeAtPath } from "../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/enforce-missing-rich.ts

@@ -1,5 +1,4 @@
-import type { KeyUsage, RichUsage } from "../../extract-usages";
-import type { InferNode } from "../../infer-schema";
+import type { KeyUsage, RichUsage, InferNode } from "../../../../core";
 import type { Diagnostic } from "../types";
 import { DIAGNOSTIC_MESSAGES } from "../messages";
 import { getSchemaNodeAtPath } from "../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/key/empty.ts

@@ -1,4 +1,4 @@
-import type { KeyUsage } from "../../../extract-usages";
+import type { KeyUsage } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 

package/src/{core → features/check}/diagnostics/rules/key/not-found.ts

@@ -1,5 +1,4 @@
-import type { KeyUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { KeyUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/pre-key/not-found.ts

@@ -1,5 +1,4 @@
-import type { PreKeyUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { PreKeyUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/replacement/missing.ts

@@ -1,5 +1,4 @@
-import type { ReplacementUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { ReplacementUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/replacement/not-allowed.ts

@@ -1,5 +1,4 @@
-import type { ReplacementUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { ReplacementUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/replacement/unused.ts

@@ -1,5 +1,4 @@
-import type { ReplacementUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { ReplacementUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/rich/missing.ts

@@ -1,5 +1,4 @@
-import type { RichUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { RichUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/rich/not-allowed.ts

@@ -1,5 +1,4 @@
-import type { RichUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { RichUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/rules/rich/unused.ts

@@ -1,5 +1,4 @@
-import type { RichUsage } from "../../../extract-usages";
-import type { InferNode } from "../../../infer-schema";
+import type { RichUsage, InferNode } from "../../../../../core";
 import type { Diagnostic } from "../../types";
 import { DIAGNOSTIC_MESSAGES } from "../../messages";
 import { getSchemaNodeAtPath } from "../../utils/get-schema-node-at-path";

package/src/{core → features/check}/diagnostics/types.ts

@@ -1,4 +1,4 @@
-import type { TranslatorFactory, TranslatorMethod } from "../extract-usages";
+import type { TranslatorFactory, TranslatorMethod } from "../../../core";
 
 export interface Diagnostic {
   severity: "error" | "warn";

package/src/{core → features/check}/diagnostics/utils/get-schema-node-at-path.ts

@@ -1,4 +1,4 @@
-import type { InferNode } from "../../infer-schema";
+import type { InferNode } from "../../../../core";
 
 /**
  * Resolve a dot-separated key path to a schema node.

package/src/{core → features/check}/diagnostics/utils/index-usages-by-key.ts

@@ -1,4 +1,4 @@
-import type { TranslatorMethod } from "../../extract-usages";
+import type { TranslatorMethod } from "../../../../core";
 import { resolveKeyPath } from "./resolve-key-path";
 
 /**

package/src/features/check/print-summary.ts

@@ -1,28 +1,28 @@
-import type { DiagnosticGroup } from "../../core/diagnostics/types";
-import pc from "picocolors";
+import type { DiagnosticGroup } from "./diagnostics/types";
+import { br, dim, printList, cyan, print, gray } from "../print";
 
 export function printSummary(configId: string, grouped: DiagnosticGroup[]) {
-  // Log header
-  console.log(pc.dim("Config:"), pc.cyan(`${configId}\n`));
+  print(`${dim("Config:")} ${cyan(configId)}`);
+  br();
 
-  // Log no issues
+  // No issues
   if (grouped.length === 0) {
-    console.log(pc.dim("✔ Diagnostics completed with no issues.\n"));
+    print(dim("✔ All usages are valid\n"), 1);
     return;
   }
 
-  // Log problems
+  // Problems
   for (const group of grouped) {
     const { factory, method, messageKey, problems, file, lines } = group;
 
-    const header = `${messageKey} ${`(${method ?? factory})`}\n`;
+    const header = `${messageKey} (${method ?? factory})`;
 
-    const problemsLine = [
-      ...problems.map((p) => pc.gray(`   - ${p}`)),
-      pc.dim(`   ➜ ${file}:${lines.join(",")}`),
-      "",
-    ].join("\n");
-
-    console.log(header + problemsLine);
+    print(header, 1);
+    printList(
+      null,
+      problems.map((p) => gray(p)),
+      1,
+    );
+    print(dim(`  ⚲ ${file}:${lines.join(",")}\n`), 1);
   }
 }

package/src/features/generate/generate.ts

@@ -1,15 +1,17 @@
 /* eslint-disable unicorn/no-process-exit */
 import type { ExtraExt } from "../../core";
+import path from "node:path";
 import { buildTypes, buildSchemas, type BuildInput } from "../../build";
 import {
   discoverConfigs,
   collectRuntimeMessages,
   inferSchemas,
-  writeGeneratedFiles,
+  writeTypes,
+  writeSchema,
+  DEFAULT_OUT_DIR,
 } from "../../core";
-import { printTitle } from "../print-title";
+import { cyan, dim, print, printTitle } from "../print";
 import { spinner } from "../spinner";
-import { printConfigs } from "./print-configs";
 import { printOverrides } from "./print-overrides";
 import { printSummary } from "./print-summary";
 
@@ -35,7 +37,7 @@ export async function generate({
     const configEntries = await discoverConfigs(debug);
     if (configEntries.length === 0) {
       spinner.stop();
-      throw new Error("No Intor config found for type generation.");
+      throw new Error("No Intor config found.");
     }
 
     // -----------------------------------------------------------------------
@@ -46,13 +48,18 @@ export async function generate({
     // Runtime mode - Per-config processing
     for (const { config, filePath } of configEntries) {
       const { id, supportedLocales: locales } = config;
-      printConfigs(id, filePath);
+
+      spinner.stop();
+      print(`${dim("Config:")} ${cyan(config.id)}  ${dim(`⚲ ${filePath}`)}`);
+      spinner.start();
+
       const { messages, overrides } = await collectRuntimeMessages(
         config,
         config.defaultLocale,
         exts,
         customReaders,
       );
+
       printOverrides(overrides);
       const schemas = inferSchemas(messages[config.defaultLocale]);
       buildInputs.push({ id, locales, schemas });
@@ -64,11 +71,12 @@ export async function generate({
     const types = buildTypes(buildInputs);
     const schema = buildSchemas(buildInputs);
 
-    // Write generated files
-    const { outDir } = await writeGeneratedFiles({ types, schema });
+    // Write files
+    await writeTypes(types);
+    await writeSchema(schema);
 
     spinner.stop();
-    printSummary(outDir, performance.now() - start);
+    printSummary(path.resolve(DEFAULT_OUT_DIR), performance.now() - start);
   } catch (error) {
     spinner.stop();
     console.error(error instanceof Error ? error.message : String(error));

package/src/features/generate/print-configs.ts

@@ -1,8 +1,8 @@
-import pc from "picocolors";
+import { cyan, dim, print } from "../print";
 import { spinner } from "../spinner";
 
-export function printConfigs(id: string, filePath: string) {
+export function printConfigs(configId: string, filePath: string) {
   spinner.stop();
-  console.log(pc.dim("- Config ") + pc.cyan(id) + pc.dim(` ${filePath}`));
+  print(`${dim("Config:")} ${cyan(configId)}  ⚲ ${filePath}`);
   spinner.start();
 }

package/src/features/generate/print-overrides.ts

@@ -1,44 +1,62 @@
 import type { MergeOverrides } from "../../core/collect-messages/types";
-import pc from "picocolors";
+import { dim, gray, print, br } from "../print";
 import { spinner } from "../spinner";
 
 export function printOverrides(overrides: MergeOverrides[]) {
-  const printable = overrides.filter(
-    (o) =>
-      o.kind === "override" &&
-      (typeof o.prev === "string" || typeof o.next === "string"),
-  );
-  if (printable.length === 0) return;
+  // Group overrides by layer
+  const grouped = groupOverrides(overrides);
+
+  const hasAny =
+    grouped.client_over_server.length > 0 ||
+    grouped.runtime_over_static.length > 0;
+  if (!hasAny) return;
 
   spinner.stop();
 
-  console.log(pc.dim("   ↳ Overrides"));
+  // Print title
+  print(dim("Overrides:"), 1);
 
-  // Print deduplicated override entries
-  for (const { kind, layer, path, prev, next } of overrides) {
-    if (kind === "add") continue;
+  // Print layer group
+  printLayerGroup("client > server", grouped.client_over_server);
+  printLayerGroup("runtime > static", grouped.runtime_over_static);
+
+  br();
+  spinner.start();
+}
 
-    console.log(
-      pc.dim("     - ") + pc.dim(`(${formatLayer(layer)}) `) + pc.gray(path),
-      formatDiff(prev, next),
-    );
+function groupOverrides(overrides: MergeOverrides[]) {
+  const groups: Record<MergeOverrides["layer"], MergeOverrides[]> = {
+    client_over_server: [],
+    runtime_over_static: [],
+  };
+  for (const o of overrides) {
+    if (o.kind !== "override") continue;
+    if (typeof o.prev !== "string" && typeof o.next !== "string") continue;
+    groups[o.layer].push(o);
   }
+  return groups;
+}
 
-  console.log();
-  spinner.start();
+function printLayerGroup(label: string, items: MergeOverrides[]) {
+  if (items.length === 0) return;
+  print(dim(label), 2);
+  for (const { path, prev, next } of items) {
+    print(`- ${path} ${formatDiff(prev, next)}`, 3);
+  }
 }
 
-function formatLayer(layer: "client_over_server" | "runtime_over_static") {
-  if (layer === "client_over_server") return "client > server";
-  return "runtime > static";
+const MAX_PREVIEW_LENGTH = 16;
+function truncate(value: unknown, max = MAX_PREVIEW_LENGTH): string {
+  if (typeof value !== "string") return "";
+  if (value.length <= max) return value;
+  return value.slice(0, max) + "…";
 }
 
-function formatDiff(prev: unknown, next: unknown): string | undefined {
-  if (typeof prev !== "string" && typeof next !== "string") return;
+function formatDiff(prev: unknown, next: unknown) {
   return (
-    pc.dim("| Prev: ") +
-    pc.gray(typeof prev === "string" ? prev : "") +
-    pc.dim(", Next: ") +
-    pc.gray(typeof next === "string" ? next : "")
+    dim("| Prev: ") +
+    gray(truncate(prev)) +
+    dim(" → Next: ") +
+    gray(truncate(next))
   );
 }

package/src/features/generate/print-summary.ts

@@ -1,18 +1,26 @@
-import pc from "picocolors";
+import { bold, br, dim, gray, green, italic, print } from "../print";
 
-const label = (text: string) => pc.dim(text.padEnd(18));
+const label = (text: string) => dim(text.padEnd(18));
 
 export function printSummary(outDir: string, ms: number) {
-  console.log();
-  console.log(pc.green(pc.bold("✔ intor generate completed")));
-  console.log();
-  console.log(label("Output directory: ") + pc.gray(outDir));
-  console.log(label("Time elapsed: ") + pc.gray(`${(ms / 1000).toFixed(2)}s`));
-  console.log();
-  console.log(
-    pc.dim("💡 Remember to include ") +
-      pc.gray(".intor/**/*.d.ts") +
-      pc.dim(" in your tsconfig.json "),
+  br();
+
+  print(green(bold("✔ intor generate completed")));
+
+  br();
+
+  print(label("Output directory: ") + gray(outDir));
+  print(label("Time elapsed: ") + gray(`${(ms / 1000).toFixed(2)}s`));
+
+  br();
+
+  print(
+    italic(
+      dim("💡 Remember to include ") +
+        gray(".intor/**/*.d.ts") +
+        dim(" in your tsconfig.json "),
+    ),
   );
-  console.log();
+
+  br();
 }

package/src/features/index.ts

@@ -1,2 +1,3 @@
 export { generate } from "./generate";
 export { check } from "./check";
+export { validate } from "./validate";

package/src/features/print.ts

@@ -0,0 +1,43 @@
+import pc from "picocolors";
+
+export const dim = pc.dim;
+export const cyan = pc.cyan;
+export const green = pc.green;
+export const bold = pc.bold;
+export const italic = pc.italic;
+export const gray = pc.gray;
+
+const INDENT = "  ";
+
+export function print(text = "", indentLevel = 0) {
+  if (!text) return;
+  console.log(INDENT.repeat(indentLevel) + text);
+}
+
+export function br(count = 1) {
+  for (let i = 0; i < count; i++) console.log();
+}
+
+export function printTitle(title: string) {
+  console.log();
+  console.log(pc.bgBlack(` • ${title} `));
+  console.log();
+}
+
+export function printList(
+  title: string | null,
+  items: readonly string[],
+  indentLevel = 0,
+) {
+  if (items.length === 0) return;
+  if (title) print(title, indentLevel);
+  for (const value of items) {
+    print(`- ${value}`, indentLevel + 1);
+  }
+}
+
+export function printMissingSchema(configId: string) {
+  print(`${dim("Config:")} ${cyan(configId)}`);
+  print(dim("✖ Missing schema: run `intor generate` and retry"), 1);
+  br();
+}

package/src/features/validate/index.ts

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

package/src/features/validate/messages/index.ts

@@ -0,0 +1 @@
+export { validateMessagesSchema } from "./validate-messages-schema";

package/src/features/validate/messages/validate-messages-schema.ts

@@ -0,0 +1,36 @@
+import type { InferNode } from "../../../core";
+import type { ValidationResult } from "../validate-locale-messages";
+import type { MessageObject } from "intor";
+
+export function validateMessagesSchema(
+  schema: InferNode,
+  messages: MessageObject,
+  path: string,
+  result: ValidationResult,
+) {
+  // Only object schemas define required message keys
+  if (schema.kind !== "object") return;
+
+  // Traverse schema-defined keys and validate message presence
+  for (const key of Object.keys(schema.properties)) {
+    const nextPath = path ? `${path}.${key}` : key;
+    const expected = schema.properties[key];
+    const value = messages[key];
+
+    // Schema requires this key, but message does not provide it
+    if (value === undefined) {
+      result.missingKeys.push(nextPath);
+      continue;
+    }
+
+    // Recurse into nested message objects
+    if (typeof value === "object" && value !== null) {
+      validateMessagesSchema(
+        expected,
+        value as MessageObject,
+        nextPath,
+        result,
+      );
+    }
+  }
+}