@hawkeyexl/manni 4.8.0 → 4.9.0

package/dist/{term-PNWS7F5B.js → term-DL3YFL43.js}

@@ -4,7 +4,7 @@ import {
   renderFormatsJson,
   renderGetJson,
   renderListJson
-} from "./chunk-EOGF6VCA.js";
+} from "./chunk-ND2S5BXB.js";
 import {
   renderFindingsPretty,
   renderFormatsPretty,
@@ -12,7 +12,7 @@ import {
   renderListPretty,
   renderValeWiring,
   renderWritePretty
-} from "./chunk-G4T6SF3C.js";
+} from "./chunk-5LBEQ4ZU.js";
 import {
   FINDING_FORMATS,
   JUNIT_CLASSNAME,
@@ -24,66 +24,80 @@ import {
   runCheck,
   summarize,
   toResults
-} from "./chunk-CHDADR7F.js";
+} from "./chunk-RFSGKF4O.js";
 import {
   LIST_FORMATS,
   runList
-} from "./chunk-GEX2HDAT.js";
+} from "./chunk-23UAGEKP.js";
 import {
   renderFindingsGithub
-} from "./chunk-J3IK5IGO.js";
+} from "./chunk-5EB6RIXJ.js";
 import {
+  DEFAULT_LANGUAGE,
   DITA_HOLDS,
   DOCBOOK_HOLDS,
   LIST_HOLDS,
   MANIFEST_FORMAT,
+  TBX_V3_NAMESPACE,
   TERM_FIELDS,
   TERM_READERS,
   TERM_RULES,
   TERM_WRITE_FORMATS,
   TermError,
   asciidocEntry,
+  conceptGroups,
   displayPath,
   ditaEntry,
   docbookEntry,
+  droppedFields,
+  exportTbxSource,
   extractInput,
   fileOf,
   formatChoice,
   htmlDlEntry,
+  isMultilingual,
+  languageKey,
+  languageOf,
+  lf,
   loadSet,
   loadTerms,
   markdownEntry,
+  mergeFirst,
   plural,
   readerForConstruct,
   reindent,
+  requireShape,
   resolveTermRun,
   rstEntry,
   sharedLanguage,
+  tbxEntryLines,
+  tbxInput,
+  tbxSourceOf,
   valeConfigFor,
   xmlAttribute,
   xmlText
-} from "./chunk-HOE2C42K.js";
+} from "./chunk-YEUQ7OKT.js";
 import "./chunk-77AINBYM.js";
 import "./chunk-IKEWBMCN.js";
-import "./chunk-22G33NL2.js";
+import "./chunk-M6GH3FGJ.js";
 import {
   registerTermLabelSource
-} from "./chunk-AZXCL5WH.js";
+} from "./chunk-IN6DWNVE.js";
 import {
   collect,
   readStdin,
   splitList
-} from "./chunk-KRSLDZ7N.js";
+} from "./chunk-QCCAHV6A.js";
 import {
   OMITTED_WHEN_CLEAN,
   renderJunit,
   renderSarif
-} from "./chunk-ZDYW7XTS.js";
+} from "./chunk-X6WLCNKC.js";
 import {
   STDIN_TOKEN,
   extractorByName,
   extractorForExtension
-} from "./chunk-A36QDIXZ.js";
+} from "./chunk-3XGGF5JW.js";
 import {
   fail
 } from "./chunk-YEUYKR62.js";
@@ -98,7 +112,7 @@ import {
 import "./chunk-QCHVR4ZM.js";
 import {
   package_default
-} from "./chunk-CGO5MNRD.js";
+} from "./chunk-KX5IYIOO.js";
 import "./chunk-OWBRDNRZ.js";
 import {
   errorMessage
@@ -160,39 +174,52 @@ function htmlPage(term) {
   ]);
 }
 
-// src/term/core/writers/render-util.ts
-var DEFAULT_LANGUAGE = "en";
-function droppedFields(terms, held) {
-  const dropped = [];
-  for (const term of terms) {
-    for (const field of TERM_FIELDS) {
-      if (term.record[field] !== void 0 && !held.includes(field)) dropped.push({ id: term.id, field });
-    }
-  }
-  return dropped;
-}
-function requireShape(format, target, shape) {
-  if (target.shape === shape) return;
-  throw new TermError(
-    shape === "file" ? `-f ${format} writes one file, not a directory. Pass -o <file>.` : `-f ${format} writes a styles directory, not a file. Pass -o <styles directory>.`
-  );
-}
-
 // src/term/core/writers/documents.ts
 var UNSAFE_NAME = /[/\\:*?"<>|]/;
 function pagePaths(terms, target, extension) {
+  const multilingual = isMultilingual(terms);
+  const spelling = /* @__PURE__ */ new Map();
   const seen = /* @__PURE__ */ new Set();
   return terms.map((term) => {
     if (UNSAFE_NAME.test(term.id) || term.id === "." || term.id === "..") {
       throw new TermError(`the id "${term.id}" cannot name a file. Give the term an id without path characters.`);
     }
-    if (seen.has(term.id)) {
-      throw new TermError(`two terms have the id "${term.id}", and a directory holds one file per id.`);
+    if (!multilingual) {
+      if (seen.has(term.id)) {
+        throw new TermError(`two terms have the id "${term.id}", and a directory holds one file per id.`);
+      }
+      seen.add(term.id);
+      return join(target.path, `${term.id}${extension}`);
+    }
+    const key = languageKey(term);
+    const language = spelling.get(key) ?? languageOf(term);
+    spelling.set(key, language);
+    if (UNSAFE_NAME.test(language) || language === "." || language === "..") {
+      throw new TermError(
+        `the language "${language}" cannot name a directory. Give the term a language without path characters.`
+      );
     }
-    seen.add(term.id);
-    return join(target.path, `${term.id}${extension}`);
+    if (seen.has(`${key} ${term.id}`)) {
+      throw new TermError(
+        `two terms have the id "${term.id}" in ${language}, and a directory holds one file per id in each language.`
+      );
+    }
+    seen.add(`${key} ${term.id}`);
+    return join(target.path, language, `${term.id}${extension}`);
   });
 }
+function firstLanguage(terms) {
+  const [first] = terms;
+  if (first === void 0 || !isMultilingual(terms)) return { kept: [...terms] };
+  const key = languageKey(first);
+  return {
+    kept: terms.filter((t) => languageKey(t) === key),
+    otherLanguages: {
+      written: languageOf(first),
+      terms: terms.filter((t) => languageKey(t) !== key).map((t) => ({ id: t.id, language: languageOf(t) }))
+    }
+  };
+}
 function documentWriter(spec) {
   const { directory } = spec;
   return {
@@ -210,24 +237,26 @@ function documentWriter(spec) {
         };
       }
       requireShape(spec.format, target, "file");
-      const written = spec.file.needsDefinition ? terms.filter((t) => t.record.definition !== void 0) : terms;
+      const { kept, otherLanguages } = firstLanguage(terms);
+      const written = spec.file.needsDefinition ? kept.filter((t) => t.record.definition !== void 0) : kept;
       return {
         files: [{ path: target.path, content: spec.file.render(written) }],
         removals: [],
         dropped: droppedFields(written, spec.file.holds),
-        skipped: terms.filter((t) => !written.includes(t)).map((t) => t.id)
+        skipped: kept.filter((t) => !written.includes(t)).map((t) => t.id),
+        ...otherLanguages === void 0 ? {} : { otherLanguages }
       };
     }
   };
 }
-function entriesBlock(entries, indent = "") {
-  return entries.flatMap((entry, i) => [
+function entriesBlock(entries2, indent = "") {
+  return entries2.flatMap((entry, i) => [
     ...i === 0 ? [] : [""],
     `${indent}${reindent(entry, indent, "\n")}`
   ]);
 }
-function markupBlock(entries, indent) {
-  return entries.map((entry) => `${indent}${reindent(entry, indent, "\n")}`);
+function markupBlock(entries2, indent) {
+  return entries2.map((entry) => `${indent}${reindent(entry, indent, "\n")}`);
 }
 function textPage(format) {
   return (term) => metadataPage(format, term);
@@ -364,6 +393,18 @@ var DOCUMENT_WRITERS = [
 ];
 
 // src/term/core/writers/csv.ts
+var HOLDS = [
+  "label",
+  "definition",
+  "abstract",
+  "alt-labels",
+  "hidden-labels",
+  "broader",
+  "narrower",
+  "related-terms",
+  "see",
+  "scope-note"
+];
 var LANGUAGE_COLUMNS = [
   ["label", "Term"],
   ["definition", "Definition"],
@@ -382,35 +423,53 @@ var LIST_SEPARATOR = " | ";
 function cell(value) {
   return /[",\r\n]/.test(value) ? `"${value.replaceAll('"', '""')}"` : value;
 }
-function fieldText(term, field) {
-  const value = term.record[field];
+function fieldText(record, field) {
+  const value = record[field];
   if (value === void 0) return "";
   return typeof value === "string" ? value : value.join(LIST_SEPARATOR);
 }
+function rowsOf(terms) {
+  return conceptGroups(terms).flatMap((group) => {
+    const rows = [];
+    for (const term of group) {
+      const row = rows.find((r) => !r.some((t) => languageKey(t) === languageKey(term)));
+      if (row === void 0) rows.push([term]);
+      else row.push(term);
+    }
+    return rows;
+  });
+}
 var csvWriter = {
   format: "csv",
   shapes: ["file"],
-  holds: (_shape) => TERM_FIELDS,
+  holds: (_shape) => HOLDS,
   render(terms, target) {
     requireShape("csv", target, "file");
-    const languages = [];
+    const languages = /* @__PURE__ */ new Map();
     for (const term of terms) {
-      const language = term.language ?? DEFAULT_LANGUAGE;
-      if (!languages.includes(language)) languages.push(language);
+      if (!languages.has(languageKey(term))) languages.set(languageKey(term), languageOf(term));
     }
     const header = [
       "ID",
-      ...languages.flatMap((language) => LANGUAGE_COLUMNS.map(([, name]) => `${name} [${language}]`)),
+      ...[...languages.values()].flatMap((language) => LANGUAGE_COLUMNS.map(([, name]) => `${name} [${language}]`)),
       ...NEUTRAL_COLUMNS.map(([, name]) => name)
     ];
-    const rows = terms.map((term) => {
-      const own = term.language ?? DEFAULT_LANGUAGE;
+    const conflicts = [];
+    const rows = rowsOf(terms).map((row) => {
+      const [first] = row;
+      const id = first?.id ?? "";
+      const neutral = mergeFirst(
+        id,
+        row.map((t) => Object.fromEntries(NEUTRAL_COLUMNS.map(([field]) => [field, t.record[field]])))
+      );
+      conflicts.push(...neutral.conflicts);
       return [
-        term.id,
-        ...languages.flatMap(
-          (language) => LANGUAGE_COLUMNS.map(([field]) => language === own ? fieldText(term, field) : "")
-        ),
-        ...NEUTRAL_COLUMNS.map(([field]) => fieldText(term, field))
+        id,
+        ...[...languages.keys()].flatMap((language) => {
+          const own = row.find((t) => languageKey(t) === language);
+          return LANGUAGE_COLUMNS.map(([field]) => own === void 0 ? "" : fieldText(own.record, field));
+        }),
+        ...NEUTRAL_COLUMNS.map(([field]) => fieldText(neutral.merged, field))
       ];
     });
     const content = [header, ...rows].map((row) => `${row.map(cell).join(",")}
@@ -418,8 +477,9 @@ var csvWriter = {
     return {
       files: [{ path: target.path, content }],
       removals: [],
-      dropped: droppedFields(terms, TERM_FIELDS),
-      skipped: []
+      dropped: droppedFields(terms, HOLDS),
+      skipped: [],
+      ...conflicts.length === 0 ? {} : { conflicts }
     };
   }
 };
@@ -431,7 +491,7 @@ var jsonWriter = {
   holds: (_shape) => TERM_FIELDS,
   render(terms, target) {
     requireShape("json", target, "file");
-    const entries = terms.map((term) => {
+    const entries2 = terms.map((term) => {
       const entry = { id: term.id };
       if (term.language !== void 0) entry["language"] = term.language;
       for (const field of TERM_FIELDS) {
@@ -440,7 +500,7 @@ var jsonWriter = {
       }
       return entry;
     });
-    const content = `${JSON.stringify({ terms: entries }, null, 2)}
+    const content = `${JSON.stringify({ terms: entries2 }, null, 2)}
 `;
     return {
       files: [{ path: target.path, content }],
@@ -452,7 +512,7 @@ var jsonWriter = {
 };
 
 // src/term/core/writers/skos.ts
-var HOLDS = [
+var HOLDS2 = [
   "label",
   "definition",
   "alt-labels",
@@ -511,7 +571,7 @@ function concept(terms, term) {
 var skosWriter = {
   format: "skos",
   shapes: ["file"],
-  holds: (_shape) => HOLDS,
+  holds: (_shape) => HOLDS2,
   render(terms, target) {
     requireShape("skos", target, "file");
     const document = {
@@ -530,82 +590,140 @@ var skosWriter = {
     return {
       files: [{ path: target.path, content }],
       removals: [],
-      dropped: droppedFields(terms, HOLDS),
+      dropped: droppedFields(terms, HOLDS2),
       skipped: []
     };
   }
 };
 
 // src/term/core/writers/tbx.ts
-var HOLDS2 = ["label", "definition", "alt-labels", "hidden-labels"];
-function text(value) {
-  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+var NOT_HELD = ["abstract", "broader", "narrower", "related-terms", "see", "scope-note"];
+var HOLDS3 = TERM_FIELDS.filter((field) => !NOT_HELD.includes(field));
+var LINGUIST_FIELDS = ["register", "reading", "reading-note", "grammatical-number", "transfer-comments"];
+var ENTRY_INDENT = "      ";
+var OWN_HEADER = ["    <fileDesc>", "      <sourceDesc>", "        <p>manni term write</p>", "      </sourceDesc>", "    </fileDesc>"];
+function isLinguist(terms) {
+  return terms.some((t) => (t.record.designations ?? []).some((d) => LINGUIST_FIELDS.some((f) => d[f] !== void 0)));
+}
+function soleSource(terms) {
+  let found;
+  for (const term of terms) {
+    const source = tbxSourceOf(term);
+    if (source === void 0 || found !== void 0 && found.document !== source.document) return void 0;
+    found ??= { document: source.document, file: term.location.file };
+  }
+  return found?.document.body === void 0 ? void 0 : found;
 }
-function attribute(value) {
-  return text(value).replaceAll('"', "&quot;");
+function tbxHeaderFiles(terms) {
+  const files = /* @__PURE__ */ new Map();
+  for (const term of terms) {
+    const source = tbxSourceOf(term);
+    if (source !== void 0 && !files.has(source.document)) files.set(source.document, term.location.file);
+  }
+  return [...files.values()];
+}
+function carried(document, span, indent) {
+  if (span === void 0) return void 0;
+  const raw = lf(document.content.slice(span.start, span.end));
+  if (raw.trim() === "") return void 0;
+  const lines = raw.replace(/^(?:[ \t]*\n)+/, "").replace(/(?:\n[ \t]*)+$/, "").split("\n");
+  const blank = (line) => line.trim() === "";
+  const strip = Math.min(...lines.filter((line) => !blank(line)).map((line) => /^[ \t]*/.exec(line)?.[0].length ?? 0));
+  return lines.map((line) => blank(line) ? "" : `${indent}${line.slice(strip).trimEnd()}`);
+}
+function carriedBack(document, version) {
+  if (document.back === void 0) return [];
+  const [from, to] = version === 3 ? ["refObjectList", "refObjectSec"] : ["refObjectSec", "refObjectList"];
+  const rename = new RegExp(`(</?)${from}(?=[\\s/>])`, "g");
+  const lines = carried(document, document.back, "      ")?.map((line) => line.replace(rename, `$1${to}`));
+  return lines === void 0 ? ["    <back/>"] : ["    <back>", ...lines, "    </back>"];
+}
+function entries(terms, version) {
+  const lines = [];
+  const conflicts = [];
+  for (const group of conceptGroups(terms)) {
+    const [head, ...rest] = group;
+    if (head === void 0) continue;
+    const merge = mergeFirst(
+      head.id,
+      group.map((t) => t.record["concept-entry"]),
+      "concept-entry."
+    );
+    conflicts.push(...merge.conflicts);
+    const { "concept-entry": _concept, ...record } = head.record;
+    const joined = {
+      ...head,
+      record: Object.keys(merge.merged).length === 0 ? record : { ...record, "concept-entry": merge.merged }
+    };
+    const text = tbxEntryLines([joined, ...rest], { version, style: "dca" }).join("\n");
+    lines.push(`${ENTRY_INDENT}${reindent(text, ENTRY_INDENT, "\n")}`);
+  }
+  return { lines, conflicts };
 }
-function tig(designation, status) {
-  return [
-    "          <tig>",
-    `            <term>${text(designation)}</term>`,
-    `            <termNote type="administrativeStatus">${status}</termNote>`,
-    "          </tig>"
-  ];
+function rootOpen(version, terms) {
+  const language = xmlAttribute(terms[0]?.language ?? DEFAULT_LANGUAGE);
+  if (version === 2) return `<martif type="TBX" xml:lang="${language}">`;
+  const type = isLinguist(terms) ? "TBX-Linguist" : "TBX-Basic";
+  return `<tbx type="${type}" style="dca" xml:lang="${language}" xmlns="${TBX_V3_NAMESPACE}">`;
 }
-function termEntry(term) {
-  const { record } = term;
-  return [
-    `      <termEntry id="${attribute(term.id)}">`,
-    ...record.definition === void 0 ? [] : [`        <descrip type="definition">${text(record.definition)}</descrip>`],
-    `        <langSet xml:lang="${attribute(term.language ?? DEFAULT_LANGUAGE)}">`,
-    ...tig(record.label, "preferredTerm-admn-sts"),
-    ...(record["alt-labels"] ?? []).flatMap((label) => tig(label, "admittedTerm-admn-sts")),
-    ...(record["hidden-labels"] ?? []).flatMap((label) => tig(label, "deprecatedTerm-admn-sts")),
-    "        </langSet>",
-    "      </termEntry>"
-  ];
+function tbxWriterFor(format, version) {
+  return {
+    format,
+    shapes: ["file"],
+    holds: (_shape) => HOLDS3,
+    render(terms, target) {
+      requireShape(format, target, "file");
+      const dropped = droppedFields(terms, HOLDS3);
+      const source = soleSource(terms);
+      if (source?.document.version === version) {
+        const exported = exportTbxSource(source.document, source.file, terms);
+        return {
+          files: [{ path: target.path, content: exported.content }],
+          removals: [],
+          dropped,
+          skipped: [],
+          ...exported.conflicts.length === 0 ? {} : { conflicts: exported.conflicts },
+          droppedHeaders: []
+        };
+      }
+      const header = (source === void 0 ? void 0 : carried(source.document, source.document.header, "    ")) ?? OWN_HEADER;
+      const [root, headerTag] = version === 2 ? ["martif", "martifHeader"] : ["tbx", "tbxHeader"];
+      const body = entries(terms, version);
+      const lines = [
+        '<?xml version="1.0" encoding="UTF-8"?>',
+        rootOpen(version, terms),
+        `  <${headerTag}>`,
+        ...header,
+        `  </${headerTag}>`,
+        "  <text>",
+        "    <body>",
+        ...body.lines,
+        "    </body>",
+        ...source === void 0 ? [] : carriedBack(source.document, version),
+        "  </text>",
+        `</${root}>`
+      ];
+      return {
+        files: [{ path: target.path, content: lines.map((line) => `${line}
+`).join("") }],
+        removals: [],
+        dropped,
+        skipped: [],
+        ...body.conflicts.length === 0 ? {} : { conflicts: body.conflicts },
+        droppedHeaders: source === void 0 ? tbxHeaderFiles(terms) : []
+      };
+    }
+  };
 }
-var tbxWriter = {
-  format: "tbx",
-  shapes: ["file"],
-  holds: (_shape) => HOLDS2,
-  render(terms, target) {
-    requireShape("tbx", target, "file");
-    const language = terms[0]?.language ?? DEFAULT_LANGUAGE;
-    const lines = [
-      '<?xml version="1.0" encoding="UTF-8"?>',
-      `<martif type="TBX" xml:lang="${attribute(language)}">`,
-      "  <martifHeader>",
-      "    <fileDesc>",
-      "      <sourceDesc>",
-      "        <p>manni term write</p>",
-      "      </sourceDesc>",
-      "    </fileDesc>",
-      "  </martifHeader>",
-      "  <text>",
-      "    <body>",
-      ...terms.flatMap(termEntry),
-      "    </body>",
-      "  </text>",
-      "</martif>"
-    ];
-    const content = lines.map((line) => `${line}
-`).join("");
-    return {
-      files: [{ path: target.path, content }],
-      removals: [],
-      dropped: droppedFields(terms, HOLDS2),
-      skipped: []
-    };
-  }
-};
+var tbxWriter = tbxWriterFor("tbx", 2);
+var tbx3Writer = tbxWriterFor("tbx3", 3);
 
 // src/term/core/writers/vale.ts
 import { isAbsolute, join as join2, relative, sep } from "node:path";
 import { stringify } from "yaml";
 var VALE_MARKER = "# Generated by manni term write. Edit the terms, not this file.";
 var STYLE = "Terms";
-var HOLDS3 = ["label", "alt-labels", "hidden-labels"];
+var HOLDS4 = ["label", "alt-labels", "hidden-labels"];
 var OWN_FILES = ["Casing", "Lowercase", "SentenceStart", "Deprecated"];
 var REGEX_METACHARACTERS = /[\\^$.|?*+()[\]{}]/g;
 function escapeRegex(value) {
@@ -656,8 +774,8 @@ var Swaps = class {
   }
 };
 var ASCII_WORD = /^[A-Za-z0-9_]$/;
-function bounded(pattern, text2) {
-  const chars = Array.from(text2);
+function bounded(pattern, text) {
+  const chars = Array.from(text);
   const edge = (char) => char !== void 0 && ASCII_WORD.test(char) ? "\\b" : "\\B";
   return `${edge(chars[0])}${pattern}${edge(chars.at(-1))}`;
 }
@@ -698,7 +816,7 @@ function firstLine(content) {
 var valeWriter = {
   format: "vale",
   shapes: ["directory"],
-  holds: (_shape) => HOLDS3,
+  holds: (_shape) => HOLDS4,
   render(terms, target, context) {
     requireShape("vale", target, "directory");
     const termsDir = join2(target.path, STYLE);
@@ -776,12 +894,12 @@ var valeWriter = {
     for (const acronym of acronyms) add(acronym.name, acronym.content);
     const produced = new Set(files.map((f) => relative(termsDir, f.path).toLowerCase()));
     const removals = marked.filter((path) => !produced.has(relative(termsDir, path).toLowerCase())).sort();
-    return { files, removals, dropped: droppedFields(terms, HOLDS3), skipped: [] };
+    return { files, removals, dropped: droppedFields(terms, HOLDS4), skipped: [] };
   }
 };
 
 // src/term/core/writers/interchange.ts
-var INTERCHANGE_WRITERS = [tbxWriter, skosWriter, csvWriter, jsonWriter, valeWriter];
+var INTERCHANGE_WRITERS = [tbxWriter, tbx3Writer, skosWriter, csvWriter, jsonWriter, valeWriter];
 
 // src/term/core/writers/index.ts
 var TERM_WRITERS = [...DOCUMENT_WRITERS, ...INTERCHANGE_WRITERS];
@@ -798,7 +916,8 @@ var DOCUMENT_RENDERS = {
   docbook: { input: "xml", shapes: { file: "docbook-glossary" } }
 };
 var INTERCHANGE_LABELS = {
-  tbx: "TBX v2 Core",
+  tbx: "TBX v2",
+  tbx3: "TBX v3",
   skos: "JSON-LD",
   vale: "style"
 };
@@ -869,7 +988,7 @@ function closestName(query, names) {
 async function runGet(opts) {
   const { set } = await loadTerms(opts);
   const found = findTerm(set.terms, opts.term);
-  if (found !== void 0) return found;
+  if (found !== void 0) return { term: found, others: set.terms.filter((t) => t.id === found.id && t !== found) };
   const nearest = closestName(
     opts.term,
     set.terms.flatMap((t) => [t.id, t.record.label])
@@ -992,9 +1111,9 @@ async function valeLsConfig(opts, spawn = spawnVale) {
     "vale is not on PATH. Install Vale, or pass -o <styles directory>."
   );
   if (result.code !== 0) {
-    const text2 = failureText(result);
-    if (NO_CONFIG.test(text2)) return null;
-    throw new TermError(`vale could not resolve its configuration: ${text2}`);
+    const text = failureText(result);
+    if (NO_CONFIG.test(text)) return null;
+    throw new TermError(`vale could not resolve its configuration: ${text}`);
   }
   const parsed = parseJson(result.stdout, "a configuration");
   if (!isMapping(parsed)) throw new TermError("vale printed a configuration that is not a JSON object.");
@@ -1138,13 +1257,13 @@ function isDirectory(path) {
 }
 var MAX_EXISTING_FILE_BYTES = 1024 * 1024;
 async function filesUnder(dir, into) {
-  let entries;
+  let entries2;
   try {
-    entries = await readdir(dir, { withFileTypes: true });
+    entries2 = await readdir(dir, { withFileTypes: true });
   } catch {
     return;
   }
-  for (const entry of entries) {
+  for (const entry of entries2) {
     const path = join4(dir, entry.name);
     if (entry.isDirectory()) await filesUnder(path, into);
     else if (entry.isFile()) {
@@ -1259,6 +1378,10 @@ async function runWrite(opts) {
     dropped: format === "vale" ? [] : render.dropped,
     droppedFrom: droppedFrom(format, shape, readers),
     skipped: render.skipped,
+    ...render.otherLanguages === void 0 ? {} : { otherLanguages: render.otherLanguages },
+    ...render.conflicts === void 0 ? {} : { conflicts: render.conflicts },
+    // A Vale style is not a termbase, so a header it does not hold is not news either.
+    ...format === "vale" ? {} : { droppedHeaders: render.droppedHeaders ?? tbxHeaderFiles(set.terms) },
     check,
     dryRun,
     ...wiring === void 0 ? {} : { wiring }
@@ -1268,6 +1391,7 @@ function inputFor(content, path, construct, file) {
   if (construct === "manifest") {
     return { content, file, path, format: MANIFEST_FORMAT, metadata: {}, lineFor: () => void 0 };
   }
+  if (construct === "tbx-entry") return tbxInput(content, file, path);
   const extractor = extractorForExtension(extname(path));
   if (extractor === void 0) throw new TermError(`${file}: no reader for its extension.`);
   return extractInput(content, file, path, extractor.name);
@@ -1280,14 +1404,14 @@ function carryRecords(current, edited) {
     return match?.id === entry.id ? { ...entry, record: match.record } : entry;
   });
 }
-function applyInPlace(original, path, file, constructs, readers) {
+function applyInPlace(original, path, file, constructs, readers, conflicts) {
   let content = original;
   let first = true;
   for (const [construct, terms] of constructs) {
     const reader = readerForConstruct(construct, readers);
     if (reader?.apply === void 0) continue;
     const input = inputFor(content, path, construct, file);
-    content = reader.apply(input, first ? terms : carryRecords(reader.read(input).terms, terms));
+    content = reader.apply(input, first ? terms : carryRecords(reader.read(input).terms, terms), conflicts);
     first = false;
   }
   return content;
@@ -1314,6 +1438,7 @@ async function writeInPlace(opts, check, dryRun) {
   }
   const files = [];
   const existing = /* @__PURE__ */ new Map();
+  const conflicts = [];
   for (const [path, { file, constructs }] of byPath) {
     let original;
     try {
@@ -1322,7 +1447,7 @@ async function writeInPlace(opts, check, dryRun) {
       throw new TermError(`${file}: could not be read: ${errorMessage(error)}`);
     }
     existing.set(path, original);
-    files.push({ path, content: applyInPlace(original, path, file, constructs, readers) });
+    files.push({ path, content: applyInPlace(original, path, file, constructs, readers, conflicts) });
   }
   const changes = await applyChanges(files, [], existing, cwd, !check && !dryRun);
   return {
@@ -1332,6 +1457,7 @@ async function writeInPlace(opts, check, dryRun) {
     files: files.map((f) => ({ path: displayPath(f.path, cwd), content: f.content })),
     dropped: [],
     skipped: [],
+    ...conflicts.length === 0 ? {} : { conflicts },
     check,
     dryRun
   };
@@ -1344,12 +1470,13 @@ function cell2(value) {
 }
 function renderListCsv(terms) {
   const rows = [
-    ["id", "label", "alt-labels", "abstract"],
+    ["id", "label", "alt-labels", "abstract", "language"],
     ...terms.map((t) => [
       t.id,
       t.record.label,
       (t.record["alt-labels"] ?? []).join(LIST_SEPARATOR2),
-      t.record.abstract ?? ""
+      t.record.abstract ?? "",
+      t.language ?? ""
     ])
   ];
   return rows.map((row) => row.map(cell2).join(",")).join("\n");
@@ -1440,30 +1567,30 @@ async function coreOptions(paths, options) {
 function withInputs(command) {
   return command.option("--as <format>", "input format for stdin (-)").option("--ext <list>", "comma-separated extensions for directory walks").option("--exclude <glob>", "glob to exclude; repeatable", collect, []).option("--collection <name>", "configured collection to read; repeatable", collect, []).option("--allow-empty", "treat a missing path, no matched files or no terms as success").option("--no-gitignore", "read files .gitignore covers").option("-c, --config <path>", "path to a manni config file").option("--no-color", "disable colored output");
 }
-function print(text2) {
-  process.stdout.write(`${text2}
+function print(text) {
+  process.stdout.write(`${text}
 `);
 }
 function renderFindings(report, format, options, references2) {
-  let text2;
+  let text;
   switch (format) {
     case "pretty":
-      text2 = renderFindingsPretty(report, { color: colorFor(options), references: references2 });
+      text = renderFindingsPretty(report, { color: colorFor(options), references: references2 });
       break;
     case "json":
-      text2 = renderFindingsJson(report);
+      text = renderFindingsJson(report);
       break;
     case "github":
-      text2 = renderFindingsGithub(report);
+      text = renderFindingsGithub(report);
       break;
     case "sarif":
-      text2 = renderFindingsSarif(report, { onNotice: notice });
+      text = renderFindingsSarif(report, { onNotice: notice });
       break;
     case "junit":
-      text2 = renderFindingsJunit(report);
+      text = renderFindingsJunit(report);
       break;
   }
-  if (text2.length > 0 || !OMITTED_WHEN_CLEAN.has(format)) print(text2);
+  if (text.length > 0 || !OMITTED_WHEN_CLEAN.has(format)) print(text);
   process.exitCode = report.summary.failed > 0 ? 1 : 0;
 }
 function buildProgram() {
@@ -1499,7 +1626,9 @@ function buildProgram() {
     try {
       const format = formatChoice(options.format, GET_FORMATS);
       const found = await runGet({ ...await coreOptions(paths, options), term });
-      print(format === "json" ? renderGetJson(found) : renderGetPretty(found, { color: colorFor(options) }));
+      print(
+        format === "json" ? renderGetJson(found.term) : renderGetPretty(found.term, { color: colorFor(options), others: found.others })
+      );
       process.exitCode = 0;
     } catch (err) {
       fail(err);
@@ -1588,4 +1717,4 @@ export {
   TermError,
   buildProgram
 };
-//# sourceMappingURL=term-PNWS7F5B.js.map
+//# sourceMappingURL=term-DL3YFL43.js.map