@stll/folio-core 0.58.5 → 0.60.0

package/dist/docx/index.d.ts

@@ -1,6 +1,6 @@
 import { getCachedNumberingMap } from "./numberingParser.js";
-import { NO_NUMBERING_NUM_ID, NO_PARAGRAPH_NUMBERING, ParagraphNumberingOverride, ParagraphNumberingSlots, ResolvedParagraphNumbering, isNumberingReference, mergeParagraphNumbering, paragraphNumberingFromSlots, paragraphNumberingLevel, paragraphNumberingReferenceId, paragraphNumberingSlots, readParagraphNumbering, resolveParagraphNumbering, sameEffectiveParagraphNumbering, sameStatedParagraphNumbering } from "./numberingReference.js";
 import { DOCX_ENCRYPTION_ERROR_CODES, DocxEncryptionError, DocxEncryptionErrorCode, isDocxEncryptionError } from "./encryption/errors.js";
 import { DecryptDocxOptions, DecryptDocxResult, decryptDocxIfNeeded, openDocxBuffer } from "./encryption/openEncryptedDocx.js";
+import { NO_NUMBERING_NUM_ID, NO_PARAGRAPH_NUMBERING, ParagraphNumberingOverride, ParagraphNumberingSlots, ResolvedParagraphNumbering, isNumberingReference, mergeParagraphNumbering, paragraphNumberingFromSlots, paragraphNumberingLevel, paragraphNumberingReferenceId, paragraphNumberingSlots, readParagraphNumbering, resolveParagraphNumbering, sameEffectiveParagraphNumbering, sameStatedParagraphNumbering } from "./numberingReference.js";
 import { FOLIO_DOCUMENT_METADATA_PROPERTIES, FOLIO_DOCUMENT_PRIVACY_TRANSFORMS, FolioDocumentMetadataProperty, FolioDocumentPrivacyArchiveError, FolioDocumentPrivacyOptions, FolioDocumentPrivacyReport, FolioDocumentPrivacyTransform, InvalidFolioDocumentPrivacyOptionsError, RewriteDocxMetadataPrivacyResult, isFolioDocumentPrivacyTransform, rewriteDocxMetadataPrivacy } from "./metadataPrivacy.js";
 export { DOCX_ENCRYPTION_ERROR_CODES, type DecryptDocxOptions, type DecryptDocxResult, DocxEncryptionError, type DocxEncryptionErrorCode, FOLIO_DOCUMENT_METADATA_PROPERTIES, FOLIO_DOCUMENT_PRIVACY_TRANSFORMS, type FolioDocumentMetadataProperty, FolioDocumentPrivacyArchiveError, type FolioDocumentPrivacyOptions, type FolioDocumentPrivacyReport, type FolioDocumentPrivacyTransform, InvalidFolioDocumentPrivacyOptionsError, NO_NUMBERING_NUM_ID, NO_PARAGRAPH_NUMBERING, type ParagraphNumberingOverride, type ParagraphNumberingSlots, type ResolvedParagraphNumbering, type RewriteDocxMetadataPrivacyResult, decryptDocxIfNeeded, getCachedNumberingMap, isDocxEncryptionError, isFolioDocumentPrivacyTransform, isNumberingReference, mergeParagraphNumbering, openDocxBuffer, paragraphNumberingFromSlots, paragraphNumberingLevel, paragraphNumberingReferenceId, paragraphNumberingSlots, readParagraphNumbering, resolveParagraphNumbering, rewriteDocxMetadataPrivacy, sameEffectiveParagraphNumbering, sameStatedParagraphNumbering };

package/dist/docx/listMarkerComputation.js

@@ -1,6 +1,6 @@
 import { bulletMarkerFontName, convertBulletToUnicode } from "./bulletMarkers.js";
+import { resolveListTemplate } from "./listTemplate.js";
 import { isNumberingReference } from "./numberingReference.js";
-import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
 //#region src/docx/listMarkerComputation.ts
 const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }) => {
 	const listRendering = paragraph.listRendering;
@@ -22,7 +22,7 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 	let counters = listCounters.get(numId);
 	if (!counters) return;
 	const abstractNumId = numbering.getAbstractNumId(numId);
-	const styleNumbering = paragraph.formatting?.numPrFromStyle;
+	const styleNumbering = paragraph.formatting?.numPr?.kind !== "reference" && paragraph.formatting?.numPrFromStyle?.kind === "reference";
 	const resumesRestartedInstance = firstEncounter && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
 	const resumesStyleInstance = firstEncounter && !styleNumbering && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.fromStyle === true;
 	if (abstractNumId !== null && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) {
@@ -60,18 +60,13 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 		previousList.numId = null;
 		return;
 	}
-	let computedMarker = pattern;
-	const useLegalNumbering = numbering.getLevel(numId, level)?.isLgl === true || listRendering.isLegal === true;
-	for (let lvl = 0; lvl <= level; lvl += 1) {
-		const placeholder = `%${lvl + 1}`;
-		if (computedMarker.includes(placeholder)) {
-			const value = counters[lvl] ?? 0;
-			const levelInfo = numbering.getLevel(numId, lvl);
-			const formatted = formatOoxmlCounter(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
-			computedMarker = computedMarker.replaceAll(placeholder, formatted);
-		}
-	}
-	listRendering.marker = computedMarker;
+	const currentLevelInfo = numbering.getLevel(numId, level);
+	listRendering.marker = resolveListTemplate({
+		template: pattern,
+		counters,
+		levelFormats: listRendering.levelNumFmts ?? counters.map((_counter, ilvl) => numbering.getLevel(numId, ilvl)?.numFmt),
+		forceDecimal: currentLevelInfo?.isLgl === true || listRendering.isLegal === true
+	});
 };
 //#endregion
 export { computeListMarker };

package/dist/docx/listTemplate.d.ts

@@ -0,0 +1,22 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/docx/listTemplate.d.ts
+type ResolvedListComponent = {
+  level: number;
+  relativeStart: number;
+  start: number;
+  end: number;
+};
+type ResolvedListTemplate = {
+  value: string;
+  components: readonly ResolvedListComponent[];
+};
+type ResolveListTemplateOptions = {
+  template: string;
+  counters: readonly number[];
+  levelFormats?: readonly (document_d_exports.CounterFormat | undefined)[] | undefined;
+  forceDecimal?: boolean | undefined;
+};
+declare function resolveListTemplate(options: ResolveListTemplateOptions): string;
+declare function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal }: ResolveListTemplateOptions): ResolvedListTemplate;
+//#endregion
+export { ResolvedListComponent, ResolvedListTemplate, resolveListTemplate, resolveListTemplateWithComponents };

package/dist/docx/listTemplate.js

@@ -0,0 +1,40 @@
+import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
+//#region src/docx/listTemplate.ts
+function resolveListTemplate(options) {
+	return resolveListTemplateWithComponents(options).value;
+}
+function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal = false }) {
+	const components = [];
+	let value = "";
+	let sourceEnd = 0;
+	for (const match of template.matchAll(/%(?<digit>\d)(?<punct>[.):\]])?/gu)) {
+		const sourceStart = match.index;
+		const relativeStart = value.length;
+		value += template.slice(sourceEnd, sourceStart);
+		sourceEnd = sourceStart + match[0].length;
+		const index = Number.parseInt(match.groups?.["digit"] ?? "", 10) - 1;
+		const counter = counters[index];
+		if (index < 0 || counter === void 0 || !Number.isFinite(counter)) {
+			value += match.groups?.["punct"] ?? "";
+			continue;
+		}
+		const formatted = formatOoxmlCounter(counter, forceDecimal ? "decimal" : levelFormats?.[index]);
+		if (!formatted) continue;
+		const start = value.length;
+		value += formatted;
+		components.push({
+			level: index,
+			relativeStart,
+			start,
+			end: value.length
+		});
+		value += match.groups?.["punct"] ?? "";
+	}
+	value += template.slice(sourceEnd);
+	return {
+		value,
+		components
+	};
+}
+//#endregion
+export { resolveListTemplate, resolveListTemplateWithComponents };

package/dist/docx/numberingParser.js

@@ -1,6 +1,6 @@
 import { DERIVED_PART_ROOT_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
 import { CAPTURE, dispatchChildrenWithContext, sequencePositions } from "./containerChildren.js";
-import { isNumberingReference } from "./numberingReference.js";
+import { isNumberingReference as isNumberingReference$1 } from "./numberingReference.js";
 import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 import { parseParagraphProperties } from "./paragraphProperties.js";
 import { LevelSuffixSchema, NumberFormatSchema, ParagraphAlignmentSchema, narrowEnum } from "./parserEnums.js";
@@ -398,9 +398,9 @@ function getCachedNumberingMap(definitions) {
 */
 function createNumberingMap(definitions) {
 	const abstractMap = /* @__PURE__ */ new Map();
-	for (const abs of definitions.abstractNums) abstractMap.set(abs.abstractNumId, abs);
+	for (const abs of definitions.abstractNums) if (!abstractMap.has(abs.abstractNumId)) abstractMap.set(abs.abstractNumId, abs);
 	const numMap = /* @__PURE__ */ new Map();
-	for (const num of definitions.nums) numMap.set(num.numId, num);
+	for (const num of definitions.nums) if (!numMap.has(num.numId)) numMap.set(num.numId, num);
 	return {
 		definitions,
 		getLevel(numId, ilvl) {
@@ -459,7 +459,7 @@ function createNumberingMap(definitions) {
 */
 function computeListRendering(numPr, numbering) {
 	const { numId, ilvl = 0 } = numPr;
-	if (!isNumberingReference(numId)) return null;
+	if (!isNumberingReference$1(numId)) return null;
 	const level = numbering.getLevel(numId, ilvl);
 	if (!level) return null;
 	const levelNumFmts = [];

package/dist/docx/numberingReferenceNormalization.js

@@ -1,4 +1,4 @@
-import { NO_PARAGRAPH_NUMBERING as NO_PARAGRAPH_NUMBERING$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "./numberingReference.js";
+import { NO_PARAGRAPH_NUMBERING as NO_PARAGRAPH_NUMBERING$1, paragraphNumberingReferenceId } from "./numberingReference.js";
 import { visitDocxParagraphs } from "./paragraphTraversal.js";
 import { PARSE_WARNING_CODES } from "@stll/docx-core/model";
 //#region src/docx/numberingReferenceNormalization.ts
@@ -40,7 +40,7 @@ const normalizeNumberingReferences = ({ documentBody, numbering, headers, footer
 		endnotes
 	}, (paragraph) => {
 		const formatting = paragraph.formatting;
-		const numId = paragraphNumberingReferenceId$1(formatting?.numPr);
+		const numId = paragraphNumberingReferenceId(formatting?.numPr);
 		if (!formatting || numId === void 0 || resolvesNumbering(numId, numbering)) return;
 		formatting.numPr = NO_PARAGRAPH_NUMBERING$1;
 		delete formatting.numPrFromStyle;
@@ -53,7 +53,7 @@ const normalizeStyleNumberingReferences = ({ styles, numbering }) => {
 	const unnumberedStyleIds = [];
 	for (const style of styles) {
 		const pPr = style.pPr;
-		const numId = paragraphNumberingReferenceId$1(pPr?.numPr);
+		const numId = paragraphNumberingReferenceId(pPr?.numPr);
 		if (!pPr || numId === void 0 || resolvesNumbering(numId, numbering)) continue;
 		pPr.numPr = NO_PARAGRAPH_NUMBERING$1;
 		unnumberedStyleIds.push(style.styleId);

package/dist/docx/paragraphParser.js

@@ -12,7 +12,7 @@ import { inlineWrapperOf } from "./inlineWrapperParser.js";
 import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
 import { parseMarkupRangeMarker, parseMoveBookmarkMarker } from "./markupRangeMarker.js";
 import { counterFormatOf, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot } from "./numberingParser.js";
-import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
+import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
 import { paraIdAttribute, textIdAttribute } from "./paraIdAttribute.js";
 import { paraIdInRange } from "./paraIdRangeNormalization.js";
 import { EMPTY_MARK_PROPERTIES_ATTRIBUTE, restoreEmptyMarkProperties } from "./paragraphMarkPropertyPresence.js";
@@ -1253,7 +1253,6 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 	let effectiveNumPr = directNumPr;
 	if (paragraphFormatting && numPrFromStyle) {
 		effectiveNumPr = mergeParagraphNumbering$1(styleNumPr, directNumPr);
-		if (effectiveNumPr !== void 0) paragraphFormatting.numPr = effectiveNumPr;
 		paragraphFormatting.numPrFromStyle = styleNumPr;
 	}
 	const resolvedNumbering = resolveParagraphNumbering$1(effectiveNumPr);
@@ -1444,7 +1443,7 @@ function isEmptyParagraph(paragraph) {
 * @returns true if paragraph has numbering properties
 */
 function isListItem(paragraph) {
-	return paragraphNumberingReferenceId$1(paragraph.formatting?.numPr) !== void 0;
+	return paragraphNumberingReferenceId(mergeParagraphNumbering$1(paragraph.formatting?.numPrFromStyle, paragraph.formatting?.numPr)) !== void 0;
 }
 /**
 * Get the list level of a paragraph (0-8)
@@ -1453,7 +1452,7 @@ function isListItem(paragraph) {
 * @returns List level or undefined if not a list item
 */
 function getListLevel(paragraph) {
-	const resolved = resolveParagraphNumbering$1(paragraph.formatting?.numPr);
+	const resolved = resolveParagraphNumbering$1(mergeParagraphNumbering$1(paragraph.formatting?.numPrFromStyle, paragraph.formatting?.numPr));
 	return resolved.kind === "reference" ? resolved.ilvl : void 0;
 }
 /**

package/dist/docx/paragraphPropertySource.js

@@ -5,7 +5,6 @@ import { parseParagraphProperties } from "./paragraphProperties.js";
 import { visitDocxParagraphs } from "./paragraphTraversal.js";
 import { parseXmlDocument } from "./xmlParser.js";
 import { TaggedError, panic } from "better-result";
-import { PluginKey } from "prosemirror-state";
 //#region src/docx/paragraphPropertySource.ts
 const paragraphPropertySourceEmissionFingerprint = Symbol("paragraphPropertySourceEmissionFingerprint");
 const paragraphPropertySourceIndentationBaseline = Symbol("paragraphPropertySourceIndentationBaseline");
@@ -793,7 +792,7 @@ const createProseParagraphWithPropertySource = (nodeType, sourceParagraph, optio
 	linkProseParagraphPropertySource(paragraph, sourceParagraph);
 	return paragraph;
 };
-const paragraphPropertySourceTransfersKey = new PluginKey("paragraphPropertySourceTransfers");
+const paragraphPropertySourceTransfersKey = "stll.folio.meta.paragraphPropertySourceTransfers";
 /** Join adjacent paragraphs when revision semantics deliberately select the right owner. */
 const joinProseParagraphsWithRightPropertySource = ({ attrs, pos, transaction }) => {
 	const $pos = transaction.doc.resolve(pos);

package/dist/docx/parseContext.d.ts

@@ -1,8 +1,9 @@
-import { ParseWarning, ParseWarningCode } from "@stll/docx-core/model";
+import { ImportedIdCollisionKind, ParseWarning, ParseWarningCode } from "@stll/docx-core/model";
 //#region src/docx/parseContext.d.ts
 /** What a call site states; the collector supplies the rest. */
 type ParseWarningReport = {
   code: ParseWarningCode;
+  identityKind?: ImportedIdCollisionKind;
   /** The element as written, prefix included. */
   element?: string;
   /** The best position this part can name, e.g. `style "Heading1"`. */

package/dist/docx/parseContext.js

@@ -30,6 +30,7 @@ const createParseWarningCollector = (part = PACKAGE_PART) => {
 		retainedByCode.set(report.code, kept + 1);
 		retained.push({
 			code: report.code,
+			...report.identityKind === void 0 ? {} : { identityKind: report.identityKind },
 			location: {
 				...location,
 				...report.element === void 0 ? {} : { element: report.element },

package/dist/docx/parseWarningMessage.js

@@ -22,6 +22,7 @@ const PARSE_WARNING_MESSAGES = {
 	[PARSE_WARNING_CODES.documentPartMissing]: () => "No document.xml found in DOCX",
 	[PARSE_WARNING_CODES.documentModelIssue]: (warning) => warning.detail ?? "The document model reported an issue.",
 	[PARSE_WARNING_CODES.duplicateCommentId]: (warning) => `Dropped ${plural(warning.count, "comment")} repeating a w:id another comment already defines.`,
+	[PARSE_WARNING_CODES.duplicateImportedId]: (warning) => `Repeated imported identity${quoted(warning.value)}${where(warning)}: ${warning.detail ?? "multiple definitions share an identity."}`,
 	[PARSE_WARNING_CODES.missingCommentId]: (warning) => `Dropped ${plural(warning.count, "comment")} with no readable w:id.`,
 	[PARSE_WARNING_CODES.duplicateNoteId]: (warning) => `Dropped ${plural(warning.count, "note")} repeating a w:id another note already defines.`,
 	[PARSE_WARNING_CODES.danglingCommentReference]: (warning) => `Removed ${plural(warning.count, "dangling comment reference marker")} whose comments.xml entries are missing.`,

package/dist/docx/parser.js

@@ -2,6 +2,7 @@ import { toArrayBuffer } from "../utils/docxInput.js";
 import { loadFontsWithMapping } from "../utils/fontLoader.js";
 import { MAX_PACKAGE_TIFF_PIXELS, convertTiffToPngDataUrl, isTiffMimeType } from "../utils/tiffConverter.js";
 import { ALT_CHUNK_PLAIN_TEXT_LIMIT_BYTES, getAltChunkRelationshipId, isAltChunkMarkup } from "./altChunk.js";
+import { normalizeBookmarkIdsInXmlParts } from "./bookmarkIdNormalization.js";
 import { DUPLICATE_COMMENT_ID_WARNING, normalizeCommentIds } from "./commentIdNormalization.js";
 import { parseComments } from "./commentParser.js";
 import { DANGLING_COMMENT_REFERENCE_WARNING, UNBALANCED_COMMENT_RANGE_WARNING, normalizeCommentReferences } from "./commentReferenceNormalization.js";
@@ -16,6 +17,7 @@ import { parseEndnotes, parseFootnotes } from "./footnoteParser.js";
 import { parseFooter, parseHeader } from "./headerFooterParser.js";
 import { DANGLING_FOOTER_REFERENCE_WARNING, DANGLING_HEADER_REFERENCE_WARNING, assignHeaderFooterRoles, normalizeHeaderFooterReferences } from "./headerFooterReferenceNormalization.js";
 import { assignHeaderFooterVerbatimXml, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, refreshHeaderFooterVerbatimFingerprint } from "./headerFooterVerbatim.js";
+import { diagnoseImportedIdCollisions } from "./importedIdCollisions.js";
 import { extractMetafileRaster, isMetafileMimeType } from "./metafileRaster.js";
 import { renderEmfSvg } from "./metafileSvg.js";
 import { DocxModelValidationError, formatDocumentModelIssues, validateFolioDocumentModel } from "./modelValidation.js";
@@ -34,7 +36,7 @@ import { parseSettings } from "./settingsParser.js";
 import { parseStylesPackage } from "./styleParser.js";
 import { applyThemeFontLang, parseTheme } from "./themeParser.js";
 import { UNBALANCED_MOVE_RANGE_WARNING, normalizeTrackedMoveRanges } from "./trackedMoveRangeNormalization.js";
-import { getEntryUncompressedSize, getMediaMimeType, mediaToDataUrl, unzipDocx } from "./unzip.js";
+import { getEntryUncompressedSize, getMediaMimeType, mediaToDataUrl, replaceRawDocxXmlParts, unzipDocx } from "./unzip.js";
 import { getAttribute, getChildElements, getLocalName, parseXml, parseXmlDocument } from "./xmlParser.js";
 import { FOLIO_XML_RESOURCE_LIMITS } from "./xmlResourceLimits.js";
 import { TaggedError, panic } from "better-result";
@@ -192,6 +194,8 @@ async function parseDocxWithPreviewBudget(input, options, previewBudget) {
 			password,
 			extractAllXml: false
 		}));
+		diagnoseImportedIdCollisions(raw.allXml, parseContext);
+		await replaceRawDocxXmlParts(raw, normalizeBookmarkIdsInXmlParts(raw.allXml));
 		const repairedDocumentTree = await normalizeRawDocxNumericIds(raw);
 		const paragraphPropertySourceDigest = sha256Hex(raw.originalBuffer);
 		if (raw.wasEncrypted) parseContext.warn({ code: PARSE_WARNING_CODES.packageDecrypted });

package/dist/docx/relsParser.js

@@ -86,7 +86,7 @@ function parseRelationships(relsXml) {
 		};
 		if (targetMode === "External") relationship.targetMode = "External";
 		else if (targetMode === "Internal") relationship.targetMode = "Internal";
-		map.set(id, relationship);
+		if (!map.has(id)) map.set(id, relationship);
 	}
 	return map;
 }

package/dist/docx/rezip.js

@@ -16,7 +16,7 @@ import { assertValidFolioDocumentModel } from "./modelValidation.js";
 import { isNewDataUrlDrawing } from "./newImage.js";
 import { missingNoteReferenceStyles, noteReferenceNeeds } from "./noteReferenceStyles.js";
 import { parseNumbering } from "./numberingParser.js";
-import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "./numberingReference.js";
+import { paragraphNumberingReferenceId } from "./numberingReference.js";
 import { isUnsafePackagePath, reconcilePackageReferences, removeUnsafeEntries } from "./packageParts.js";
 import { normalizeParaIdRangeInXmlParts } from "./paraIdRangeNormalization.js";
 import { cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, copyDocumentParagraphPropertySourceContract } from "./paragraphPropertySource.js";
@@ -25,7 +25,7 @@ import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./r
 import { removeResolvedHeaderFooterParts } from "./removeHeaderFooterParts.js";
 import { normalizeRevisionIdsInXmlParts } from "./revisionIdNormalization.js";
 import { buildPatchedNotePartXml, collectChangedNoteParaIds, collectParaIds, patchNumberingDefinitions, spliceXml } from "./selectiveXmlPatch.js";
-import { hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
+import { canReplayCommentsPart, hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeFontTableXml } from "./serializer/fontTableSerializer.js";
 import { serializeHeaderFooter } from "./serializer/headerFooterSerializer.js";
@@ -201,6 +201,7 @@ async function serializeCommentsToZip(doc, zip, compressionLevel) {
 	const comments = doc.package.document.comments ?? [];
 	const sourceCommentsFile = findZipEntryCaseInsensitive(zip, "word/comments.xml");
 	const sourceCommentsXml = sourceCommentsFile ? await sourceCommentsFile.async("text") : void 0;
+	if (sourceCommentsXml !== void 0 && canReplayCommentsPart(doc, sourceCommentsXml)) return;
 	if (comments.length === 0) {
 		const ownsCommentsPart = hasOwnedCommentsPart(doc);
 		if (sourceCommentsXml === void 0 ? !ownsCommentsPart : !hasCommentEntries(sourceCommentsXml)) return;
@@ -2462,7 +2463,7 @@ const overrideXml = (partName, contentType) => `<Override PartName="${partName}"
 const assertStyleNumberingReferences = (doc) => {
 	const referenced = /* @__PURE__ */ new Set();
 	for (const style of doc.package.styles?.styles ?? []) {
-		const numId = paragraphNumberingReferenceId$1(style.pPr?.numPr);
+		const numId = paragraphNumberingReferenceId(style.pPr?.numPr);
 		if (numId !== void 0) referenced.add(numId);
 	}
 	if (referenced.size === 0) return;

package/dist/docx/selectedXmlIdentityScan.d.ts

@@ -0,0 +1,10 @@
+import { scanStreamingXmlElements } from "./streamingXmlParser.js";
+//#region src/docx/selectedXmlIdentityScan.d.ts
+/** Identity census follows the parser's first-Choice, otherwise-Fallback policy. */
+declare const scanSelectedStreamingXmlElements: (xml: string, visitor: Parameters<typeof scanStreamingXmlElements>[1]) => {
+  status: "unsupported";
+} | {
+  status: "scanned";
+};
+//#endregion
+export { scanSelectedStreamingXmlElements };

package/dist/docx/selectedXmlIdentityScan.js

@@ -0,0 +1,36 @@
+import { scanStreamingXmlElements } from "./streamingXmlParser.js";
+import { NAMESPACES, getLocalName, getNamespaceUri, selectAlternateContentBranch } from "./xmlParser.js";
+//#region 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. */
+const scanSelectedStreamingXmlElements = (xml, visitor) => {
+	if (!xml.includes("AlternateContent")) return scanStreamingXmlElements(xml, visitor);
+	const alternatives = /* @__PURE__ */ new Map();
+	const positions = /* @__PURE__ */ new WeakMap();
+	const scanned = scanStreamingXmlElements(xml, ({ element, parent, nameEnd }) => {
+		positions.set(element, nameEnd);
+		if (isCompatibilityElement(element, "AlternateContent")) {
+			element.elements = [];
+			alternatives.set(nameEnd, element);
+		}
+		if (!parent || !isCompatibilityElement(parent, "AlternateContent")) return;
+		parent.elements?.push(element);
+	});
+	if (scanned.status === "unsupported") return scanned;
+	const selectedPositions = /* @__PURE__ */ new Map();
+	for (const [position, alternative] of alternatives) {
+		const selected = selectAlternateContentBranch(alternative);
+		selectedPositions.set(position, selected === void 0 ? void 0 : positions.get(selected));
+	}
+	const active = /* @__PURE__ */ new WeakMap();
+	return scanStreamingXmlElements(xml, (entry) => {
+		const { element, parent, nameEnd } = entry;
+		positions.set(element, nameEnd);
+		let included = parent === void 0 || active.get(parent) === true;
+		if (parent && isCompatibilityElement(parent, "AlternateContent")) included &&= nameEnd === selectedPositions.get(positions.get(parent) ?? -1);
+		active.set(element, included);
+		if (included) visitor(entry);
+	});
+};
+//#endregion
+export { scanSelectedStreamingXmlElements };

package/dist/docx/selectiveSave.js

@@ -10,7 +10,7 @@ import { RELATIONSHIP_TYPES } from "./relsParser.js";
 import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, hasUnmaterializedHyperlinkBindings, hasUnmaterializedInlineResources, planAddedStyles, publishCanonicalImageResources, updateCoreProperties, withoutAttachedTemplate } from "./rezip.js";
 import "./selectiveSaveFlags.js";
 import { buildPatchedDocumentXml, buildPatchedNoteXml, collectAddedNumberingDefs, collectParaIds, patchNumberingDefinitions } from "./selectiveXmlPatch.js";
-import { hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
+import { canReplayCommentsPart, hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeEndnotes, serializeFootnotes } from "./serializer/noteSerializer.js";
 import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
@@ -262,8 +262,9 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 		}
 		const sourceCommentsFile = findZipEntryCaseInsensitive(zip, "word/comments.xml");
 		const commentsPartPath = sourceCommentsFile?.name ?? "word/comments.xml";
-		if (hasComments || ownsCommentsPart || sourceCommentsFile) {
-			const sourceCommentsXml = sourceCommentsFile ? await sourceCommentsFile.async("text") : void 0;
+		const sourceCommentsXml = sourceCommentsFile ? await sourceCommentsFile.async("text") : void 0;
+		const commentsUnchanged = sourceCommentsXml !== void 0 && canReplayCommentsPart(doc, sourceCommentsXml);
+		if (!commentsUnchanged && (hasComments || ownsCommentsPart || sourceCommentsFile)) {
 			const commentsXml = serializeComments(commentPlan, sourceCommentsXml === void 0 ? void 0 : readRootNamespaceBindings(sourceCommentsXml));
 			if (commentsXml !== sourceCommentsXml) updates.set(commentsPartPath, commentsXml);
 		}
@@ -283,7 +284,7 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 				}
 			}
 		}
-		if (!await patchCommentsExtended(zip, commentPlan, updates)) return null;
+		if (!commentsUnchanged && !await patchCommentsExtended(zip, commentPlan, updates)) return null;
 		if (!await patchNumberingPart(zip, doc, updates)) return null;
 		const styles = await planAddedStyles(doc, zip);
 		switch (styles.type) {

package/dist/docx/selectiveXmlPatch.js

@@ -1,6 +1,7 @@
 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";
@@ -650,36 +651,32 @@ function extractElementByIdAttr(xml, openLiteral, closeTag, idAttr, id) {
 const qualifiedName = (prefix, localName) => prefix.length === 0 ? localName : `${prefix}:${localName}`;
 const collectNoteElementSyntax = (xml, elementName) => {
 	const byId = /* @__PURE__ */ new Map();
-	const root = parseXmlDocument(xml);
-	for (const element of getChildElements(root)) {
-		if (getLocalName(element.name) !== elementName || !WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "")) continue;
+	let root;
+	scanStreamingXmlElements(xml, ({ element, parent, nameEnd }) => {
+		if (parent === void 0) {
+			root = element;
+			return;
+		}
+		if (parent !== root || getLocalName(element.name) !== elementName || !WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "")) return;
 		const idAttribute = findAttributeByNamespaceUri(element, WORDPROCESSINGML_NAMESPACE_URIS, "id");
-		if (!element.name || !idAttribute) continue;
+		if (!element.name || !idAttribute) return;
+		const spelling = idAttribute.value.trim();
+		if (!/^[+-]?\d+$/u.test(spelling) || !Number.isSafeInteger(Number(spelling))) return;
+		const id = String(Number(spelling));
+		const offsets = scanElementRange(xml, nameEnd - element.name.length - 1, `<${element.name}`, `</${element.name}>`);
+		if (!offsets) return;
 		const syntax = {
-			elementName: element.name,
-			idAttributeName: idAttribute.name,
+			offsets,
 			elementPrefix: getNamespacePrefix(element.name) ?? "",
 			attributePrefix: getNamespacePrefix(idAttribute.name) ?? ""
 		};
-		const entries = byId.get(idAttribute.value);
+		const entries = byId.get(id);
 		if (entries) entries.push(syntax);
-		else byId.set(idAttribute.value, [syntax]);
-	}
+		else byId.set(id, [syntax]);
+	});
 	return byId;
 };
-const syntaxLiteral = (syntax) => ({
-	openLiteral: `<${syntax.elementName}`,
-	closeTag: `</${syntax.elementName}>`,
-	idAttr: syntax.idAttributeName
-});
-const extractNoteElement = (xml, syntax, id) => {
-	const { openLiteral, closeTag, idAttr } = syntaxLiteral(syntax);
-	return extractElementByIdAttr(xml, openLiteral, closeTag, idAttr, id);
-};
-const findNoteElement = (xml, syntax, id) => {
-	const { openLiteral, closeTag, idAttr } = syntaxLiteral(syntax);
-	return findElementByIdAttr(xml, openLiteral, closeTag, idAttr, id);
-};
+const extractNoteElement = (xml, syntax) => xml.slice(syntax.offsets.start, syntax.offsets.end);
 const rewriteWordprocessingPrefixes = (xml, { source, target, sourceXmlnsDeclarations }) => {
 	let rewritten = "";
 	let quote = null;
@@ -824,7 +821,7 @@ function buildPatchedNotePartXml({ originalXml, baselineXml, serializedXml, repl
 		const replacementSyntaxEntries = replacementElements.get(id);
 		if (originalSyntaxEntries === void 0) {
 			const replacementSyntax = currentSyntaxEntries.length === 1 && replacementSyntaxEntries?.length === 1 ? replacementSyntaxEntries[0] : void 0;
-			const replacementNote = replacementSyntax ? extractNoteElement(replacementXml, replacementSyntax, id) : null;
+			const replacementNote = replacementSyntax ? extractNoteElement(replacementXml, replacementSyntax) : null;
 			if (!replacementSyntax || !replacementNote) return {
 				type: "refused",
 				reason: "unroutable-paragraph"
@@ -836,24 +833,20 @@ function buildPatchedNotePartXml({ originalXml, baselineXml, serializedXml, repl
 			});
 			continue;
 		}
-		if (currentSyntaxEntries.length !== 1 || originalSyntaxEntries?.length !== 1 || replacementSyntaxEntries?.length !== 1) return {
+		if (currentSyntaxEntries.length !== 1 || !originalSyntaxEntries?.length || replacementSyntaxEntries?.length !== 1) return {
 			type: "refused",
 			reason: "unroutable-paragraph"
 		};
 		const currentSyntax = currentSyntaxEntries[0];
-		const originalSyntax = originalSyntaxEntries[0];
+		const originalSyntax = originalSyntaxEntries.at(0);
 		const replacementSyntax = replacementSyntaxEntries[0];
 		if (!currentSyntax || !originalSyntax || !replacementSyntax) return {
 			type: "refused",
 			reason: "unroutable-paragraph"
 		};
-		const currentNote = extractNoteElement(serializedXml, currentSyntax, id);
-		const originalOffsets = findNoteElement(originalXml, originalSyntax, id);
-		const replacementNote = extractNoteElement(replacementXml, replacementSyntax, id);
-		if (!currentNote || !originalOffsets || !replacementNote) return {
-			type: "refused",
-			reason: "unroutable-paragraph"
-		};
+		const currentNote = extractNoteElement(serializedXml, currentSyntax);
+		const originalOffsets = originalSyntax.offsets;
+		const replacementNote = extractNoteElement(replacementXml, replacementSyntax);
 		const originalNote = originalXml.slice(originalOffsets.start, originalOffsets.end);
 		const currentParagraphs = paragraphRanges(currentNote, currentSyntax.elementPrefix);
 		const originalParagraphs = paragraphRanges(originalNote, originalSyntax.elementPrefix);
@@ -861,7 +854,7 @@ function buildPatchedNotePartXml({ originalXml, baselineXml, serializedXml, repl
 		const noteChangedParaIds = [...collectParaIds(currentNote).keys()].filter((paraId) => unroutedChangedParaIds.has(paraId));
 		const baselineSyntaxEntries = baselineElements.get(id);
 		const baselineSyntax = baselineSyntaxEntries?.length === 1 ? baselineSyntaxEntries[0] : void 0;
-		const baselineNote = baselineSyntax ? extractNoteElement(baselineXml, baselineSyntax, id) : null;
+		const baselineNote = baselineSyntax ? extractNoteElement(baselineXml, baselineSyntax) : null;
 		const reshaped = baselineSyntax !== void 0 && baselineNote !== null && baselineNote !== currentNote && noteShapeChanged({
 			note: baselineNote,
 			prefix: baselineSyntax.elementPrefix
@@ -910,26 +903,29 @@ function buildPatchedNotePartXml({ originalXml, baselineXml, serializedXml, repl
 	for (const [id, baselineSyntaxEntries] of baselineElements) {
 		if (currentElements.has(id) || baselineSyntaxEntries.length !== 1) continue;
 		const originalSyntaxEntries = originalElements.get(id);
-		const originalSyntax = originalSyntaxEntries?.length === 1 ? originalSyntaxEntries[0] : void 0;
-		const originalOffsets = originalSyntax && findNoteElement(originalXml, originalSyntax, id);
-		if (!originalOffsets) return {
+		if (!originalSyntaxEntries?.length) return {
 			type: "refused",
 			reason: "unroutable-paragraph"
 		};
-		const removal = {
-			start: originalOffsets.start,
-			end: originalOffsets.end,
-			newXml: ""
-		};
-		paragraphSplices.push(removal);
-		noteSplices.push(removal);
+		for (const { offsets } of originalSyntaxEntries) {
+			const removal = {
+				...offsets,
+				newXml: ""
+			};
+			paragraphSplices.push(removal);
+			noteSplices.push(removal);
+		}
 	}
 	if (unroutedChangedParaIds.size > 0) return {
 		type: "refused",
 		reason: "unroutable-paragraph"
 	};
 	if (addedNotes.length > 0) {
-		const appended = appendNotesSplice(originalXml, originalElements, addedNotes, { sourceXmlnsDeclarations: replacementXmlnsDeclarations });
+		const appended = appendNotesSplice({
+			originalElements,
+			addedNotes,
+			sourceXmlnsDeclarations: replacementXmlnsDeclarations
+		});
 		if (!appended) return {
 			type: "refused",
 			reason: "unroutable-paragraph"
@@ -951,15 +947,11 @@ function buildPatchedNotePartXml({ originalXml, baselineXml, serializedXml, repl
 		xml: wholeNotes
 	};
 }
-/**
-* Insert new notes after the part's last note, spelled with that note's
-* prefixes. Null when the part holds no note to follow.
-*/
-const appendNotesSplice = (originalXml, originalElements, addedNotes, { sourceXmlnsDeclarations }) => {
+const appendNotesSplice = ({ originalElements, addedNotes, sourceXmlnsDeclarations }) => {
 	let last = null;
-	for (const [id, entries] of originalElements) for (const syntax of entries) {
-		const offsets = findNoteElement(originalXml, syntax, id);
-		if (offsets && (!last || offsets.end > last.end)) last = {
+	for (const entries of originalElements.values()) for (const syntax of entries) {
+		const offsets = syntax.offsets;
+		if (!last || offsets.end > last.end) last = {
 			end: offsets.end,
 			syntax
 		};

package/dist/docx/serializer/commentSerializer.d.ts

@@ -1,6 +1,8 @@
 import { document_d_exports } from "../../types/document.js";
 import { Comment } from "../../types/content.js";
 //#region src/docx/serializer/commentSerializer.d.ts
+/** An unrelated body edit must retain unmodelled duplicate comment definitions. */
+declare const canReplayCommentsPart: (document: document_d_exports.Document, sourceXml: string) => boolean;
 /** An owned empty part survives deletion of its final thread. */
 declare const hasOwnedCommentsPart: (document: document_d_exports.Document) => boolean;
 /**
@@ -55,4 +57,4 @@ declare function serializeComments({ order, byId }: CommentPartPlan, sourceBindi
  */
 declare function serializeCommentsExtended(plan: CommentPartPlan): string | null;
 //#endregion
-export { CommentPartPlan, hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended };
+export { CommentPartPlan, canReplayCommentsPart, hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended };