@hawkeyexl/manni 4.4.0 → 4.5.0

package/dist/{chunk-YTCZRLTU.js → chunk-DX32P2DT.js}

@@ -8,7 +8,7 @@ import {
   resolvePages,
   runConfigOptions,
   withExternalMetadata
-} from "./chunk-NWZ2SLYL.js";
+} from "./chunk-7OQAU4EA.js";
 import {
   SUMMARY_FORMATS,
   parseFormat
@@ -93,4 +93,4 @@ export {
   runList,
   renderList
 };
-//# sourceMappingURL=chunk-YTCZRLTU.js.map
+//# sourceMappingURL=chunk-DX32P2DT.js.map

package/dist/{chunk-644JVKJ4.js → chunk-EL2BZTDL.js}

@@ -10,18 +10,21 @@ import {
   documentBase,
   documentSetPatterns,
   emitLocalizations,
+  extractorFor,
   formatOf,
   isLanguageTag,
   isSafeRelativePath,
   mergePage,
+  metadataOf,
+  mintTreeSections,
   openMetaView,
-  ownMetadata,
   parseLocalizations,
+  parseTree,
   resolveDocumentSet,
   routesFrom,
   searchIndexFilename,
   vectorIndexFilename
-} from "./chunk-YIL4XLLJ.js";
+} from "./chunk-K3U5F2QT.js";
 import {
   bundledShapesPath,
   compactIri,
@@ -29,7 +32,7 @@ import {
   loadGraph,
   storeToQuads,
   validateGraph
-} from "./chunk-MYMBCTDE.js";
+} from "./chunk-BOIF2XGG.js";
 import {
   COVERAGE_FIELDS,
   DEFAULT_MODEL,
@@ -69,18 +72,19 @@ import {
   loadRunConfig,
   profileFor,
   withPrefix
-} from "./chunk-M2JCK5F6.js";
+} from "./chunk-B7XUEQF3.js";
 import {
   mergeMetaProvenance
-} from "./chunk-K3D6FPV6.js";
+} from "./chunk-3YHAYXBC.js";
 import {
   isMissing,
   spliceManifestValue
-} from "./chunk-RLR4TKUZ.js";
+} from "./chunk-HVFR66GQ.js";
 import {
+  DocmetaError,
   urlManifestMessage,
   writeFileAtomic
-} from "./chunk-JVTNMVYU.js";
+} from "./chunk-527HHQPS.js";
 import {
   assertKnownProvider,
   assertLocalFlag,
@@ -253,7 +257,7 @@ function emitRdfXml(quads, prefixes) {
 
 // src/graph/core/iirds-package.ts
 import { existsSync } from "node:fs";
-import { resolve } from "node:path";
+import { extname, resolve } from "node:path";
 import { DataFactory } from "n3";
 
 // src/graph/core/zip.ts
@@ -330,6 +334,19 @@ function writeZip(entries) {
 // src/graph/core/iirds-package.ts
 var GRAPH_DOCUMENT = `${NS.graph}Document`;
 var XSD_STRING3 = `${NS.xsd}string`;
+var MEDIA_TYPES = {
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".adoc": "text/asciidoc",
+  ".asciidoc": "text/asciidoc",
+  ".rst": "text/x-rst",
+  ".dita": "application/dita+xml",
+  ".ditamap": "application/dita+xml",
+  ".xml": "application/xml"
+};
+function mediaTypeOf(path2) {
+  return MEDIA_TYPES[extname(path2).toLowerCase()] ?? "text/markdown";
+}
 var CARRIED = [
   IIRDS_HAS_TOPIC_TYPE,
   IIRDS_HAS_SUBJECT,
@@ -390,7 +407,7 @@ function projectPackage(store, opts, cwd) {
       add(doc, IIRDS_HAS_RENDITION, iri(rendition));
       add(rendition, RDF_TYPE, iri(IIRDS_RENDITION));
       add(rendition, IIRDS_SOURCE, lit(zipPath));
-      add(rendition, IIRDS_FORMAT, lit("text/markdown"));
+      add(rendition, IIRDS_FORMAT, lit(mediaTypeOf(path2)));
       contentFiles.push({ zipPath, absPath });
     } else {
       warnings.push(
@@ -720,6 +737,21 @@ var FRONTMATTER = /^---[ \t]*\r?\n(?:[\s\S]*?\r?\n)?(?:---|\.\.\.)[ \t]*(?:\r?\n
 function stripFrontmatter(markdown) {
   return markdown.replace(FRONTMATTER, "");
 }
+function plainText(nodes) {
+  return nodes.map((n) => n.text.replace(/\r\n/g, "\n").trim()).filter((t) => t !== "");
+}
+function treeText(source, path2) {
+  const format = formatOf(path2);
+  if (format === "markdown" || format === "mdx") return void 0;
+  const minted = mintTreeSections(parseTree(source, path2, format).sections);
+  const sections = /* @__PURE__ */ new Map();
+  for (const [n, section] of minted.sections.entries()) {
+    const own = plainText(minted.owned[n] ?? []);
+    sections.set(section.slug, [section.title, ...own].join("\n\n"));
+  }
+  const lead = plainText(minted.unowned);
+  return { doc: lead.length > 0 ? lead.join("\n\n") : void 0, sections };
+}
 function entry(id, type, fields) {
   const out = { id, type };
   if (fields.title !== void 0) out.title = fields.title;
@@ -736,6 +768,7 @@ function buildSearchIndex(graph, cwd, options = {}) {
   });
   const entries = [];
   const sourceOf = /* @__PURE__ */ new Map();
+  const treeTextOf = /* @__PURE__ */ new Map();
   const allSections = graph.instancesOf(GRAPH_SECTION);
   const sectionsOf = /* @__PURE__ */ new Map();
   for (const section of allSections) {
@@ -755,8 +788,10 @@ function buildSearchIndex(graph, cwd, options = {}) {
         `Source not found for ${path2} \u2014 indexed without body text.`
       );
     }
+    const tree = source === void 0 || path2 === void 0 ? void 0 : treeText(source, path2);
+    if (tree) treeTextOf.set(doc, tree);
     const body = source === void 0 ? void 0 : stripFrontmatter(source).replace(/\r\n/g, "\n");
-    const text = body === void 0 ? void 0 : (sectionsOf.get(doc)?.length ?? 0) > 0 ? documentPreamble(body) : body;
+    const text = tree ? tree.doc : body === void 0 ? void 0 : (sectionsOf.get(doc)?.length ?? 0) > 0 ? documentPreamble(body) : body;
     entries.push(
       entry(doc, compactIri(GRAPH_DOCUMENT2), {
         title: graph.literal(doc, DCTERMS_TITLE2),
@@ -779,7 +814,8 @@ function buildSearchIndex(graph, cwd, options = {}) {
       occurrences = sectionOccurrences(graph, doc);
       occurrencesOf.set(doc, occurrences);
     }
-    const text = source !== void 0 && title !== void 0 ? sectionOwnText(source, title, level, occurrences.get(section) ?? 0) : void 0;
+    const tree = treeTextOf.get(doc);
+    const text = tree ? tree.sections.get(section.slice(hash + 1)) : source !== void 0 && title !== void 0 ? sectionOwnText(source, title, level, occurrences.get(section) ?? 0) : void 0;
     entries.push(entry(section, compactIri(GRAPH_SECTION), { title, text }));
   }
   for (const concept of graph.instancesOf(SKOS_CONCEPT)) {
@@ -1243,6 +1279,7 @@ import { resolve as resolve6 } from "node:path";
 
 // src/graph/core/frontmatter-edit.ts
 import { Document, YAMLMap, YAMLSeq, isMap, parseDocument } from "yaml";
+var GRAPH_KEY = "graph";
 function frontmatterKind(content) {
   const body = content.charCodeAt(0) === 65279 ? content.slice(1) : content;
   if (/^---(\r?\n)/.test(body)) return "yaml";
@@ -1286,9 +1323,7 @@ function setField(doc, map, field, value) {
   map.set(field, node);
 }
 function applyGraphFields(content, path2, values, options = {}) {
-  const entries = Object.entries(values).filter(
-    ([, v]) => v !== void 0 && v !== null && !(Array.isArray(v) && v.length === 0)
-  );
+  const entries = writable(values);
   const pageEntries = Object.entries(options.page ?? {});
   if (entries.length === 0 && pageEntries.length === 0) {
     return { content, applied: [], skipped: [] };
@@ -1340,6 +1375,23 @@ function applyGraphFields(content, path2, values, options = {}) {
     doc.set("graph", graph);
   }
   const graphMap = graph ?? doc.createNode({});
+  const { applied, skipped } = mergeFields(doc, graphMap, entries, options.force);
+  for (const [key, value] of pageEntries) {
+    doc.set(key, doc.createNode(value));
+  }
+  if (applied.length === 0 && pageEntries.length === 0) {
+    return { content, applied, skipped };
+  }
+  let newBlock = doc.toString();
+  if (split.eol === "\r\n") newBlock = newBlock.replace(/(?<!\r)\n/g, "\r\n");
+  return { content: split.open + newBlock + split.suffix, applied, skipped };
+}
+function writable(values) {
+  return Object.entries(values).filter(
+    ([, v]) => v !== void 0 && v !== null && !(Array.isArray(v) && v.length === 0)
+  );
+}
+function mergeFields(doc, graphMap, entries, force) {
   const applied = [];
   const skipped = [];
   for (const [field, value] of entries) {
@@ -1364,22 +1416,45 @@ function applyGraphFields(content, path2, values, options = {}) {
       skipped.push(field);
       continue;
     }
-    if (target.has(leaf) && !options.force) {
+    if (target.has(leaf) && !force) {
       skipped.push(field);
       continue;
     }
     setField(doc, target, leaf, value);
     applied.push(field);
   }
-  for (const [key, value] of pageEntries) {
-    doc.set(key, doc.createNode(value));
+  return { applied, skipped };
+}
+function writeGraphFields(content, path2, format, values, options = {}) {
+  if (format === "markdown" || format === "mdx") {
+    return applyGraphFields(content, path2, values, options);
   }
-  if (applied.length === 0 && pageEntries.length === 0) {
-    return { content, applied, skipped };
+  const entries = writable(values);
+  const patch = {};
+  let applied = [];
+  let skipped = [];
+  if (entries.length > 0) {
+    const doc = new Document(
+      metadataOf(content, path2, format).data[GRAPH_KEY] ?? {}
+    );
+    if (!isMap(doc.contents)) {
+      throw new GraphError(`${path2}: metadata key "graph" is not a map`);
+    }
+    ({ applied, skipped } = mergeFields(
+      doc,
+      doc.contents,
+      entries,
+      options.force
+    ));
+    if (applied.length > 0) patch[GRAPH_KEY] = doc.toJS();
   }
-  let newBlock = doc.toString();
-  if (split.eol === "\r\n") newBlock = newBlock.replace(/(?<!\r)\n/g, "\r\n");
-  return { content: split.open + newBlock + split.suffix, applied, skipped };
+  Object.assign(patch, options.page);
+  if (Object.keys(patch).length === 0) return { content, applied, skipped };
+  const apply = extractorFor(format)?.apply;
+  if (apply === void 0) {
+    throw new GraphError(`${path2}: manni cannot write ${format} metadata`);
+  }
+  return { content: apply(content, patch, { filePath: path2 }), applied, skipped };
 }
 function frontmatterData(content) {
   const split = splitYamlFrontmatter(content, "");
@@ -1579,9 +1654,13 @@ var FillGuard = class _FillGuard {
     if (guarded().length === 0) return { values: current, rejected };
     const baseline = await this.baseline();
     while (guarded().length > 0) {
-      const applied = applyGraphFields(content, path2, current, {
-        force: this.force
-      });
+      const applied = writeGraphFields(
+        content,
+        path2,
+        formatOf(path2, this.analyzeOptions.format),
+        current,
+        { force: this.force }
+      );
       const model = analyzeDoc(
         applied.content,
         path2,
@@ -2153,7 +2232,8 @@ async function runFill(opts = {}) {
     ...stdinDocument === void 0 ? {} : { stdinDocument }
   };
   async function fillOne(path2, absPath, content) {
-    if (frontmatterKind(content) === "unsupported") {
+    const pageFormat = formatOf(path2, format);
+    if ((pageFormat === "markdown" || pageFormat === "mdx") && frontmatterKind(content) === "unsupported") {
       throw new GraphError(
         "only YAML frontmatter can be edited (found a TOML/JSON fence) \u2014 exclude this file or convert its frontmatter"
       );
@@ -2164,17 +2244,21 @@ async function runFill(opts = {}) {
       throw failure instanceof Error ? failure : new GraphError(errorMessage(failure));
     }
     if (absPath !== void 0) {
-      const own2 = ownMetadata(content).data;
-      if (GRAPH_KEY in own2) {
-        const home = await view.home(path2, own2, GRAPH_KEY);
+      const own2 = metadataOf(content, path2, pageFormat).data;
+      if (GRAPH_KEY2 in own2) {
+        const home = await view.home(path2, own2, GRAPH_KEY2);
         if (home.kind !== "unowned") {
           throw new GraphError(
-            `"${GRAPH_KEY}" is owned by manifest ${home.file} (collection ${home.collection}); remove it from the document`
+            `"${GRAPH_KEY2}" is owned by manifest ${home.file} (collection ${home.collection}); remove it from the document`
           );
         }
       }
     }
-    const present = new Set(existingGraphFields(effective));
+    const held = metadataOf(effective, path2, pageFormat).data;
+    const heldGraph = held[GRAPH_KEY2];
+    const present = new Set(
+      heldGraph !== null && typeof heldGraph === "object" && !Array.isArray(heldGraph) ? Object.keys(heldGraph) : []
+    );
     const missing = opts.force ? fields : fields.filter((f) => !present.has(f));
     if (missing.length === 0 && !withSections) {
       return {
@@ -2305,8 +2389,8 @@ async function runFill(opts = {}) {
     if (config.fill.writeProvenance) {
       const recordable = realFields.filter((f) => !f.includes(".")).sort();
       if (recordable.length < realFields.length) sectionsUnrecorded.push(path2);
-      const held = existingMetaProvenance(effective);
-      const priorEntry = Array.isArray(held) ? held.find(
+      const heldProvenance = held[META_PROVENANCE_KEY];
+      const priorEntry = Array.isArray(heldProvenance) ? heldProvenance.find(
         (e) => !!e && typeof e === "object" && !Array.isArray(e) && e["generated-by"] === identity.model
       ) : void 0;
       const priorConfidence = numberMap(priorEntry?.["confidence"]);
@@ -2322,7 +2406,7 @@ async function runFill(opts = {}) {
         ([f, name]) => confidence[f] === void 0 && priorConfidence[name] === void 0
       ).map(([, name]) => name);
       const merged = mergeMetaProvenance(
-        held,
+        heldProvenance,
         identity.model,
         "fields",
         proposed
@@ -2333,7 +2417,7 @@ async function runFill(opts = {}) {
         provenanceList = merged.list;
       }
     }
-    const applied = applyGraphFields(effective, path2, narrowed, {
+    const applied = writeGraphFields(effective, path2, pageFormat, narrowed, {
       force: opts.force
     });
     const reportedFields = applied.applied;
@@ -2349,10 +2433,10 @@ async function runFill(opts = {}) {
         cached
       };
     }
-    const own = ownMetadata(content).data;
-    const graphHome = absPath === void 0 ? void 0 : await view.home(path2, own, GRAPH_KEY);
+    const own = metadataOf(content, path2, pageFormat).data;
+    const graphHome = absPath === void 0 ? void 0 : await view.home(path2, own, GRAPH_KEY2);
     const provenanceHome = absPath === void 0 || provenanceList === void 0 ? void 0 : await view.home(path2, own, META_PROVENANCE_KEY);
-    const graphTarget = writeTarget(path2, graphHome, GRAPH_KEY);
+    const graphTarget = writeTarget(path2, graphHome, GRAPH_KEY2);
     if (typeof graphTarget === "string") throw new GraphError(graphTarget);
     let provenanceTarget = writeTarget(path2, provenanceHome, META_PROVENANCE_KEY);
     if (typeof provenanceTarget === "string") {
@@ -2364,9 +2448,10 @@ async function runFill(opts = {}) {
     if (provenanceList !== void 0 && provenanceTarget === null) {
       pageKeys[META_PROVENANCE_KEY] = provenanceList;
     }
-    const pageContent = applyGraphFields(
+    const pageContent = writeGraphFields(
       content,
       path2,
+      pageFormat,
       graphTarget === null ? narrowed : {},
       { force: opts.force, page: pageKeys }
     ).content;
@@ -2374,8 +2459,8 @@ async function runFill(opts = {}) {
     if (graphTarget !== null) {
       manifestWrites.push({
         home: graphTarget,
-        key: GRAPH_KEY,
-        value: ownMetadata(applied.content).data[GRAPH_KEY]
+        key: GRAPH_KEY2,
+        value: metadataOf(applied.content, path2, pageFormat).data[GRAPH_KEY2]
       });
     }
     if (provenanceList !== void 0 && provenanceTarget !== null) {
@@ -2408,7 +2493,7 @@ async function runFill(opts = {}) {
     };
   }
 }
-var GRAPH_KEY = "graph";
+var GRAPH_KEY2 = "graph";
 function writeTarget(path2, home, key) {
   if (home === void 0 || home.kind === "unowned") return null;
   if (home.kind === "url") return urlManifestMessage(key, home.file);
@@ -2455,16 +2540,18 @@ async function spliceAll(writes) {
   return [...out.values()];
 }
 async function mergedText(view, path2, content, format) {
-  if (frontmatterKind(content) === "unsupported") return content;
-  let own;
+  const markdown = format === "markdown" || format === "mdx";
+  if (markdown && frontmatterKind(content) === "unsupported") return content;
+  const own = metadataOf(content, path2, format);
+  const { supplied } = await mergePage(view, path2, own.data, own.present, format);
+  if (Object.keys(supplied).length === 0) return content;
   try {
-    own = ownMetadata(content);
+    return writeGraphFields(content, path2, format, {}, { page: supplied }).content;
   } catch (e) {
-    throw new GraphError(`${path2}: ${errorMessage(e)}`);
+    const noFence = (format === "asciidoc" || format === "rst") && e instanceof DocmetaError;
+    if (!noFence) throw e;
+    return applyGraphFields(content, path2, {}, { page: supplied }).content;
   }
-  const { supplied } = await mergePage(view, path2, own.data, own.present, format);
-  if (Object.keys(supplied).length === 0) return content;
-  return applyGraphFields(content, path2, {}, { page: supplied }).content;
 }
 async function openMetaViewPerPage(source, cwd, paths, base2, failures) {
   try {
@@ -3869,4 +3956,4 @@ export {
   runTraverse,
   renderTraverse
 };
-//# sourceMappingURL=chunk-644JVKJ4.js.map
+//# sourceMappingURL=chunk-EL2BZTDL.js.map