@stll/folio-core 0.61.0 → 0.63.0

package/dist/docx/rezip.d.ts

@@ -1,13 +1,13 @@
 import { document_d_exports } from "../types/document.js";
 import { CANONICAL_GAP } from "../types/canonicalCapabilities.js";
-import { SaveDiagnosticOptions } from "./saveDiagnostics.js";
 import { BlockContent, Hyperlink } from "../types/content.js";
+import { SaveDiagnosticOptions } from "./saveDiagnostics.js";
 import { DocumentBodyAuthorityOptions } from "./serializer/documentSerializer.js";
 import { RawDocxContent } from "./unzip.js";
 import JSZip from "jszip";
 //#region src/docx/rezip.d.ts
 declare const DocxPackageFidelityError_base: import("better-result").TaggedErrorClass<"DocxPackageFidelityError">;
-declare class DocxPackageFidelityError extends DocxPackageFidelityError_base<{
+export declare class DocxPackageFidelityError extends DocxPackageFidelityError_base<{
   message: string;
 }> {
   constructor(message: string);
@@ -22,7 +22,7 @@ declare class DocxPackageFidelityError extends DocxPackageFidelityError_base<{
  * The paragraph is named because the count alone does not say which of them the
  * save invented.
  */
-declare class DocxDuplicateSectionCarrierError extends DocxPackageFidelityError {
+export declare class DocxDuplicateSectionCarrierError extends DocxPackageFidelityError {
   /** The `w:paraId` of the duplicate carrier, when the package gave it one. */
   readonly paraId: string | null;
   /** Its position among the paragraph-level carriers, in document order. */
@@ -38,7 +38,7 @@ declare class DocxDuplicateSectionCarrierError extends DocxPackageFidelityError
 /**
  * Find the highest rId number in a relationships XML string.
  */
-declare function findMaxRId(relsXml: string): number;
+export declare function findMaxRId(relsXml: string): number;
 /**
  * Every serialized section has exactly one model record, and vice versa.
  *
@@ -51,12 +51,12 @@ declare function findMaxRId(relsXml: string): number;
  * to `""` for a record holding settings it cannot write, so carrier uniqueness
  * alone does not prove the package states the sections the model holds.
  */
-declare const assertSectionCarriersMatchModel: ({ doc, serializedSectionCount }: {
+export declare const assertSectionCarriersMatchModel: ({ doc, serializedSectionCount }: {
   doc: document_d_exports.Document;
   serializedSectionCount: number;
 }) => void;
 declare const CanonicalImageRelationshipRefusalError_base: import("better-result").TaggedErrorClass<"CanonicalImageRelationshipRefusalError">;
-declare class CanonicalImageRelationshipRefusalError extends CanonicalImageRelationshipRefusalError_base<{
+export declare class CanonicalImageRelationshipRefusalError extends CanonicalImageRelationshipRefusalError_base<{
   message: string;
   gap: typeof CANONICAL_GAP.save;
   part: string;
@@ -69,17 +69,17 @@ type PublishCanonicalImageResourcesOptions = {
   compressionLevel: number;
 };
 /** Publish allocated pictures into each owning story without rebinding canonical ids. */
-declare const publishCanonicalImageResources: ({ document, zip, compressionLevel }: PublishCanonicalImageResourcesOptions) => Promise<void>;
+export declare const publishCanonicalImageResources: ({ document, zip, compressionLevel }: PublishCanonicalImageResourcesOptions) => Promise<void>;
 /** Newly authored text links; the census shares the complete owning-part traversal. */
-declare function collectHyperlinksWithoutRId(blocks: BlockContent[]): Hyperlink[];
+export declare function collectHyperlinksWithoutRId(blocks: BlockContent[]): Hyperlink[];
 /** The selective save boundary must use the same resource census as full repack. */
-declare const hasUnmaterializedInlineResources: (blocks: BlockContent[]) => boolean;
+export declare const hasUnmaterializedInlineResources: (blocks: BlockContent[]) => boolean;
 /** Compare against the already loaded source ZIP, without mutating model or package. */
-declare const hasUnmaterializedHyperlinkBindings: (document: document_d_exports.Document, zip: JSZip) => Promise<boolean>;
+export declare const hasUnmaterializedHyperlinkBindings: (document: document_d_exports.Document, zip: JSZip) => Promise<boolean>;
 /**
  * Options for repacking DOCX
  */
-type RepackOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOptions & {
+export type RepackOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOptions & {
   /** Compression level (0-9, default: 6) */
   compressionLevel?: number;
   /** Whether to update modification date in docProps/core.xml */
@@ -89,7 +89,7 @@ type RepackOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOptions & {
   /** Changed note paragraphs that must be serialized even without source paraIds. */
   changedNoteParaIds?: ReadonlySet<string>;
 };
-declare function repackDocx(doc: document_d_exports.Document, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare function repackDocx(doc: document_d_exports.Document, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Repack a Document using raw content for more control
  *
@@ -98,15 +98,15 @@ declare function repackDocx(doc: document_d_exports.Document, options?: RepackOp
  * @param options - Optional repack options
  * @returns Promise resolving to DOCX as ArrayBuffer
  */
-declare function repackDocxFromRaw(doc: document_d_exports.Document, rawContent: RawDocxContent, options?: RepackOptions): Promise<ArrayBuffer>;
-declare const COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
-declare const COMMENTS_EXTENDED_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml";
-declare const COMMENTS_EXTENDED_PART = "word/commentsExtended.xml";
-declare const COMMENTS_EXTENDED_PART_LOWER = "word/commentsextended.xml";
-declare function addCommentsExtendedOverride(contentTypesXml: string): string;
-declare function removeCommentsExtendedOverride(contentTypesXml: string): string;
-declare function addCommentsExtendedRelationship(relsXml: string): string;
-declare function removeCommentsExtendedRelationship(relsXml: string): string;
+export declare function repackDocxFromRaw(doc: document_d_exports.Document, rawContent: RawDocxContent, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare const COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
+export declare const COMMENTS_EXTENDED_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml";
+export declare const COMMENTS_EXTENDED_PART = "word/commentsExtended.xml";
+export declare const COMMENTS_EXTENDED_PART_LOWER = "word/commentsextended.xml";
+export declare function addCommentsExtendedOverride(contentTypesXml: string): string;
+export declare function removeCommentsExtendedOverride(contentTypesXml: string): string;
+export declare function addCommentsExtendedRelationship(relsXml: string): string;
+export declare function removeCommentsExtendedRelationship(relsXml: string): string;
 /** Result of filtering the settings part; `undefined` means "leave as it is". */
 type SettingsWithoutAttachedTemplate = {
   settingsXml: string | undefined;
@@ -126,7 +126,7 @@ type SettingsWithoutAttachedTemplate = {
  * The removal itself is a byte splice, so everything else in both parts
  * round-trips exactly as authored.
  */
-declare function withoutAttachedTemplate(settingsXml: string, relsXml: string | undefined): SettingsWithoutAttachedTemplate;
+export declare function withoutAttachedTemplate(settingsXml: string, relsXml: string | undefined): SettingsWithoutAttachedTemplate;
 /**
  * Update only document.xml in a DOCX buffer (minimal changes)
  *
@@ -135,7 +135,7 @@ declare function withoutAttachedTemplate(settingsXml: string, relsXml: string |
  * @param options - Optional repack options
  * @returns Promise resolving to DOCX as ArrayBuffer
  */
-declare function updateDocumentXml(originalBuffer: ArrayBuffer, newDocumentXml: string, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare function updateDocumentXml(originalBuffer: ArrayBuffer, newDocumentXml: string, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Update a specific XML file in a DOCX buffer
  *
@@ -145,7 +145,7 @@ declare function updateDocumentXml(originalBuffer: ArrayBuffer, newDocumentXml:
  * @param options - Optional repack options
  * @returns Promise resolving to DOCX as ArrayBuffer
  */
-declare function updateXmlFile(originalBuffer: ArrayBuffer, path: string, content: string, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare function updateXmlFile(originalBuffer: ArrayBuffer, path: string, content: string, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Update multiple files in a DOCX buffer
  *
@@ -154,7 +154,7 @@ declare function updateXmlFile(originalBuffer: ArrayBuffer, path: string, conten
  * @param options - Optional repack options
  * @returns Promise resolving to DOCX as ArrayBuffer
  */
-declare function updateMultipleFiles(originalBuffer: ArrayBuffer, updates: Map<string, string | ArrayBuffer>, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare function updateMultipleFiles(originalBuffer: ArrayBuffer, updates: Map<string, string | ArrayBuffer>, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Apply file updates to an already-loaded JSZip instance and generate the output.
  * Use this when the zip is already loaded to avoid a redundant decompression pass.
@@ -165,7 +165,7 @@ declare function updateMultipleFiles(originalBuffer: ArrayBuffer, updates: Map<s
  * revision ids are free and because an out-of-range paragraph id, or a
  * malformed application version, can sit in a part it never touched.
  */
-declare function applyUpdatesToZip(zip: JSZip, updates: Map<string, string | ArrayBuffer>, options?: RepackOptions): Promise<ArrayBuffer>;
+export declare function applyUpdatesToZip(zip: JSZip, updates: Map<string, string | ArrayBuffer>, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Add a new relationship to document.xml.rels
  *
@@ -173,7 +173,7 @@ declare function applyUpdatesToZip(zip: JSZip, updates: Map<string, string | Arr
  * @param relationship - New relationship to add
  * @returns Promise resolving to { buffer: ArrayBuffer, rId: string }
  */
-declare function addRelationship(originalBuffer: ArrayBuffer, relationship: {
+export declare function addRelationship(originalBuffer: ArrayBuffer, relationship: {
   type: string;
   target: string;
   targetMode?: "External" | "Internal";
@@ -190,7 +190,7 @@ declare function addRelationship(originalBuffer: ArrayBuffer, relationship: {
  * @param mimeType - MIME type (e.g., "image/png")
  * @returns Promise resolving to { buffer: ArrayBuffer, rId: string, path: string }
  */
-declare function addMedia(originalBuffer: ArrayBuffer, filename: string, data: ArrayBuffer, mimeType: string): Promise<{
+export declare function addMedia(originalBuffer: ArrayBuffer, filename: string, data: ArrayBuffer, mimeType: string): Promise<{
   buffer: ArrayBuffer;
   rId: string;
   path: string;
@@ -202,7 +202,7 @@ declare function addMedia(originalBuffer: ArrayBuffer, filename: string, data: A
  * relationship, and `[Content_Types]` entry. The selective fast-path can't
  * register those, so it must bail to a full repack when this returns true.
  */
-declare function hasUnmaterializedHeaderFooter(doc: document_d_exports.Document): boolean;
+export declare function hasUnmaterializedHeaderFooter(doc: document_d_exports.Document): boolean;
 /**
  * A picture watermark is "model-driven" when its raw VML was cleared (so the
  * serializer synthesizes `<v:imagedata r:id>` from `imageRId`). Its image
@@ -211,7 +211,7 @@ declare function hasUnmaterializedHeaderFooter(doc: document_d_exports.Document)
  * watermark is present, regardless of header count (a single header's rId could
  * have been set without yet resolving in that header's rels).
  */
-declare function hasModelDrivenPictureWatermark(doc: document_d_exports.Document): boolean;
+export declare function hasModelDrivenPictureWatermark(doc: document_d_exports.Document): boolean;
 /**
  * Re-serialize every header/footer the model still owns, keyed by part path.
  *
@@ -221,7 +221,7 @@ declare function hasModelDrivenPictureWatermark(doc: document_d_exports.Document
 type CollectHeaderFooterUpdatesOptions = SaveDiagnosticOptions & {
   sourceZip: JSZip;
 };
-declare function collectHeaderFooterUpdates(doc: document_d_exports.Document, { sourceZip, onDiagnostic }: CollectHeaderFooterUpdatesOptions): Promise<Map<string, string>>;
+export declare function collectHeaderFooterUpdates(doc: document_d_exports.Document, { sourceZip, onDiagnostic }: CollectHeaderFooterUpdatesOptions): Promise<Map<string, string>>;
 type AddedStylesPlan = {
   type: "unchanged";
 } | {
@@ -233,11 +233,11 @@ type AddedStylesPlan = {
   xml: string;
 };
 /** One append-only style owner for full repack and selective overlays. */
-declare function planAddedStyles(doc: document_d_exports.Document, originalZip: JSZip): Promise<AddedStylesPlan>;
+export declare function planAddedStyles(doc: document_d_exports.Document, originalZip: JSZip): Promise<AddedStylesPlan>;
 /** `word/Footnotes.xml` -> `word/_rels/Footnotes.xml.rels` (casing preserved). */
-declare function notePartRelsPath(partPath: string): string;
+export declare function notePartRelsPath(partPath: string): string;
 /** Update existing core-property values without synthesizing absent metadata. */
-declare function updateCoreProperties(corePropsXml: string, { updateModifiedDate, modifiedBy }: {
+export declare function updateCoreProperties(corePropsXml: string, { updateModifiedDate, modifiedBy }: {
   updateModifiedDate?: boolean;
   modifiedBy?: string;
 }): string;
@@ -247,7 +247,7 @@ declare function updateCoreProperties(corePropsXml: string, { updateModifiedDate
  * @param buffer - Buffer to validate
  * @returns Promise resolving to validation result
  */
-declare const validateDocx: (buffer: ArrayBuffer) => Promise<{
+export declare const validateDocx: (buffer: ArrayBuffer) => Promise<{
   valid: boolean;
   errors: string[];
   warnings: string[];
@@ -258,7 +258,7 @@ declare const validateDocx: (buffer: ArrayBuffer) => Promise<{
  * @param buffer - Buffer to check
  * @returns true if buffer starts with ZIP signature
  */
-declare function isDocxBuffer(buffer: ArrayBuffer): boolean;
+export declare function isDocxBuffer(buffer: ArrayBuffer): boolean;
 /**
  * The document properties a package built from scratch states about itself.
  *
@@ -267,7 +267,7 @@ declare function isDocxBuffer(buffer: ArrayBuffer): boolean;
  * ignored for a document that carries a source package, which keeps the
  * properties that package already states.
  */
-type DocumentPropertiesOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOptions & {
+export type DocumentPropertiesOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOptions & {
   /** `dc:creator` in `docProps/core.xml`. Omitted when absent. */
   creator?: string;
   /** `Application` in `docProps/app.xml`. Omitted, with `AppVersion`, when absent. */
@@ -279,7 +279,7 @@ type DocumentPropertiesOptions = SaveDiagnosticOptions & DocumentBodyAuthorityOp
  * @param properties - Document properties the package states about itself
  * @returns Promise resolving to minimal DOCX as ArrayBuffer
  */
-declare function createEmptyDocx(properties?: DocumentPropertiesOptions): Promise<ArrayBuffer>;
+export declare function createEmptyDocx(properties?: DocumentPropertiesOptions): Promise<ArrayBuffer>;
 /**
  * Create a new DOCX from a Document (without requiring original buffer)
  *
@@ -288,6 +288,6 @@ declare function createEmptyDocx(properties?: DocumentPropertiesOptions): Promis
  *   about itself; ignored when `doc` carries a source package
  * @returns Promise resolving to DOCX as ArrayBuffer
  */
-declare function createDocx(doc: document_d_exports.Document, properties?: DocumentPropertiesOptions): Promise<ArrayBuffer>;
+export declare function createDocx(doc: document_d_exports.Document, properties?: DocumentPropertiesOptions): Promise<ArrayBuffer>;
 //#endregion
-export { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_CONTENT_TYPE, COMMENTS_EXTENDED_PART, COMMENTS_EXTENDED_PART_LOWER, CanonicalImageRelationshipRefusalError, DocumentPropertiesOptions, DocxDuplicateSectionCarrierError, DocxPackageFidelityError, RepackOptions, addCommentsExtendedOverride, addCommentsExtendedRelationship, addMedia, addRelationship, applyUpdatesToZip, assertSectionCarriersMatchModel, collectHeaderFooterUpdates, collectHyperlinksWithoutRId, createDocx, createEmptyDocx, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, hasUnmaterializedHyperlinkBindings, hasUnmaterializedInlineResources, isDocxBuffer, notePartRelsPath, planAddedStyles, publishCanonicalImageResources, removeCommentsExtendedOverride, removeCommentsExtendedRelationship, repackDocx, repackDocxFromRaw, updateCoreProperties, updateDocumentXml, updateMultipleFiles, updateXmlFile, validateDocx, withoutAttachedTemplate };
+export {};

package/dist/docx/rezip.js

@@ -5,7 +5,7 @@ import { canonicalJson } from "../utils/canonicalJson.js";
 import { base64ToBytes, decodeText, encodeUtf8 } from "../utils/textEncoding.js";
 import { isAllowedExternalWatermarkImageUrl } from "../watermark/index.js";
 import { appVersionInSchemaForm, normalizeAppVersionInExtendedProperties } from "./appVersionNormalization.js";
-import { withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
+import { withoutExhaustedComments, withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
 import { applyReplyThreadMarkers } from "./commentReplyMarkers.js";
 import { registerContentTypeParts } from "./contentTypeRegistry.js";
 import { readDocumentSectionFacts } from "./documentSectionFacts.js";
@@ -44,40 +44,10 @@ 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 } from "@stll/docx-core/model";
-import { writeZipPart } from "@stll/docx-core/zip";
+import { mintRelationshipId, numberingInstanceResolves } from "@stll/docx-core/model";
 import JSZip from "jszip";
+import { writeZipPart } from "@stll/docx-core/zip";
 //#region src/docx/rezip.ts
-/**
-* DOCX Repacker - Repack modified document into valid DOCX
-*
-* Takes a Document with modified content and creates a new DOCX file
-* by updating document.xml while preserving all other files from
-* the original ZIP archive.
-*
-* This ensures round-trip fidelity:
-* - styles.xml, theme1.xml, fontTable.xml remain untouched
-* - Media files preserved
-* - Relationships preserved
-* - Only document.xml is updated with new content
-*
-* OOXML Package Structure:
-* - [Content_Types].xml - Content type declarations
-* - _rels/.rels - Package relationships
-* - word/document.xml - Main document (modified)
-* - word/styles.xml - Styles (preserved)
-* - word/theme/theme1.xml - Theme (preserved)
-* - word/numbering.xml - Numbering (preserved)
-* - word/fontTable.xml - Font table (preserved)
-* - word/settings.xml - Settings (preserved)
-* - word/header*.xml - Headers (preserved)
-* - word/footer*.xml - Footers (preserved)
-* - word/footnotes.xml - Footnotes (preserved)
-* - word/endnotes.xml - Endnotes (preserved)
-* - word/media/* - Media files (preserved)
-* - word/_rels/document.xml.rels - Document relationships (preserved)
-* - docProps/* - Document properties (preserved)
-*/
 var DocxPackageFidelityError = class extends TaggedError("DocxPackageFidelityError") {
 	constructor(message) {
 		super({ message });
@@ -224,7 +194,8 @@ async function serializeCommentsToZip(doc, zip, compressionLevel) {
 }
 const hasCommentEntries = (xml) => {
 	const root = parseXml(xml);
-	return getChildElements(findChild(root, "w", "comments") ?? root).some((element) => matchesName(element, "w", "comment"));
+	const comments = findChild(root, "w", "comments") ?? root;
+	return getChildElements(comments).some((element) => matchesName(element, "w", "comment"));
 };
 /**
 * Bring `word/commentsExtended.xml` and its packaging (content-type override +
@@ -471,15 +442,18 @@ async function processNewImages(parts, zip, compressionLevel) {
 			}) ?? panic("A detached drawing lost its embedded image relationship");
 			image.rId = newRId;
 		}
-		if (relEntries.length > 0) writeZipPart({
-			zip,
-			path: relsPath,
-			data: encodeUtf8(relsXml.replace("</Relationships>", `${relEntries.join("")}</Relationships>`)),
-			options: {
-				compression: "DEFLATE",
-				compressionOptions: { level: compressionLevel }
-			}
-		});
+		if (relEntries.length > 0) {
+			const updatedRelsXml = relsXml.replace("</Relationships>", `${relEntries.join("")}</Relationships>`);
+			writeZipPart({
+				zip,
+				path: relsPath,
+				data: encodeUtf8(updatedRelsXml),
+				options: {
+					compression: "DEFLATE",
+					compressionOptions: { level: compressionLevel }
+				}
+			});
+		}
 	}
 	await registerImageExtensions(zip, extensionsAdded, compressionLevel);
 }
@@ -953,24 +927,27 @@ const finishRepack = async ({ document: sourceDocument, originalZip, outputZip,
 	await serializeHeaderFooterSettingsIntoZip(document, outputZip, compressionLevel);
 	await serializeCommentsToZip(document, outputZip, compressionLevel);
 	await dropAttachedTemplateReference(outputZip, compressionLevel);
-	if (updateModifiedDate && originalCorePropertiesXml) writeZipPart({
-		zip: outputZip,
-		path: "docProps/core.xml",
-		data: encodeUtf8(updateCoreProperties(originalCorePropertiesXml, {
+	if (updateModifiedDate && originalCorePropertiesXml) {
+		const updatedCoreProperties = updateCoreProperties(originalCorePropertiesXml, {
 			updateModifiedDate,
 			...modifiedBy !== void 0 ? { modifiedBy } : {}
-		})),
-		options: {
-			compression: "DEFLATE",
-			compressionOptions: { level: compressionLevel }
-		}
-	});
+		});
+		writeZipPart({
+			zip: outputZip,
+			path: "docProps/core.xml",
+			data: encodeUtf8(updatedCoreProperties),
+			options: {
+				compression: "DEFLATE",
+				compressionOptions: { level: compressionLevel }
+			}
+		});
+	}
 	return generateDocxZip(outputZip, compressionLevel);
 };
 async function repackDocxWithSectionEndpointRemoval({ document: doc, options, sectionEndpointRemoval, sectionReferenceRemovals }) {
 	if (!doc.originalBuffer) panic("Cannot repack document: no original buffer for round-trip. Use createDocx() for new documents.");
 	const { compressionLevel = 6, updateModifiedDate = true, modifiedBy, changedNoteParaIds } = options;
-	const exportDocument = withoutOrphanCommentRanges(doc);
+	const exportDocument = withoutExhaustedComments(withoutOrphanCommentRanges(doc));
 	const originalZip = await JSZip.loadAsync(doc.originalBuffer);
 	const [originalDocumentXml, originalCorePropertiesXml] = await Promise.all([originalZip.file("word/document.xml")?.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true })), originalZip.file("docProps/core.xml")?.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }))]);
 	removeUnsafeEntries(originalZip);
@@ -1011,7 +988,7 @@ function repackDocx(doc, options = {}) {
 */
 async function repackDocxFromRaw(doc, rawContent, options = {}) {
 	const { compressionLevel = 6, updateModifiedDate = true, modifiedBy, changedNoteParaIds } = options;
-	let exportDocument = withoutOrphanCommentRanges(cloneExportDocument(doc));
+	let exportDocument = withoutExhaustedComments(withoutOrphanCommentRanges(cloneExportDocument(doc)));
 	const newZip = new JSZip();
 	for (const [path, file] of Object.entries(rawContent.originalZip.files)) {
 		if (file.dir) {
@@ -1098,18 +1075,21 @@ async function repackDocxFromRaw(doc, rawContent, options = {}) {
 	await serializeAddedStylesIntoZip(exportDocument, rawContent.originalZip, newZip, compressionLevel);
 	await serializeCommentsToZip(exportDocument, newZip, compressionLevel);
 	await dropAttachedTemplateReference(newZip, compressionLevel);
-	if (updateModifiedDate && rawContent.corePropsXml) writeZipPart({
-		zip: newZip,
-		path: "docProps/core.xml",
-		data: encodeUtf8(updateCoreProperties(rawContent.corePropsXml, {
+	if (updateModifiedDate && rawContent.corePropsXml) {
+		const updatedCoreProps = updateCoreProperties(rawContent.corePropsXml, {
 			updateModifiedDate,
 			...modifiedBy !== void 0 ? { modifiedBy } : {}
-		})),
-		options: {
-			compression: "DEFLATE",
-			compressionOptions: { level: compressionLevel }
-		}
-	});
+		});
+		writeZipPart({
+			zip: newZip,
+			path: "docProps/core.xml",
+			data: encodeUtf8(updatedCoreProps),
+			options: {
+				compression: "DEFLATE",
+				compressionOptions: { level: compressionLevel }
+			}
+		});
+	}
 	return generateDocxZip(newZip, compressionLevel);
 }
 const COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
@@ -1369,10 +1349,11 @@ async function addRelationship(originalBuffer, relationship) {
 	const newRId = `rId${findMaxRId(relsXml) + 1}`;
 	const targetModeAttr = relationship.targetMode === "External" ? " TargetMode=\"External\"" : "";
 	const newRelElement = `<Relationship Id="${newRId}" Type="${relationship.type}" Target="${escapeXmlAttribute(relationship.target)}"${targetModeAttr}/>`;
+	const updatedRelsXml = relsXml.replace("</Relationships>", `${newRelElement}</Relationships>`);
 	writeZipPart({
 		zip,
 		path: relsPath,
-		data: encodeUtf8(relsXml.replace("</Relationships>", `${newRelElement}</Relationships>`))
+		data: encodeUtf8(updatedRelsXml)
 	});
 	return {
 		buffer: await zip.generateAsync({
@@ -1673,17 +1654,18 @@ async function rebindWatermarkRelIds({ document: doc, zip, compressionLevel, bod
 	const changedPaths = /* @__PURE__ */ new Set();
 	for (const { watermark, header, relsPath, partPath } of pending) {
 		let canonical;
-		if (watermark.imageTarget !== void 0) if (watermark.imageTargetExternal) {
-			if (bodyAuthority === "canonical" && !isAllowedExternalWatermarkImageUrl(watermark.imageTarget)) throw new DocxPackageFidelityError("A canonical picture watermark has an unsafe external target");
-			canonical = isAllowedExternalWatermarkImageUrl(watermark.imageTarget) ? {
-				mode: "external",
-				url: watermark.imageTarget
-			} : resolveCanonical(watermark.imageRId);
-		} else canonical = {
-			mode: "internal",
-			absolute: watermark.imageTarget
-		};
-		else canonical = resolveCanonical(watermark.imageRId);
+		if (watermark.imageTarget !== void 0) {
+			if (watermark.imageTargetExternal) {
+				if (bodyAuthority === "canonical" && !isAllowedExternalWatermarkImageUrl(watermark.imageTarget)) throw new DocxPackageFidelityError("A canonical picture watermark has an unsafe external target");
+				canonical = isAllowedExternalWatermarkImageUrl(watermark.imageTarget) ? {
+					mode: "external",
+					url: watermark.imageTarget
+				} : resolveCanonical(watermark.imageRId);
+			} else canonical = {
+				mode: "internal",
+				absolute: watermark.imageTarget
+			};
+		} else canonical = resolveCanonical(watermark.imageRId);
 		if (!canonical) {
 			if (bodyAuthority === "canonical") throw new DocxPackageFidelityError("A canonical picture watermark image cannot be resolved");
 			continue;
@@ -1788,46 +1770,50 @@ async function serializeHeadersFootersToZip({ doc, zip, compressionLevel, onDiag
 async function serializeNotesToZip({ doc, originalZip, newZip, compressionLevel, changedNoteParaIds }) {
 	const footnotes = doc.package.footnotes ?? [];
 	const originalFootnotes = doc.package.footnotes === void 0 ? null : findNotePartEntry(originalZip, "word/footnotes.xml");
-	if (footnotes.length > 0 || originalFootnotes) if (originalFootnotes) await patchNotePartIntoZip({
-		conventionalLowerPath: "word/footnotes.xml",
-		currentXml: serializeFootnotes(footnotes),
-		replacementXml: serializeNewFootnotesPart(footnotes, doc),
-		baselineFrom: (xml) => serializeFootnotes(parseFootnotes(xml).getNormalFootnotes()),
-		elementName: "footnote",
-		changedNoteParaIds,
-		originalZip,
-		newZip,
-		compressionLevel
-	});
-	else await materializeNewNotePart({
-		contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
-		newZip,
-		partPath: "word/footnotes.xml",
-		relationshipType: RELATIONSHIP_TYPES.footnotes,
-		serializedPart: serializeNewFootnotesPart(footnotes, doc),
-		compressionLevel
-	});
+	if (footnotes.length > 0 || originalFootnotes) {
+		if (originalFootnotes) await patchNotePartIntoZip({
+			conventionalLowerPath: "word/footnotes.xml",
+			currentXml: serializeFootnotes(footnotes),
+			replacementXml: serializeNewFootnotesPart(footnotes, doc),
+			baselineFrom: (xml) => serializeFootnotes(parseFootnotes(xml).getNormalFootnotes()),
+			elementName: "footnote",
+			changedNoteParaIds,
+			originalZip,
+			newZip,
+			compressionLevel
+		});
+		else await materializeNewNotePart({
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
+			newZip,
+			partPath: "word/footnotes.xml",
+			relationshipType: RELATIONSHIP_TYPES.footnotes,
+			serializedPart: serializeNewFootnotesPart(footnotes, doc),
+			compressionLevel
+		});
+	}
 	const endnotes = doc.package.endnotes ?? [];
 	const originalEndnotes = doc.package.endnotes === void 0 ? null : findNotePartEntry(originalZip, "word/endnotes.xml");
-	if (endnotes.length > 0 || originalEndnotes) if (originalEndnotes) await patchNotePartIntoZip({
-		conventionalLowerPath: "word/endnotes.xml",
-		currentXml: serializeEndnotes(endnotes),
-		replacementXml: serializeNewEndnotesPart(endnotes, doc),
-		baselineFrom: (xml) => serializeEndnotes(parseEndnotes(xml).getNormalEndnotes()),
-		elementName: "endnote",
-		changedNoteParaIds,
-		originalZip,
-		newZip,
-		compressionLevel
-	});
-	else await materializeNewNotePart({
-		contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml",
-		newZip,
-		partPath: "word/endnotes.xml",
-		relationshipType: RELATIONSHIP_TYPES.endnotes,
-		serializedPart: serializeNewEndnotesPart(endnotes, doc),
-		compressionLevel
-	});
+	if (endnotes.length > 0 || originalEndnotes) {
+		if (originalEndnotes) await patchNotePartIntoZip({
+			conventionalLowerPath: "word/endnotes.xml",
+			currentXml: serializeEndnotes(endnotes),
+			replacementXml: serializeNewEndnotesPart(endnotes, doc),
+			baselineFrom: (xml) => serializeEndnotes(parseEndnotes(xml).getNormalEndnotes()),
+			elementName: "endnote",
+			changedNoteParaIds,
+			originalZip,
+			newZip,
+			compressionLevel
+		});
+		else await materializeNewNotePart({
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml",
+			newZip,
+			partPath: "word/endnotes.xml",
+			relationshipType: RELATIONSHIP_TYPES.endnotes,
+			serializedPart: serializeNewEndnotesPart(endnotes, doc),
+			compressionLevel
+		});
+	}
 }
 async function materializeNewNotePart({ contentType, newZip, partPath, relationshipType, serializedPart, compressionLevel }) {
 	const contentTypesFile = findNotePartEntry(newZip, "[content_types].xml");
@@ -2317,20 +2303,22 @@ const createEmptyDocxZip = ({ creator, application }) => {
 		data: encodeUtf8(SEED_STYLES_XML)
 	});
 	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const creatorElement = creator === void 0 ? "" : `\n  <dc:creator>${escapeXmlText(creator)}</dc:creator>`;
 	writeZipPart({
 		zip,
 		path: "docProps/core.xml",
 		data: encodeUtf8(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${creator === void 0 ? "" : `\n  <dc:creator>${escapeXmlText(creator)}</dc:creator>`}
+<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${creatorElement}
   <dcterms:created xsi:type="dcterms:W3CDTF">${now}</dcterms:created>
   <dcterms:modified xsi:type="dcterms:W3CDTF">${now}</dcterms:modified>
 </cp:coreProperties>`)
 	});
+	const applicationElements = application === void 0 ? "" : `\n  <Application>${escapeXmlText(application)}</Application>\n  <AppVersion>${CREATED_APP_VERSION}</AppVersion>`;
 	writeZipPart({
 		zip,
 		path: "docProps/app.xml",
 		data: encodeUtf8(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">${application === void 0 ? "" : `\n  <Application>${escapeXmlText(application)}</Application>\n  <AppVersion>${CREATED_APP_VERSION}</AppVersion>`}
+<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">${applicationElements}
 </Properties>`)
 	});
 	return zip;
@@ -2437,10 +2425,11 @@ const createDocumentSeedZip = async (doc, properties) => {
 	if (overrides.length > 0) {
 		const contentTypesFile = zip.file("[Content_Types].xml");
 		if (!contentTypesFile) panic("Fresh DOCX seed is missing [Content_Types].xml");
+		const contentTypes = await contentTypesFile.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }));
 		writeZipPart({
 			zip,
 			path: "[Content_Types].xml",
-			data: encodeUtf8((await contentTypesFile.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }))).replace("</Types>", `${overrides.join("")}\n</Types>`))
+			data: encodeUtf8(contentTypes.replace("</Types>", `${overrides.join("")}\n</Types>`))
 		});
 	}
 	return zip;
@@ -2466,12 +2455,13 @@ const assertStyleNumberingReferences = (doc) => {
 		if (numId !== void 0) referenced.add(numId);
 	}
 	if (referenced.size === 0) return;
-	const available = new Map(doc.package.numbering?.nums.map((numbering) => [numbering.numId, numbering]) ?? []);
-	const availableAbstract = new Set(doc.package.numbering?.abstractNums.map((numbering) => numbering.abstractNumId) ?? []);
+	const definitions = doc.package.numbering ?? {
+		abstractNums: [],
+		nums: []
+	};
 	for (const numId of referenced) {
-		const numbering = available.get(numId);
-		if (!numbering) panic(`Style references missing numbering definition ${numId}`);
-		if (!availableAbstract.has(numbering.abstractNumId)) panic(`Numbering definition ${numbering.numId} references missing abstract numbering`);
+		if (!definitions.nums.some((instance) => instance.numId === numId)) panic(`Style references missing numbering definition ${numId}`);
+		if (!numberingInstanceResolves(definitions, numId)) panic(`Numbering definition ${numId} defines no level`);
 	}
 };
 //#endregion