@stll/folio-core 0.65.0 → 0.66.1

package/dist/ai-edits/apply.js

@@ -26,7 +26,7 @@ import { getDocumentNumbering, getDocumentNumberingInstanceIds } from "../prosem
 import { getDocumentStyleDefinitions, getDocumentStyleResolver } from "../prosemirror/plugins/documentStyleState.js";
 import { claimRevisionIds, nextRevisionId, nextRevisionIdRange, reserveRevisionIds, seedRevisionIdsFromDoc } from "../prosemirror/plugins/revisionIds.js";
 import { rebaseParagraphRuns } from "../prosemirror/rebaseParagraphRuns.js";
-import { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, placeTrackedInsertion, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
+import { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, placeTrackedInsertion, surveyAcceptedReplacedAnnotations, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
 import { applyMarksToRunFormattingRepresentation, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations } from "../prosemirror/runFormattingInlineCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../prosemirror/runFormattingMarkNames.js";
 import { readAuthoredRunFormatting, readAuthoredRunPropertySnapshot, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
@@ -1395,6 +1395,17 @@ const holdsOnlyInsertedContent = (paragraph, revisions) => {
 	});
 	return whollyInserted;
 };
+/** Whether every inline of `paragraph` is an ordinary insertion one of `revisionIds` made. */
+const holdsOnlyContentInsertedBy = (paragraph, revisionIds) => {
+	let whollyInserted = true;
+	paragraph.descendants((node) => {
+		if (!whollyInserted) return false;
+		if (!node.isInline || isZeroWidthAnchor(node)) return true;
+		whollyInserted = node.marks.some((mark) => mark.type.name === "insertion" && mark.attrs["moveKind"] !== "moveTo" && revisionIds.has(mark.attrs["revisionId"]));
+		return false;
+	});
+	return whollyInserted;
+};
 /**
 * Remove the paragraph between `from` and `to`, its content with it but not
 * the range boundaries it holds: those stay where it was, as rejecting a
@@ -2072,7 +2083,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 				const trackedInsertion = insertedRevisionId !== null && batchRevisionIds.has(insertedRevisionId);
 				const suggestedInsertion = isSuggestedParagraphInsert(node);
 				const deletedBreakRevisionId = addedOrDeletedBreakRevisionId(deletedMark);
-				if (isPlainDeletedPPrMark(deletedMark) && deletedBreakRevisionId !== null && !batchRevisionIds.has(deletedBreakRevisionId) && !holdsOnlyDeletedContent(previous.node) && (trackedInsertion || suggestedInsertion) && holdsOnlyInsertedContent(node, "ordinary")) {
+				if (isPlainDeletedPPrMark(deletedMark) && deletedBreakRevisionId !== null && !batchRevisionIds.has(deletedBreakRevisionId) && !holdsOnlyDeletedContent(previous.node) && (trackedInsertion && holdsOnlyContentInsertedBy(node, batchRevisionIds) || suggestedInsertion && holdsOnlyInsertedContent(node, "ordinary"))) {
 					supersededDeletedBreaks.push({
 						preceding: previous.position,
 						inserted: position,
@@ -2094,6 +2105,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 		});
 	};
 	collectSupersededDeletedBreaks(tr.doc, 0);
+	const passedThrough = new Set(supersededDeletedBreaks.map(({ preceding }) => preceding));
 	for (const { preceding, inserted, deletedMark, precedingMark, precedingFormatting } of supersededDeletedBreaks) {
 		const insertionRevisionId = addedBreakRevisionId(precedingMark);
 		if (insertionRevisionId !== null) {
@@ -2118,6 +2130,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 		tr.setNodeAttribute(preceding, "pPrMark", precedingMark);
 		tr.setNodeAttribute(inserted, "pPrMark", deletedMark);
 		if (insertionRevisionId === null) continue;
+		if (passedThrough.has(inserted)) continue;
 		const source = tr.doc.nodeAt(inserted);
 		const survivor = paragraphLeftAfter({
 			doc: tr.doc,
@@ -2903,7 +2916,12 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			}
 			const nodes = [];
 			for (const group of nodeGroups.toReversed()) for (const node of group) nodes.push(node);
-			tr = tr.insert(item.from, nodes);
+			tr = insertBlocksInsideComments({
+				tr,
+				at: item.from,
+				blocks: nodes,
+				...item.boundaryComments !== void 0 && { carriedComments: item.boundaryComments }
+			});
 			applied.push(...runApplied);
 			continue;
 		}
@@ -3288,7 +3306,8 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				tr = insertBlocksInsideComments({
 					tr,
 					at: item.from,
-					blocks: built.nodes
+					blocks: built.nodes,
+					...item.boundaryComments !== void 0 && { carriedComments: item.boundaryComments }
 				});
 				break;
 			}
@@ -3713,7 +3732,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				const carriedComments = tableAfterDeletedSplit.get(item.blockFrom);
 				const usesRetractedSplit = carriedComments !== void 0 && item.from === item.blockTo;
 				let at = usesRetractedSplit ? tr.mapping.map(item.blockFrom, -1) : item.from;
-				let insertionComments = carriedComments;
+				let insertionComments = carriedComments ?? item.boundaryComments;
 				if (!usesRetractedSplit) {
 					const boundary = tr.doc.resolve(at);
 					const before = boundary.nodeBefore;
@@ -3903,6 +3922,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				if (mode === "direct") {
 					if (item.to > item.from) tr = tr.delete(item.from, item.to);
 					tr = tr.split(item.from);
+					tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", null);
 					if (splitsFromItsTextBoxes) gatherTextBoxesAfterParagraph(tr, item.blockFrom);
 				} else {
 					const revisionIdMark = operationRevisionSeed++;
@@ -4754,7 +4774,7 @@ const directReplacementMarks = ({ doc, plan, replacementBackground }) => {
 			const first = pieces.at(0);
 			const last = pieces.at(-1);
 			if (first === void 0 || last === void 0) panic("A planned replacement lost the characters it removes");
-			marks = addCarriedMarks(inheritedReplacementMarks(doc, first.from, first.to), surveyReplacedAnnotations(doc, first.from, last.to).carried);
+			marks = addCarriedMarks(inheritedReplacementMarks(doc, first.from, first.to), surveyAcceptedReplacedAnnotations(doc, first.from, last.to).carried);
 		}
 		const written = clearsBackground ? withoutBackground(marks) : marks;
 		for (let offset = 0; offset < change.text.length; offset++) allocated.push(written);
@@ -5020,7 +5040,7 @@ const applyMinimalTrackedReplacement = ({ tr, item, noteReferences, replacement,
 			if (first === void 0 || last === void 0 || styleSource === null) panic("A planned replacement lost the characters it removes");
 			at = last.to;
 			removedFrom = first.from;
-			marks = addCarriedMarks(inheritedReplacementMarks(doc, styleSource.from, styleSource.to), surveyReplacedAnnotations(doc, first.from, last.to).carried);
+			marks = addCarriedMarks(inheritedReplacementMarks(doc, styleSource.from, styleSource.to), surveyAcceptedReplacedAnnotations(doc, first.from, last.to).carried);
 			for (const piece of change.pieces) {
 				addTrackedDeletionMark({
 					insertionPolicy: "preserve-pending",
@@ -5285,7 +5305,8 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 				blockFrom,
 				blockTo,
 				blockNode,
-				insertTexts
+				insertTexts,
+				boundaryComments: commentsAcrossBlockBoundary(doc, insertFrom)
 			}
 		};
 	}
@@ -5541,7 +5562,8 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 				to: insertFrom,
 				blockFrom,
 				blockTo,
-				blockNode
+				blockNode,
+				boundaryComments: commentsAcrossBlockBoundary(doc, insertFrom)
 			}
 		};
 	}

package/dist/docx/attributeRemainder.js

@@ -1,9 +1,9 @@
 import { modelledAttributeNames } from "./propertyElementAttributes.js";
 import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
-import { XML_NAMESPACE_URI } from "./xmlNamespaceContext.js";
 import { getLocalName, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
 import { escapeXmlAttribute } from "@stll/docx-core";
+import { XML_NAMESPACE_URI } from "@stll/docx-core/xml/namespaces";
 // src/docx/attributeRemainder.ts
 /**
 * The attribute remainder: what an element carried and its parser has no field for.

package/dist/docx/documentSectionFacts.js

@@ -1,6 +1,6 @@
 import { parseHeaderFooterType } from "./headerFooterRefParser.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, WORDPROCESSINGML_NAMESPACE_URIS, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespaceUri, parseXml } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/documentSectionFacts.ts
 const isWordprocessingElement = (element, localName) => getLocalName(element.name) === localName && WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "");
 /** Both facts from one walk of a parsed document tree. */

package/dist/docx/ensureParaIds.js

@@ -2,10 +2,10 @@ import { deterministicHexId } from "../utils/hexId.js";
 import { resolvePackageRelationshipTarget } from "./packageParts.js";
 import { spliceXml } from "./selectiveXmlPatch.js";
 import { loadDocxArchive } from "./server/boundedArchive.js";
-import { scanStreamingXmlElements } from "./streamingXmlParser.js";
-import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, WORDPROCESSINGML_NAMESPACE_URIS, getAttribute, getChildElements, getLocalName, getNamespaceUri, parseXmlDocument, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
+import { scanStreamingXmlElements } from "@stll/docx-core/xml";
+import { resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
 import { ZipArchive } from "@stll/docx-core/zip";
 // src/docx/ensureParaIds.ts
 /**

package/dist/docx/importedIdCollisions.js

@@ -3,10 +3,10 @@ import { REVISION_ELEMENT_NAMES } from "./revisionIdNormalization.js";
 import { scanSelectedStreamingXmlElements } from "./selectedXmlIdentityScan.js";
 import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
 import { toTransitionalNamespaceUri } from "./transitionalSpelling.js";
-import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { NAMESPACES, getLocalName, getNamespaceUri } from "./xmlParser.js";
 import { panic } from "better-result";
 import { IMPORTED_ID_COLLISION_KINDS, PARSE_WARNING_CODES } from "@stll/docx-core/model";
+import { resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
 // src/docx/importedIdCollisions.ts
 const WORD_2010_NAMESPACE = "http://schemas.microsoft.com/office/word/2010/wordml";
 const PACKAGE_RELATIONSHIP_NAMESPACE = "http://schemas.openxmlformats.org/package/2006/relationships";

package/dist/docx/mathToMathml.js

@@ -1,6 +1,6 @@
 import { WORDPROCESSINGML_NAMESPACE_URIS, findChildByLocalName, findChildByNamespaceUri, getAttributeByNamespaceUri, getLocalName, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { escapeXmlText } from "@stll/docx-core";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/mathToMathml.ts
 /**
 * OMML → MathML conversion.

package/dist/docx/numericIdNormalization.js

@@ -1,10 +1,10 @@
 import { REVISION_ELEMENT_NAMES } from "./revisionIdNormalization.js";
-import { parseStreamingXmlWithIdentityVisitor, scanStreamingXmlNumericIdAttributes } from "./streamingXmlParser.js";
 import { replaceRawDocxXmlParts } from "./unzip.js";
 import { getLocalName, getNamespaceUri, resolveAttributeNamespaceUri } from "./xmlParser.js";
-import { XmlResourceLimitError } from "./xmlResourceLimits.js";
 import { panic } from "better-result";
 import { assertValidOoxmlNumericId, isOoxmlNumericIdAttributeName, isValidOoxmlNumericId, mayContainInvalidOoxmlNumericIds, mayContainOoxmlNumericIds, ooxmlNumericIdDomain } from "@stll/docx-core";
+import { parseStreamingXmlWithIdentityVisitor, scanStreamingXmlNumericIdAttributes } from "@stll/docx-core/xml";
+import { XmlResourceLimitError } from "@stll/docx-core/xml/limits";
 // src/docx/numericIdNormalization.ts
 const identityKey = (value) => {
 	const spelling = String(value).trim();

package/dist/docx/parser.js

@@ -40,10 +40,10 @@ import { UNBALANCED_MOVE_RANGE_WARNING, normalizeTrackedMoveRanges } from "./tra
 import { getMediaMimeType, mediaToDataUrl, replaceRawDocxXmlParts, unzipDocx } from "./unzip.js";
 import { renderWmfSvg } from "./wmfSvg.js";
 import { getAttribute, getChildElements, getLocalName, parseXml, parseXmlDocument } from "./xmlParser.js";
-import { FOLIO_XML_RESOURCE_LIMITS } from "./xmlResourceLimits.js";
 import { TaggedError, panic } from "better-result";
 import { PARSE_WARNING_CODES, setDocumentBodyComments } from "@stll/docx-core/model";
 import { isCommentExhausted } from "@stll/docx-core/ops";
+import { FOLIO_XML_RESOURCE_LIMITS } from "@stll/docx-core/xml/limits";
 // src/docx/parser.ts
 /**
 * Main Parser Orchestrator - Unified parseDocx function

package/dist/docx/revisionIdNormalization.js

@@ -1,7 +1,7 @@
-import { rewriteStreamingXmlDecimalAttributes } from "./streamingXmlParser.js";
 import { WORDPROCESSINGML_NAMESPACE_URIS, findAttributeByNamespaceUri, getLocalName, getNamespaceUri } from "./xmlParser.js";
-import { XmlResourceLimitError, assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { TaggedError } from "better-result";
+import { rewriteStreamingXmlDecimalAttributes } from "@stll/docx-core/xml";
+import { XmlResourceLimitError, assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/revisionIdNormalization.ts
 const RevisionIdCollisionErrorBase = TaggedError("RevisionIdCollisionError");
 /**

package/dist/docx/rezip.js

@@ -38,13 +38,13 @@ import { serializeStyle, serializeStylesXml } from "./serializer/stylesSerialize
 import { serializeThemeXml } from "./serializer/themeSerializer.js";
 import { updateEvenAndOddHeaders } from "./settingsHeaderFooterUpdate.js";
 import { parseSettings } from "./settingsParser.js";
-import { getXmlSourceRange, parseStreamingXmlWithSourceRanges } from "./streamingXmlParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
 import { hasCanonicalWordprocessingPrefixes } from "./wordprocessingPrefixes.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, WORDPROCESSINGML_NAMESPACE_URIS, findAttributeByNamespaceUri, findChild, findChildByNamespaceUri, findChildrenByNamespaceUri, getAttribute, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespaceUri, matchesName, parseXml, parseXmlDocument } from "./xmlParser.js";
 import { Result, TaggedError, panic } from "better-result";
 import { assertValidOoxmlNumericIds, escapeXmlAttribute, escapeXmlText, validateDocxPackage } from "@stll/docx-core";
 import { mintRelationshipId, numberingInstanceResolves } from "@stll/docx-core/model";
+import { getXmlSourceRange, parseStreamingXmlWithSourceRanges } from "@stll/docx-core/xml";
 import { ZipArchive } from "@stll/docx-core/zip";
 // src/docx/rezip.ts
 const DocxPackageFidelityErrorBase = TaggedError("DocxPackageFidelityError");

package/dist/docx/sdtProperties.js

@@ -69,8 +69,7 @@ const W15_LOCAL_NAMES = /* @__PURE__ */ new Set(["repeatingSection", "repeatingS
 * would produce invalid XML in the saved DOCX — Word refuses files
 * with unresolved namespace prefixes.
 *
-* Heuristics, since fast-xml-parser does not surface namespace URIs in
-* preserveOrder mode:
+* Heuristics, from when the XML reader did not surface namespace URIs:
 *
 * 1. If the captured wrapper element itself uses a non-`w` prefix, that
 *    prefix is taken to be bound to the WP URI (the source DOCX would

package/dist/docx/selectedXmlIdentityScan.d.ts

@@ -1,4 +1,4 @@
-import { scanStreamingXmlElements } from "./streamingXmlParser.js";
+import { scanStreamingXmlElements } from "@stll/docx-core/xml";
 /** Identity census follows the parser's first-Choice, otherwise-Fallback policy. */
 export declare const scanSelectedStreamingXmlElements: (xml: string, visitor: Parameters<typeof scanStreamingXmlElements>[1]) => {
   status: "unsupported";

package/dist/docx/selectedXmlIdentityScan.js

@@ -1,5 +1,5 @@
-import { scanStreamingXmlElements } from "./streamingXmlParser.js";
 import { NAMESPACES, getLocalName, getNamespaceUri, selectAlternateContentBranch } from "./xmlParser.js";
+import { scanStreamingXmlElements } from "@stll/docx-core/xml";
 // src/docx/selectedXmlIdentityScan.ts
 const isCompatibilityElement = (element, name) => getNamespaceUri(element) === NAMESPACES.mc && getLocalName(element.name) === name;
 /** Identity census follows the parser's first-Choice, otherwise-Fallback policy. */

package/dist/docx/selectiveXmlPatch.js

@@ -1,11 +1,11 @@
 import { patchBreaksCommentRangeBalance } from "./commentRangeIntegrity.js";
 import { resolveParagraphIdentities } from "./paraIdAttribute.js";
 import { readRootNamespaceBindings } from "./serializer/partNamespaces.js";
-import { scanStreamingXmlElements } from "./streamingXmlParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
 import { PARAGRAPH_SCAN_NAMES, hasCanonicalWordprocessingPrefixes, matchCloseTag, matchOpenTag, resolveSelectiveScanPrefixes, splicesAsCanonical } from "./wordprocessingPrefixes.js";
-import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findAttributeByNamespaceUri, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
+import { scanStreamingXmlElements } from "@stll/docx-core/xml";
+import { resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
 // src/docx/selectiveXmlPatch.ts
 /**
 * Selective XML Patch Module

package/dist/docx/server/boundedArchive.d.ts

@@ -1,5 +1,5 @@
-import { XmlResourceLimits } from "../xmlResourceLimits.js";
 import { TaggedErrorClass } from "better-result";
+import { XmlResourceLimits } from "@stll/docx-core/xml/limits";
 export declare const DOCX_MAX_ENTRY_BYTES: number;
 export declare const DOCX_MAX_TOTAL_BYTES: number;
 export declare const DOCX_MAX_ENTRIES = 4096;

package/dist/docx/server/boundedArchive.js

@@ -1,7 +1,7 @@
 import { decodeText } from "../../utils/textEncoding.js";
 import { DOCX_COMPRESSION_RATIO_GRACE_BYTES, isRatioBoundedPart } from "../archiveInflation.js";
-import { FOLIO_XML_RESOURCE_LIMITS, assertXmlResourceLimits, createXmlPackageBudget } from "../xmlResourceLimits.js";
 import { Result, TaggedError } from "better-result";
+import { FOLIO_XML_RESOURCE_LIMITS, assertXmlResourceLimits, createXmlPackageBudget } from "@stll/docx-core/xml/limits";
 import { ZipArchive, ZipError } from "@stll/docx-core/zip";
 // src/docx/server/boundedArchive.ts
 const DOCX_MAX_ENTRY_BYTES = 134217728;

package/dist/docx/server/validateDocxConformance.js

@@ -4,10 +4,10 @@ import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "../encryption/con
 import { DocxModelValidationError, validateFolioDocumentModel } from "../modelValidation.js";
 import { DocxParseError, parseDocx } from "../parser.js";
 import { findChildByLocalName, getAttributeAnyPrefix, getLocalName, getNamespacePrefix, parseXmlDocument } from "../xmlParser.js";
-import { XmlResourceLimitError } from "../xmlResourceLimits.js";
 import { getDocxXmlSafetyIssue } from "../xmlSafety.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
+import { XmlResourceLimitError } from "@stll/docx-core/xml/limits";
 // src/docx/server/validateDocxConformance.ts
 const FOLIO_DOCX_CONFORMANCE_REPORT_VERSION = 1;
 const FOLIO_DOCX_CONFORMANCE_PROFILE = "folio-supported-v1";

package/dist/docx/shapeAlternateContent.js

@@ -1,8 +1,8 @@
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { captureVerbatimXml, isSafeCapturedXmlDocument } from "./verbatimCapture.js";
 import { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { panic } from "better-result";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/shapeAlternateContent.ts
 /**
 * Every modeled field, text body included: the Fallback repeats the shape's

package/dist/docx/storyBlockReplay.js

@@ -1,11 +1,11 @@
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { spliceXml } from "./selectiveXmlPatch.js";
-import { getXmlSourceRange, parseStreamingXmlWithSourceRanges } from "./streamingXmlParser.js";
 import { TRANSITIONAL_NAMESPACE_BY_STRICT_URI } from "./strictValueEncodings.gen.js";
 import { captureSourceProfileXml, isSafeCapturedXmlDocument } from "./verbatimCapture.js";
 import { WORDPROCESSINGML_NAMESPACE_URIS, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespaceUri } from "./xmlParser.js";
 import { escapeXmlAttribute } from "@stll/docx-core";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
+import { getXmlSourceRange, parseStreamingXmlWithSourceRanges } from "@stll/docx-core/xml";
 // src/docx/storyBlockReplay.ts
 const BLOCK_ELEMENT_NAMES = {
 	paragraph: "p",

package/dist/docx/unzip.js

@@ -4,8 +4,8 @@ import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "./encryption/cont
 import { openDocxBuffer } from "./encryption/openEncryptedDocx.js";
 import { RASTER_MIME_TYPES, detectRasterMimeType } from "./rasterMime.js";
 import { decodeXmlBytes } from "./xmlEncoding.js";
-import { FOLIO_XML_RESOURCE_LIMITS, assertXmlResourceLimits, createXmlPackageBudget } from "./xmlResourceLimits.js";
 import { Result } from "better-result";
+import { FOLIO_XML_RESOURCE_LIMITS, assertXmlResourceLimits, createXmlPackageBudget } from "@stll/docx-core/xml/limits";
 import { ZipArchive, ZipError } from "@stll/docx-core/zip";
 // src/docx/unzip.ts
 /**

package/dist/docx/verbatimCapture.js

@@ -2,10 +2,10 @@ import { TRANSITIONAL_NAMESPACE_BY_STRICT_URI } from "./strictValueEncodings.gen
 import { NUMBERS_PER_PERCENT, isStrictNamespaceUri, percentageSpelling, toTransitionalNamespaceUri, transitionalSlotEncoding } from "./transitionalSpelling.js";
 import { roundHalfAwayFromZero, universalMeasureAs } from "./universalMeasure.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, elementToXml, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespacePrefix, parseXml, resolveAttributeNamespaceUri } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { getDocxXmlSafetyIssue } from "./xmlSafety.js";
 import { TaggedError, panic } from "better-result";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/verbatimCapture.ts
 /**
 * The one way to turn parsed markup into a string a rebuilt part replays.

package/dist/docx/xmlParser.d.ts

@@ -1,32 +1,5 @@
 import { ParseContext } from "./parseContext.js";
-/**
- * XML element tree node — drop-in replacement for the `Element` type
- * previously imported from `xml-js`. Every consumer imports this from
- * `xmlParser.ts`, so the shape must stay identical.
- */
-export type XmlElement = {
-  declaration?: {
-    attributes?: Record<string, string | number>;
-  };
-  instruction?: string;
-  attributes?: Record<string, string | number | undefined>;
-  cdata?: string;
-  doctype?: string;
-  comment?: string;
-  text?: string | number | boolean;
-  type?: string;
-  name?: string;
-  /** Resolved namespace URI; non-enumerable so legacy structural comparisons stay stable. */
-  namespaceUri?: string;
-  /** In-scope namespace declarations; non-enumerable so legacy comparisons stay stable. */
-  namespaceScope?: XmlNamespaceScope;
-  elements?: XmlElement[];
-};
-/** Parent-linked XML namespace declarations; each scope stores only local overrides. */
-export type XmlNamespaceScope = {
-  bindings: ReadonlyMap<string, string>;
-  parent?: XmlNamespaceScope;
-};
+import { XmlElement, XmlNamespaceScope } from "@stll/docx-core/xml";
 /**
  * Common OOXML namespace URIs — re-exported from @stll/docx-utils.
  */
@@ -67,16 +40,11 @@ export declare const NAMESPACES: {
  */
 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.
- */
-export declare function parseXmlWithFastXmlParser(xml: string, inheritedNamespaceScope?: XmlNamespaceScope): XmlElement;
 /**
  * Serialize an XmlElement back to an XML string.
  *
- * Written here rather than handed to `fast-xml-parser`'s builder for two
- * reasons. The builder writes a tab or a newline inside an attribute value
+ * Written here rather than handed to a general-purpose XML builder (the one
+ * folio used before) for two reasons. The builder writes a tab or a newline inside an attribute value
  * literally, and XML 1.0 §3.3.3 has every conformant reader normalise those to
  * a space: a `descr="two lines&#xA;"` a source file wrote came back as
  * `descr="two lines "`. `escapeXmlAttribute` writes the character references
@@ -405,4 +373,5 @@ export declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDec
  * original's scope leaves resolution unchanged whether or not the clone
  * carries `xmlns` attributes of its own.
  */
-export declare function cloneElement(element: XmlElement, overrides: Partial<XmlElement>): XmlElement;
+export declare function cloneElement(element: XmlElement, overrides: Partial<XmlElement>): XmlElement;
+export type { XmlElement, XmlNamespaceScope };

package/dist/docx/xmlParser.js

@@ -1,10 +1,9 @@
-import { parseStreamingXml } from "./streamingXmlParser.js";
 import { NUMBERS_PER_PERCENT, percentageSpelling, transitionalSlotEncoding } from "./transitionalSpelling.js";
 import { universalMeasureAs } from "./universalMeasure.js";
-import { EMPTY_NAMESPACE_SCOPE, attachXmlNamespaceContext, resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { escapeXmlAttribute, escapeXmlText } from "@stll/docx-core";
 import { PARSE_WARNING_CODES } from "@stll/docx-core/model";
-import { XMLParser } from "fast-xml-parser";
+import { XmlReadError, readXml } from "@stll/docx-core/xml";
+import { EMPTY_NAMESPACE_SCOPE, attachXmlNamespaceContext, resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
 import { OOXML_NS } from "@stll/docx-utils";
 // src/docx/xmlParser.ts
 /**
@@ -27,69 +26,6 @@ import { OOXML_NS } from "@stll/docx-utils";
 * - o:  Office (extensions)
 * - pic: Pictures
 */
-const fxpParserOptions = {
-	preserveOrder: true,
-	ignoreAttributes: false,
-	attributeNamePrefix: "",
-	trimValues: false,
-	textNodeName: "#text",
-	parseTagValue: false,
-	parseAttributeValue: false,
-	ignoreDeclaration: true,
-	ignorePiTags: true,
-	jPath: false,
-	processEntities: true,
-	htmlEntities: true
-};
-const fxpParserOptionsWithStopNodes = {
-	...fxpParserOptions,
-	stopNodes: ["*.w:binData"]
-};
-const fxpParser = new XMLParser(fxpParserOptions);
-const fxpParserWithStopNodes = new XMLParser(fxpParserOptionsWithStopNodes);
-/** Text node key used by fast-xml-parser in preserveOrder mode. */
-const TEXT_KEY = "#text";
-/** Attribute group key used by fast-xml-parser in preserveOrder mode. */
-const ATTR_KEY = ":@";
-/**
-* Convert a fast-xml-parser preserveOrder node into an XmlElement.
-*
-* In preserveOrder mode every node is an object with exactly one "real" key
-* (the tag name or `#text`) whose value is the children array, plus an
-* optional `:@` key holding the attributes object.
-*/
-function fxpNodeToElement(node, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) {
-	if (TEXT_KEY in node) return {
-		type: "text",
-		text: node[TEXT_KEY]
-	};
-	const attrs = node[ATTR_KEY];
-	for (const key in node) {
-		if (key === ATTR_KEY) continue;
-		const children = node[key];
-		const element = {
-			type: "element",
-			name: key
-		};
-		if (attrs) element.attributes = attrs;
-		const namespaceScope = attachXmlNamespaceContext(element, inheritedNamespaceScope);
-		if (children.length > 0) {
-			for (let index = 0; index < children.length; index += 1) children[index] = fxpNodeToElement(children[index], namespaceScope);
-			element.elements = children;
-		}
-		return element;
-	}
-	return { type: "element" };
-}
-/**
-* Convert the top-level fast-xml-parser preserveOrder array into an
-* XmlElement that matches xml-js's non-compact root structure:
-* `{ elements: [...] }`.
-*/
-function fxpToRootElement(nodes, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) {
-	for (let index = 0; index < nodes.length; index += 1) nodes[index] = fxpNodeToElement(nodes[index], inheritedNamespaceScope);
-	return { elements: nodes };
-}
 /**
 * Common OOXML namespace URIs — re-exported from @stll/docx-utils.
 */
@@ -112,21 +48,21 @@ const NAMESPACES = OOXML_NS;
 */
 const OOXML_NAMESPACE_SCOPE = { bindings: new Map(Object.entries(OOXML_NS)) };
 function parseXml(xml, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) {
-	const streamed = parseStreamingXml(xml, inheritedNamespaceScope);
-	return streamed.status === "parsed" ? streamed.value : parseXmlWithFastXmlParser(xml, inheritedNamespaceScope);
-}
-/**
-* The general-purpose reader {@link parseXml} falls back to, and the reference
-* the streaming reader's equivalence tests compare against.
-*/
-function parseXmlWithFastXmlParser(xml, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) {
-	return fxpToRootElement((xml.includes("binData") ? fxpParserWithStopNodes : fxpParser).parse(xml), inheritedNamespaceScope);
+	const read = readXml(xml, {
+		conformance: "tolerant",
+		inheritedNamespaceScope
+	});
+	if (read.status === "rejected") throw new XmlReadError({
+		message: `XML part could not be read: ${read.reason}`,
+		reason: read.reason
+	});
+	return read.value;
 }
 /**
 * Serialize an XmlElement back to an XML string.
 *
-* Written here rather than handed to `fast-xml-parser`'s builder for two
-* reasons. The builder writes a tab or a newline inside an attribute value
+* Written here rather than handed to a general-purpose XML builder (the one
+* folio used before) for two reasons. The builder writes a tab or a newline inside an attribute value
 * literally, and XML 1.0 §3.3.3 has every conformant reader normalise those to
 * a space: a `descr="two lines&#xA;"` a source file wrote came back as
 * `descr="two lines "`. `escapeXmlAttribute` writes the character references
@@ -853,4 +789,4 @@ function cloneElement(element, overrides) {
 	attachXmlNamespaceContext(clone, element.namespaceScope);
 	return clone;
 }
-export { NAMESPACES, OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, WORDPROCESSINGML_NAMESPACE_URIS, 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 { NAMESPACES, OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, WORDPROCESSINGML_NAMESPACE_URIS, 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, resolveAttributeNamespaceUri, selectAlternateContentBranch };

package/dist/docx/xmlSafety.js

@@ -1,4 +1,4 @@
-import { XMLValidator } from "fast-xml-parser";
+import { wellFormedXmlIssue } from "@stll/docx-core/xml";
 // src/docx/xmlSafety.ts
 const DOCTYPE_PATTERN = /<!DOCTYPE(?:\s|>)/iu;
 const BUILT_IN_ENTITIES = /* @__PURE__ */ new Set([
@@ -75,9 +75,9 @@ const scanName = (xml, start) => {
 	} : null;
 };
 /**
-* Reject lexical forms that fast-xml-parser's permissive validator repairs.
-* This is deliberately a small XML lexer, not a second tree parser: structural
-* nesting remains XMLValidator's job.
+* Reject lexical forms with a DOCX-specific verdict before the reader's
+* well-formedness check. This is deliberately a small XML lexer, not a second
+* tree parser: structural nesting remains the reader's job.
 */
 const hasInvalidXmlLexicalForm = (xml) => {
 	if (!containsOnlyXmlCharacters(xml)) return true;
@@ -160,6 +160,6 @@ const getDocxXmlSafetyIssue = (xml) => {
 	if (DOCTYPE_PATTERN.test(xml)) return "doctype-forbidden";
 	if (hasForbiddenEntity(xml)) return "entity-forbidden";
 	if (hasInvalidXmlLexicalForm(xml)) return "not-well-formed";
-	return XMLValidator.validate(xml) === true ? null : "not-well-formed";
+	return wellFormedXmlIssue(xml) === null ? null : "not-well-formed";
 };
 export { getDocxXmlSafetyIssue };

package/dist/fonts/bundledFonts.d.ts

@@ -0,0 +1,54 @@
+/**
+ * The document fonts folio bundles: one table for every place that names them.
+ *
+ * `@stll/folio-fonts` ships the files, and its generator
+ * (`scripts/generate-folio-fonts.ts`) reads this table to decide which files
+ * to copy and which `@font-face` rules to write, so the published package and
+ * the resolver here cannot disagree about a family. The module imports nothing:
+ * the generator, the resolver and the editor's availability check all read it
+ * without pulling in the rest of the engine.
+ */
+declare const PACKAGE_TABLE: {
+  readonly Arimo: "arimo";
+  readonly Caladea: "caladea";
+  readonly Carlito: "carlito";
+  readonly Cousine: "cousine";
+  readonly Lato: "lato";
+  readonly "Noto Sans Arabic": "noto-sans-arabic";
+  readonly "Source Sans 3": "source-sans-3";
+  readonly Tinos: "tinos";
+};
+export type FontsourcePackageTable = typeof PACKAGE_TABLE;
+/** Each bundled family and the directory (an `@fontsource` package name) that ships it. */
+export declare const FONTSOURCE_PACKAGES: FontsourcePackageTable;
+export type BundledFamily = keyof FontsourcePackageTable;
+/**
+ * What each bundled family stands in for, as prose for the package's notices.
+ * The resolver's own mapping lives in `utils/fontLoader.ts` and
+ * `utils/fontResolver.ts`.
+ */
+export declare const BUNDLED_FAMILY_SUBSTITUTES: Readonly<Record<BundledFamily, string>>;
+/**
+ * The subsets a headless measurer or the PDF writer reads, in resolution
+ * priority: a code point two subsets cover resolves to the earlier one.
+ * A browser is served every subset the family is cut into.
+ */
+export declare const MEASURED_SUBSETS: readonly ["latin", "latin-ext", "arabic"];
+export type MeasuredSubset = (typeof MEASURED_SUBSETS)[number];
+/** Folio paints 400 and 700 only, as `DisplayFontFace` states. */
+export declare const BUNDLED_WEIGHTS: readonly [400, 700];
+export type BundledWeight = (typeof BUNDLED_WEIGHTS)[number];
+/** The styles a family may be cut in; a family without italics ships `normal` only. */
+export declare const BUNDLED_STYLES: readonly ["normal", "italic"];
+export type BundledStyle = (typeof BUNDLED_STYLES)[number];
+/** `files/<package>-<subset>-<weight>-<style>.<format>`: the path of one served binary. */
+export declare const bundledFontFilePath: ({ packageName, subset, weight, style, format }: {
+  readonly packageName: string;
+  readonly subset: string;
+  readonly weight: number;
+  readonly style: BundledStyle;
+  readonly format: "woff" | "woff2";
+}) => string;
+/** Each family's directory carries the ranges its subsets were cut with. */
+export declare const UNICODE_RANGE_FILE = "unicode.json";
+export {};