@stll/folio-core 0.62.0 → 0.63.1

package/dist/docx/xmlParser.d.ts

@@ -5,7 +5,7 @@ import { ParseContext } from "./parseContext.js";
  * previously imported from `xml-js`. Every consumer imports this from
  * `xmlParser.ts`, so the shape must stay identical.
  */
-type XmlElement = {
+export type XmlElement = {
   declaration?: {
     attributes?: Record<string, string | number>;
   };
@@ -24,14 +24,14 @@ type XmlElement = {
   elements?: XmlElement[];
 };
 /** Parent-linked XML namespace declarations; each scope stores only local overrides. */
-type XmlNamespaceScope = {
+export type XmlNamespaceScope = {
   bindings: ReadonlyMap<string, string>;
   parent?: XmlNamespaceScope;
 };
 /**
  * Common OOXML namespace URIs — re-exported from @stll/docx-utils.
  */
-declare const NAMESPACES: {
+export declare const NAMESPACES: {
   readonly w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
   readonly a: "http://schemas.openxmlformats.org/drawingml/2006/main";
   readonly r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
@@ -66,13 +66,13 @@ declare const NAMESPACES: {
  * binds it to a prefix this map does not know — simply fails to match, and
  * the caller falls back to whatever it does without the capture.
  */
-declare const OOXML_NAMESPACE_SCOPE: XmlNamespaceScope;
-declare function parseXml(xml: string, inheritedNamespaceScope?: XmlNamespaceScope): XmlElement;
+export declare const OOXML_NAMESPACE_SCOPE: XmlNamespaceScope;
+export declare function parseXml(xml: string, inheritedNamespaceScope?: XmlNamespaceScope): XmlElement;
 /**
  * The general-purpose reader {@link parseXml} falls back to, and the reference
  * the streaming reader's equivalence tests compare against.
  */
-declare function parseXmlWithFastXmlParser(xml: string, inheritedNamespaceScope?: XmlNamespaceScope): XmlElement;
+export declare function parseXmlWithFastXmlParser(xml: string, inheritedNamespaceScope?: XmlNamespaceScope): XmlElement;
 /**
  * Serialize an XmlElement back to an XML string.
  *
@@ -91,23 +91,23 @@ declare function parseXmlWithFastXmlParser(xml: string, inheritedNamespaceScope?
  * no spelling for dropped. Every other rule reproduces its output byte for
  * byte, so replaying a capture is unchanged wherever it was already correct.
  */
-declare function elementToXml(element: XmlElement): string;
+export declare function elementToXml(element: XmlElement): string;
 /**
  * Parse XML string to a more convenient format
  */
-declare function parseXmlDocument(xml: string): XmlElement | null;
+export declare function parseXmlDocument(xml: string): XmlElement | null;
 /**
  * Get local name from a prefixed element name
  * e.g., "w:p" -> "p", "a:graphic" -> "graphic"
  */
-declare function getLocalName(name: string | undefined): string;
+export declare function getLocalName(name: string | undefined): string;
 /**
  * Get namespace prefix from an element name
  * e.g., "w:p" -> "w", "a:graphic" -> "a"
  */
-declare function getNamespacePrefix(name: string): string | null;
+export declare function getNamespacePrefix(name: string): string | null;
 /** Namespace URI resolved from the element's in-scope XML declarations. */
-declare const getNamespaceUri: (element: XmlElement) => string | undefined;
+export declare const getNamespaceUri: (element: XmlElement) => string | undefined;
 /**
  * Namespace URI of one of the element's attributes, by its source spelling.
  *
@@ -116,29 +116,29 @@ declare const getNamespaceUri: (element: XmlElement) => string | undefined;
  * and `undefined` is that answer as well as "the prefix resolves to nothing".
  * A caller that must tell the two apart checks the spelling for a colon.
  */
-declare const resolveAttributeNamespaceUri: (element: XmlElement, attributeName: string) => string | undefined;
+export declare const resolveAttributeNamespaceUri: (element: XmlElement, attributeName: string) => string | undefined;
 /** WordprocessingML main namespace, Transitional and Strict (ECMA-376 Parts 1 and 4). */
-declare const WORDPROCESSINGML_NAMESPACE_URIS: ReadonlySet<string>;
+export declare const WORDPROCESSINGML_NAMESPACE_URIS: ReadonlySet<string>;
 /** Office document relationship attributes, Transitional and Strict. */
-declare const OFFICE_RELATIONSHIP_NAMESPACE_URIS: ReadonlySet<string>;
+export declare const OFFICE_RELATIONSHIP_NAMESPACE_URIS: ReadonlySet<string>;
 /**
  * First child whose local name matches AND whose resolved namespace URI is
  * one of `namespaceUris`. Unlike {@link findChild}, a same-named element
  * from a foreign namespace is not accepted.
  */
-declare function findChildByNamespaceUri(parent: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlElement | null;
+export declare function findChildByNamespaceUri(parent: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlElement | null;
 /** First direct child in either supported WordprocessingML namespace. */
-declare const findWordprocessingChild: (parent: XmlElement | null | undefined, localName: string) => XmlElement | null;
+export declare const findWordprocessingChild: (parent: XmlElement | null | undefined, localName: string) => XmlElement | null;
 /** All direct children whose local name and resolved namespace both match. */
-declare function findChildrenByNamespaceUri(parent: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlElement[];
-type XmlAttributeMatch = {
+export declare function findChildrenByNamespaceUri(parent: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlElement[];
+export type XmlAttributeMatch = {
   name: string;
   value: string;
 };
 /** Find an attribute whose prefix resolves to one of the accepted namespace URIs. */
-declare function findAttributeByNamespaceUri(element: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlAttributeMatch | null;
+export declare function findAttributeByNamespaceUri(element: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): XmlAttributeMatch | null;
 /** Get an attribute whose prefix resolves to one of the accepted namespace URIs. */
-declare function getAttributeByNamespaceUri(element: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): string | null;
+export declare function getAttributeByNamespaceUri(element: XmlElement | null | undefined, namespaceUris: ReadonlySet<string>, localName: string): string | null;
 /**
  * Check if an element matches a given namespaced name
  *
@@ -146,7 +146,7 @@ declare function getAttributeByNamespaceUri(element: XmlElement | null | undefin
  * @param namespace - Namespace prefix (e.g., "w", "a")
  * @param localName - Local element name (e.g., "p", "r")
  */
-declare function matchesName(element: XmlElement, _namespace: string, localName: string): boolean;
+export declare function matchesName(element: XmlElement, _namespace: string, localName: string): boolean;
 /**
  * Find first child element matching the given namespaced name
  *
@@ -155,7 +155,7 @@ declare function matchesName(element: XmlElement, _namespace: string, localName:
  * @param localName - Local element name (e.g., "p")
  * @returns First matching child or null
  */
-declare function findChild(parent: XmlElement | null | undefined, _namespace: string, localName: string): XmlElement | null;
+export declare function findChild(parent: XmlElement | null | undefined, _namespace: string, localName: string): XmlElement | null;
 /**
  * Find all child elements matching the given namespaced name
  *
@@ -164,7 +164,7 @@ declare function findChild(parent: XmlElement | null | undefined, _namespace: st
  * @param localName - Local element name
  * @returns Array of matching children
  */
-declare function findChildren(parent: XmlElement | null | undefined, _namespace: string, localName: string): XmlElement[];
+export declare function findChildren(parent: XmlElement | null | undefined, _namespace: string, localName: string): XmlElement[];
 /**
  * Find first child element by local name only (ignoring namespace)
  *
@@ -172,7 +172,7 @@ declare function findChildren(parent: XmlElement | null | undefined, _namespace:
  * @param localName - Local element name
  * @returns First matching child or null
  */
-declare function findChildByLocalName(parent: XmlElement | null | undefined, localName: string): XmlElement | null;
+export declare function findChildByLocalName(parent: XmlElement | null | undefined, localName: string): XmlElement | null;
 /**
  * Find all child elements by local name only
  *
@@ -180,7 +180,7 @@ declare function findChildByLocalName(parent: XmlElement | null | undefined, loc
  * @param localName - Local element name
  * @returns Array of matching children
  */
-declare function findChildrenByLocalName(parent: XmlElement | null | undefined, localName: string): XmlElement[];
+export declare function findChildrenByLocalName(parent: XmlElement | null | undefined, localName: string): XmlElement[];
 /**
  * Find first child element by full name (including namespace prefix)
  *
@@ -188,21 +188,21 @@ declare function findChildrenByLocalName(parent: XmlElement | null | undefined,
  * @param fullName - Full element name with namespace prefix (e.g., 'wp:extent')
  * @returns First matching child or null
  */
-declare function findByFullName(parent: XmlElement | null | undefined, fullName: string): XmlElement | null;
+export declare function findByFullName(parent: XmlElement | null | undefined, fullName: string): XmlElement | null;
 /**
  * Get all child elements (excludes text nodes, etc.)
  *
  * @param parent - Parent element
  * @returns Array of child elements
  */
-declare function getChildElements(parent: XmlElement | null | undefined): XmlElement[];
+export declare function getChildElements(parent: XmlElement | null | undefined): XmlElement[];
 /**
  * Folio's normalized Markup Compatibility policy: use the first Choice, which
  * is the established parser behavior when `mc:Requires` cannot be evaluated;
  * use Fallback only when there is no Choice. Callers serialize that selected
  * branch as ordinary WordprocessingML rather than concatenating alternatives.
  */
-declare function selectAlternateContentBranch(alternateContent: XmlElement): XmlElement | undefined;
+export declare function selectAlternateContentBranch(alternateContent: XmlElement): XmlElement | undefined;
 /**
  * Get an attribute value from an element
  *
@@ -222,7 +222,7 @@ declare function selectAlternateContentBranch(alternateContent: XmlElement): Xml
  * would silently drop on round-trip even though the element itself is
  * recognised.
  */
-declare function getAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string): string | null;
+export declare function getAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string): string | null;
 /**
  * Read an attribute by local name, trying the element's own prefix first,
  * then the canonical Word prefix, then unprefixed.
@@ -235,7 +235,7 @@ declare function getAttribute(element: XmlElement | null | undefined, namespace:
  * an OOXML attribute that conventionally lives in the `w:` namespace
  * but could appear under an alternate prefix bound to the same URI.
  */
-declare function getAttributeAnyPrefix(element: XmlElement | null | undefined, localName: string): string | null;
+export declare function getAttributeAnyPrefix(element: XmlElement | null | undefined, localName: string): string | null;
 /**
  * Get an attribute value, trying multiple possible names
  *
@@ -243,21 +243,21 @@ declare function getAttributeAnyPrefix(element: XmlElement | null | undefined, l
  * @param names - Array of possible attribute names (with or without namespace)
  * @returns First found attribute value or null
  */
-declare function getAttributeAny(element: XmlElement | null | undefined, names: string[]): string | null;
+export declare function getAttributeAny(element: XmlElement | null | undefined, names: string[]): string | null;
 /**
  * Get all attributes from an element
  *
  * @param element - Element to get attributes from
  * @returns Record of attribute name -> value
  */
-declare function getAttributes(element: XmlElement | null | undefined): Record<string, string>;
+export declare function getAttributes(element: XmlElement | null | undefined): Record<string, string>;
 /**
  * Get the text content of an element (concatenates all text nodes)
  *
  * @param element - Element to get text from
  * @returns Text content or empty string
  */
-declare function getTextContent(element: XmlElement | null | undefined): string;
+export declare function getTextContent(element: XmlElement | null | undefined): string;
 /**
  * Read an `ST_OnOff` attribute.
  *
@@ -270,7 +270,7 @@ declare function getTextContent(element: XmlElement | null | undefined): string;
  * `w:beforeAutospacing="on"` as false, and the save path then writes `"0"`,
  * inverting what the document said.
  */
-declare function parseOnOffAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string, context?: ParseContext): boolean | undefined;
+export declare function parseOnOffAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string, context?: ParseContext): boolean | undefined;
 /**
  * Check if a child element exists (used for boolean flags in OOXML)
  *
@@ -279,14 +279,14 @@ declare function parseOnOffAttribute(element: XmlElement | null | undefined, nam
  * @param localName - Local element name
  * @returns true if child element exists
  */
-declare function hasChild(parent: XmlElement | null | undefined, namespace: string, localName: string): boolean;
+export declare function hasChild(parent: XmlElement | null | undefined, namespace: string, localName: string): boolean;
 /**
  * Parse an OOXML color value
  *
  * @param element - Color element (e.g., w:color)
  * @returns Object with val, themeColor, themeTint, themeShade
  */
-declare function parseColorElement(element: XmlElement | null | undefined): {
+export declare function parseColorElement(element: XmlElement | null | undefined): {
   val?: string;
   themeColor?: string;
   themeTint?: string;
@@ -301,7 +301,7 @@ declare function parseColorElement(element: XmlElement | null | undefined): {
  * @param scale - Optional scale factor (e.g., 20 for twips to points)
  * @returns Parsed number or undefined
  */
-declare function parseNumericAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string, scale?: number): number | undefined;
+export declare function parseNumericAttribute(element: XmlElement | null | undefined, namespace: string | null, name: string, scale?: number): number | undefined;
 /**
  * Parse a zero-based numbering level reference.
  *
@@ -309,14 +309,14 @@ declare function parseNumericAttribute(element: XmlElement | null | undefined, n
  * sentinel values alongside `w:numId="0"` to disable numbering; treat those
  * as an omitted level instead of leaking an invalid value into the model.
  */
-declare function parseNumberingLevelAttribute(element: XmlElement | null | undefined): number | undefined;
+export declare function parseNumberingLevelAttribute(element: XmlElement | null | undefined): number | undefined;
 /**
  * Parse `w:w` on a table width/height element. A percentage may be spelled the
  * way it reads (`100%`) or as the number its slot counts in
  * (50ths-of-percent, `5000`); the generated slot table says which unit that
  * is, so the two spellings are not decided here.
  */
-declare function parseTableMeasurementValue(element: XmlElement | null | undefined, widthType: string): number | undefined;
+export declare function parseTableMeasurementValue(element: XmlElement | null | undefined, widthType: string): number | undefined;
 /**
  * Parse an OOXML `ST_OnOff` lexical value.
  *
@@ -324,7 +324,7 @@ declare function parseTableMeasurementValue(element: XmlElement | null | undefin
  * reports the value folio declined to read, and the hundred that do not yet
  * thread one keep compiling and keep their behaviour.
  */
-declare function parseOnOffValue(value: string | null | undefined, context?: ParseContext, element?: string): boolean | undefined;
+export declare function parseOnOffValue(value: string | null | undefined, context?: ParseContext, element?: string): boolean | undefined;
 /**
  * Parse a boolean value from an attribute or element presence
  *
@@ -337,7 +337,7 @@ declare function parseOnOffValue(value: string | null | undefined, context?: Par
  * @param namespace - Namespace for val attribute
  * @returns boolean value
  */
-declare function parseBooleanElement(element: XmlElement | null | undefined, namespace?: string, context?: ParseContext): boolean;
+export declare function parseBooleanElement(element: XmlElement | null | undefined, namespace?: string, context?: ParseContext): boolean;
 /**
  * Read a `CT_OnOff` child as the three states it has.
  *
@@ -348,7 +348,7 @@ declare function parseBooleanElement(element: XmlElement | null | undefined, nam
  * a save reads its toggles through here, and writes what it gets back —
  * `undefined` included — so the element it did not carry stays uncarried.
  */
-declare function parseOnOffChild(parent: XmlElement | null | undefined, namespace: string, localName: string, context?: ParseContext): boolean | undefined;
+export declare function parseOnOffChild(parent: XmlElement | null | undefined, namespace: string, localName: string, context?: ParseContext): boolean | undefined;
 /**
  * Deep find - search recursively for an element
  *
@@ -357,7 +357,7 @@ declare function parseOnOffChild(parent: XmlElement | null | undefined, namespac
  * @param localName - Local element name
  * @returns First matching element found or null
  */
-declare function findDeep(root: XmlElement | null | undefined, namespace: string, localName: string): XmlElement | null;
+export declare function findDeep(root: XmlElement | null | undefined, namespace: string, localName: string): XmlElement | null;
 /**
  * Find all elements matching name, searching recursively
  *
@@ -366,7 +366,7 @@ declare function findDeep(root: XmlElement | null | undefined, namespace: string
  * @param localName - Local element name
  * @returns Array of all matching elements
  */
-declare function findAllDeep(root: XmlElement | null | undefined, namespace: string, localName: string): XmlElement[];
+export declare function findAllDeep(root: XmlElement | null | undefined, namespace: string, localName: string): XmlElement[];
 /**
  * Collect every `xmlns` / `xmlns:*` declaration from an element's attributes.
  *
@@ -376,7 +376,7 @@ declare function findAllDeep(root: XmlElement | null | undefined, namespace: str
  * is emitted on its own. Carrying the source declarations forward keeps the
  * raw replay self-contained regardless of the producer's prefix choice.
  */
-declare function collectXmlnsDeclarations(element: XmlElement): Record<string, string>;
+export declare function collectXmlnsDeclarations(element: XmlElement): Record<string, string>;
 /**
  * Merge an element's own `xmlns` / `xmlns:*` declarations onto an inherited
  * in-scope set, returning the accumulated set. Threaded down the ancestor
@@ -385,7 +385,7 @@ declare function collectXmlnsDeclarations(element: XmlElement): Record<string, s
  * inherited object is not mutated; the same reference is returned unchanged when
  * the element declares nothing.
  */
-declare function mergeXmlnsDeclarations(inherited: Record<string, string>, element: XmlElement): Record<string, string>;
+export declare function mergeXmlnsDeclarations(inherited: Record<string, string>, element: XmlElement): Record<string, string>;
 /**
  * Return a shallow clone of `element` carrying the inherited namespace
  * declarations needed by its raw subtree.
@@ -396,7 +396,7 @@ declare function mergeXmlnsDeclarations(inherited: Record<string, string>, eleme
  * If a producer omitted a binding for a standard OOXML prefix, use its
  * canonical binding so the detached subtree is valid on its first replay.
  */
-declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDecls: Record<string, string>): XmlElement;
+export declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDecls: Record<string, string>): XmlElement;
 /**
  * Shallow clone of an element that keeps its resolved namespace metadata.
  *
@@ -406,6 +406,5 @@ declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDecls: Rec
  * original's scope leaves resolution unchanged whether or not the clone
  * carries `xmlns` attributes of its own.
  */
-declare function cloneElement(element: XmlElement, overrides: Partial<XmlElement>): XmlElement;
-//#endregion
-export { NAMESPACES, OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, WORDPROCESSINGML_NAMESPACE_URIS, XmlAttributeMatch, XmlElement, XmlNamespaceScope, cloneElement, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findAttributeByNamespaceUri, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findChildrenByNamespaceUri, findDeep, findWordprocessingChild, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffAttribute, parseOnOffChild, parseOnOffValue, parseTableMeasurementValue, parseXml, parseXmlDocument, parseXmlWithFastXmlParser, resolveAttributeNamespaceUri, selectAlternateContentBranch };
+export declare function cloneElement(element: XmlElement, overrides: Partial<XmlElement>): XmlElement;
+//#endregion

package/dist/docx/xmlParser.js

@@ -384,10 +384,7 @@ function selectAlternateContentBranch(alternateContent) {
 		if (getNamespaceUri(child) !== NAMESPACES.mc) continue;
 		switch (getLocalName(child.name)) {
 			case "Choice": return child;
-			case "Fallback":
-				fallback ??= child;
-				break;
-			default: break;
+			case "Fallback": fallback ??= child;
 		}
 	}
 	return fallback;
@@ -789,8 +786,10 @@ const addPrefix = (name, prefixes) => {
 * those bindings even when no descendant name uses them.
 */
 const collectUsedNamespacePrefixes = (element, prefixes = /* @__PURE__ */ new Set()) => {
-	if (element.name) if (element.name.includes(":")) addPrefix(element.name, prefixes);
-	else prefixes.add("");
+	if (element.name) {
+		if (element.name.includes(":")) addPrefix(element.name, prefixes);
+		else prefixes.add("");
+	}
 	if (element.attributes) for (const [name, value] of Object.entries(element.attributes)) {
 		if (name === "xmlns" || name.startsWith("xmlns:")) continue;
 		addPrefix(name, prefixes);
@@ -821,14 +820,15 @@ function cloneWithXmlnsDeclarations(element, xmlnsDecls) {
 	const prefixes = collectUsedNamespacePrefixes(element);
 	const additions = {};
 	const attributes = element.attributes ?? {};
-	for (const [name, value] of Object.entries(xmlnsDecls)) {
-		const prefix = name === "xmlns" ? "" : name.slice(6);
-		if (prefixes.has(prefix) && attributes[name] === void 0) additions[name] = value;
-	}
 	for (const prefix of prefixes) {
 		const name = `xmlns:${prefix}`;
-		if (!prefix || attributes[name] !== void 0 || additions[name] !== void 0 || !isCanonicalNamespacePrefix(prefix)) continue;
-		additions[name] = NAMESPACES[prefix];
+		const declaration = prefix === "" ? "xmlns" : name;
+		if (attributes[declaration] !== void 0 || prefix === "xml") continue;
+		const sourceBinding = resolveNamespaceUri(element.namespaceScope, prefix);
+		const inheritedBinding = xmlnsDecls[declaration];
+		const binding = sourceBinding ?? inheritedBinding;
+		if (binding !== void 0) additions[declaration] = binding;
+		else if (isCanonicalNamespacePrefix(prefix)) additions[declaration] = NAMESPACES[prefix];
 	}
 	for (const _key in additions) return cloneElement(element, { attributes: {
 		...attributes,

package/dist/docx/xmlResourceLimits.d.ts

@@ -1,4 +1,6 @@
+import { TaggedErrorClass } from "better-result";
 //#region src/docx/xmlResourceLimits.d.ts
+declare const XmlResourceLimitErrorBase: TaggedErrorClass<"XmlResourceLimitError">;
 /**
  * Shared bounds for XML parts parsed by Folio.
  *
@@ -37,7 +39,7 @@
  * ceiling of 250 MiB, ~37M elements and well past 1.8 GB of tree while passing
  * every bound. Lower these to trade format reach for a smaller ceiling.
  */
-declare const FOLIO_XML_RESOURCE_LIMITS: {
+export declare const FOLIO_XML_RESOURCE_LIMITS: {
   readonly maxBytes: number;
   readonly maxDepth: 100;
   /** 1.68x the corpus maximum (596,668). Unchanged; a shipped bound is not loosened. */
@@ -49,7 +51,7 @@ declare const FOLIO_XML_RESOURCE_LIMITS: {
   /** 4.69x the corpus maximum (639,110). */
   readonly maxAttributesPerPackage: 3000000;
 };
-type XmlResourceLimits = {
+export type XmlResourceLimits = {
   maxBytes: number;
   maxDepth: number;
   maxElementsPerPart: number;
@@ -58,9 +60,8 @@ type XmlResourceLimits = {
   maxAttributesPerPackage: number;
 };
 type XmlResourceLimitKind = "bytes" | "depth" | "elements" | "attributes" | "package-elements" | "package-attributes" | "syntax";
-declare const XmlResourceLimitError_base: import("better-result").TaggedErrorClass<"XmlResourceLimitError">;
 /** XML input exceeded a parser resource bound or could not be scanned safely. */
-declare class XmlResourceLimitError extends XmlResourceLimitError_base<{
+export declare class XmlResourceLimitError extends XmlResourceLimitErrorBase<{
   message: string;
   limit: XmlResourceLimitKind;
   /** The package part being scanned, when the caller named one. */
@@ -76,13 +77,13 @@ declare class XmlResourceLimitError extends XmlResourceLimitError_base<{
  * parts, each individually modest. The budget is the accumulator the readers
  * carry across parts so the ceiling is the package's, not each part's.
  */
-type XmlPackageBudget = {
+export type XmlPackageBudget = {
   elements: number;
   attributes: number;
 };
-declare const createXmlPackageBudget: () => XmlPackageBudget;
-declare const exceedsUtf8ByteLimit: (value: string, maxBytes: number) => boolean;
-type XmlResourceScanOptions = {
+export declare const createXmlPackageBudget: () => XmlPackageBudget;
+export declare const exceedsUtf8ByteLimit: (value: string, maxBytes: number) => boolean;
+export type XmlResourceScanOptions = {
   xml: string;
   limits?: XmlResourceLimits;
   /** The package path scanned, carried on any refusal so a host can name it. */
@@ -91,7 +92,7 @@ type XmlResourceScanOptions = {
   budget?: XmlPackageBudget;
 };
 /** What the preflight counted, for callers that reconcile it against the tree. */
-type XmlResourceScanResult = {
+export type XmlResourceScanResult = {
   elements: number;
   attributes: number;
   maxDepth: number;
@@ -103,6 +104,6 @@ type XmlResourceScanResult = {
  * bound is checked at the point it is crossed, so the work done before a
  * refusal is proportional to the limit rather than to the input.
  */
-declare const assertXmlResourceLimits: ({ xml, limits, partPath, budget }: XmlResourceScanOptions) => XmlResourceScanResult;
+export declare const assertXmlResourceLimits: ({ xml, limits, partPath, budget }: XmlResourceScanOptions) => XmlResourceScanResult;
 //#endregion
-export { FOLIO_XML_RESOURCE_LIMITS, XmlPackageBudget, XmlResourceLimitError, XmlResourceLimits, XmlResourceScanOptions, XmlResourceScanResult, assertXmlResourceLimits, createXmlPackageBudget, exceedsUtf8ByteLimit };
+export {};

package/dist/docx/xmlResourceLimits.js

@@ -1,4 +1,7 @@
 import { TaggedError } from "better-result";
+//#region src/docx/xmlResourceLimits.ts
+const MEBIBYTE = 1048576;
+const XmlResourceLimitErrorBase = TaggedError("XmlResourceLimitError");
 /**
 * Shared bounds for XML parts parsed by Folio.
 *
@@ -38,7 +41,7 @@ import { TaggedError } from "better-result";
 * every bound. Lower these to trade format reach for a smaller ceiling.
 */
 const FOLIO_XML_RESOURCE_LIMITS = {
-	maxBytes: 128 * (1024 * 1024),
+	maxBytes: 128 * MEBIBYTE,
 	maxDepth: 100,
 	/** 1.68x the corpus maximum (596,668). Unchanged; a shipped bound is not loosened. */
 	maxElementsPerPart: 1e6,
@@ -50,7 +53,7 @@ const FOLIO_XML_RESOURCE_LIMITS = {
 	maxAttributesPerPackage: 3e6
 };
 /** XML input exceeded a parser resource bound or could not be scanned safely. */
-var XmlResourceLimitError = class extends TaggedError("XmlResourceLimitError") {};
+var XmlResourceLimitError = class extends XmlResourceLimitErrorBase {};
 const createXmlPackageBudget = () => ({
 	elements: 0,
 	attributes: 0

package/dist/docx/xmlSafety.d.ts

@@ -1,5 +1,4 @@
 //#region src/docx/xmlSafety.d.ts
-type DocxXmlSafetyIssue = "doctype-forbidden" | "entity-forbidden" | "not-well-formed";
-declare const getDocxXmlSafetyIssue: (xml: string) => DocxXmlSafetyIssue | null;
-//#endregion
-export { DocxXmlSafetyIssue, getDocxXmlSafetyIssue };
+export type DocxXmlSafetyIssue = "doctype-forbidden" | "entity-forbidden" | "not-well-formed";
+export declare const getDocxXmlSafetyIssue: (xml: string) => DocxXmlSafetyIssue | null;
+//#endregion

package/dist/export-pdf.d.ts

@@ -4,14 +4,14 @@ import { HeadlessFontSource, HeadlessFontSubstitution } from "./fonts/headlessMe
 import { HeadlessLayoutGap } from "./headless-layout.js";
 import { PdfSubstitution } from "./pdf/fonts.js";
 import { PdfUnencodable } from "./pdf/writePdf.js";
-import { Result } from "better-result";
+import { Result, TaggedErrorClass } from "better-result";
 //#region src/export-pdf.d.ts
-declare const ExportPdfError_base: import("better-result").TaggedErrorClass<"ExportPdfError">;
-declare class ExportPdfError extends ExportPdfError_base<{
+declare const ExportPdfErrorBase: TaggedErrorClass<"ExportPdfError">;
+export declare class ExportPdfError extends ExportPdfErrorBase<{
   message: string;
   cause?: unknown;
 }> {}
-type ExportDocxToPdfOptions = {
+export type ExportDocxToPdfOptions = {
   /** Supplies face binaries for measurement and for embedding alike. */
   readonly fonts: HeadlessFontSource;
   /**
@@ -29,7 +29,7 @@ type ExportDocxToPdfOptions = {
    */
   readonly pages?: readonly number[];
 };
-type ExportDocxToPdfResult = {
+export type ExportDocxToPdfResult = {
   readonly bytes: Uint8Array;
   readonly pageCount: number;
   /** Constructs the display list could not represent. */
@@ -43,12 +43,12 @@ type ExportDocxToPdfResult = {
   /** Code points painted as `.notdef` because no supplied face covers them. */
   readonly unencodable: readonly PdfUnencodable[];
 };
-type BuildDocxDisplayListOptions = {
+export type BuildDocxDisplayListOptions = {
   /** Supplies face binaries for measurement. */
   readonly fonts: HeadlessFontSource;
   readonly metadata?: DisplayMetadata;
 };
-type BuildDocxDisplayListResult = {
+export type BuildDocxDisplayListResult = {
   /** The pages every backend paints: the PDF writer, the DOM and HTML backends. */
   readonly list: DisplayList;
   /** Stories the headless pipeline does not paginate. */
@@ -62,15 +62,15 @@ type BuildDocxDisplayListResult = {
  * every other headless build and export, for the reason
  * {@link runExclusively} gives.
  */
-declare const buildDocxDisplayList: (input: DocxInput, options: BuildDocxDisplayListOptions) => Promise<Result<BuildDocxDisplayListResult, ExportPdfError>>;
-declare const exportDocxToPdf: (input: DocxInput, options: ExportDocxToPdfOptions) => Promise<Result<ExportDocxToPdfResult, ExportPdfError>>;
-type WriteDisplayListPdfOptions = Pick<ExportDocxToPdfOptions, "fonts" | "timestamp" | "producer">;
-type WriteDisplayListPdfResult = Pick<ExportDocxToPdfResult, "bytes" | "pageCount" | "embeddingSubstitutions" | "unencodable">;
+export declare const buildDocxDisplayList: (input: DocxInput, options: BuildDocxDisplayListOptions) => Promise<Result<BuildDocxDisplayListResult, ExportPdfError>>;
+export declare const exportDocxToPdf: (input: DocxInput, options: ExportDocxToPdfOptions) => Promise<Result<ExportDocxToPdfResult, ExportPdfError>>;
+export type WriteDisplayListPdfOptions = Pick<ExportDocxToPdfOptions, "fonts" | "timestamp" | "producer">;
+export type WriteDisplayListPdfResult = Pick<ExportDocxToPdfResult, "bytes" | "pageCount" | "embeddingSubstitutions" | "unencodable">;
 /**
  * Write a display list built by {@link buildDocxDisplayList} (or narrowed by
  * `selectDisplayPages`) as a PDF, embedding faces from the same source the
  * layout measured with.
  */
-declare const writeDisplayListPdf: (list: DisplayList, options: WriteDisplayListPdfOptions) => Promise<Result<WriteDisplayListPdfResult, ExportPdfError>>;
+export declare const writeDisplayListPdf: (list: DisplayList, options: WriteDisplayListPdfOptions) => Promise<Result<WriteDisplayListPdfResult, ExportPdfError>>;
 //#endregion
-export { BuildDocxDisplayListOptions, BuildDocxDisplayListResult, ExportDocxToPdfOptions, ExportDocxToPdfResult, ExportPdfError, WriteDisplayListPdfOptions, WriteDisplayListPdfResult, buildDocxDisplayList, exportDocxToPdf, writeDisplayListPdf };
+export {};

package/dist/export-pdf.js

@@ -6,6 +6,7 @@ import { layoutDocxHeadless } from "./headless-layout.js";
 import { getMeasureProvider, setMeasureProvider } from "./layout-engine/measure/measureProvider.js";
 import { writePdf } from "./pdf/writePdf.js";
 import { Result, TaggedError } from "better-result";
+import { survivingComments } from "@stll/docx-core/ops";
 //#region src/export-pdf.ts
 /**
 * `.docx` to PDF, with no browser and no second painter.
@@ -30,7 +31,8 @@ import { Result, TaggedError } from "better-result";
 * `compareDocx` uses, so a caller cannot get nondeterministic output by
 * omission.
 */
-var ExportPdfError = class extends TaggedError("ExportPdfError") {};
+const ExportPdfErrorBase = TaggedError("ExportPdfError");
+var ExportPdfError = class extends ExportPdfErrorBase {};
 const toFontRequest = ({ family, weight, italic }) => ({
 	family,
 	bold: weight >= 700,
@@ -118,7 +120,7 @@ const buildWithHeadlessProvider = async (input, options) => {
 		documentFeatures: laidOut.value.documentFeatures,
 		...laidOut.value.furniture,
 		embeddedFonts: laidOut.value.embeddedFonts,
-		...laidOut.value.document.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(laidOut.value.document.package.document.comments) },
+		...laidOut.value.document.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(survivingComments(laidOut.value.document)) },
 		...options.metadata === void 0 ? {} : { metadata: options.metadata }
 	});
 	return Result.ok({

package/dist/fields/bookmarkPages.d.ts

@@ -7,6 +7,5 @@ import { FlowBlock, Page } from "../layout-engine/types.js";
  * splits across pages takes the first (lowest) page it appears on, matching how
  * Word resolves a PAGEREF to the start of the bookmark.
  */
-declare function buildBookmarkPageMap(pages: readonly Page[], blocks: readonly FlowBlock[]): Map<string, number>;
-//#endregion
-export { buildBookmarkPageMap };
+export declare function buildBookmarkPageMap(pages: readonly Page[], blocks: readonly FlowBlock[]): Map<string, number>;
+//#endregion

package/dist/fields/bookmarkText.d.ts

@@ -10,6 +10,6 @@ type BookmarkTextInputs = {
  * paragraph level, so a REF resolves to that paragraph's visible text. Document
  * order, independent of layout. First paragraph carrying a name wins.
  */
-declare function buildBookmarkText(blocks: readonly FlowBlock[], inputs?: BookmarkTextInputs): Map<string, string>;
+export declare function buildBookmarkText(blocks: readonly FlowBlock[], inputs?: BookmarkTextInputs): Map<string, string>;
 //#endregion
-export { buildBookmarkText };
+export {};

package/dist/fields/bookmarkText.js

@@ -36,7 +36,7 @@ function bookmarkFieldText(run, inputs) {
 	if (run.pmStart === void 0 || !inputs.seqValues?.has(run.pmStart)) return run.fallback ?? "";
 	const parsed = parseFieldInstruction(run.instruction || run.fieldType);
 	if (parsed.type !== "SEQ") return run.fallback ?? "";
-	return evaluateField(parsed, {
+	const context = {
 		pageNumber: 1,
 		totalPages: 1,
 		sectionPages: 1,
@@ -44,7 +44,8 @@ function bookmarkFieldText(run, inputs) {
 		bookmarkText: EMPTY_STRING_STRING,
 		seqValues: inputs.seqValues ?? EMPTY_NUMBER_NUMBER,
 		now: /* @__PURE__ */ new Date(0)
-	}, {
+	};
+	return evaluateField(parsed, context, {
 		fallback: run.fallback ?? "",
 		instanceId: run.pmStart,
 		...run.fldLock ? { locked: true } : {}