@stll/folio-core 0.3.1 → 0.5.0

package/dist/docx/runParser.js

@@ -1,6 +1,7 @@
 import { cloneWithXmlnsDeclarations, elementToXml, findChild, findChildren, getAttribute, getChildElements, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { EmphasisMarkSchema, FontThemeSchema, HighlightColorSchema, ShadingPatternSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { parseImage } from "./imageParser.js";
+import { parseGroupDrawing } from "./groupDrawingParser.js";
 import { parseShapeFromDrawing, shouldPreserveRawShapeDrawing } from "./shapeParser.js";
 import { parseVmlImageContent } from "./vmlImageParser.js";
 import { resolveThemeFontRef } from "./themeParser.js";
@@ -442,6 +443,12 @@ function parseInstrText(element) {
 *   `shapeParser.parseShapeFromDrawing` into a `ShapeContent`.
 */
 function parseDrawingContent(element, rels, media) {
+	const groupImage = parseGroupDrawing(element);
+	if (groupImage) return {
+		type: "drawing",
+		image: groupImage,
+		rawXml: elementToXml(element)
+	};
 	if (shouldPreserveRawShapeDrawing(element)) return {
 		type: "drawing",
 		image: {
@@ -550,7 +557,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 				if (innerName === "drawing") {
 					const innerDrawing = parseDrawingContent(innerChild, rels, media);
 					if (innerDrawing) {
-						if (innerDrawing.type === "drawing" && !innerDrawing.image.src) innerDrawing.rawXml = elementToXml(child);
+						if (innerDrawing.type === "drawing" && (innerDrawing.rawXml !== void 0 || !innerDrawing.image.src)) innerDrawing.rawXml = elementToXml(child);
 						contents.push(innerDrawing);
 					}
 				} else if (innerName === "pict") {

package/dist/docx/selectiveXmlPatch.js

@@ -50,11 +50,8 @@ function findParagraphOffsets(xml, paraId) {
 						start,
 						end: tagEnd + 1
 					};
-					pos = tagEnd + 1;
-				} else {
-					depth++;
-					pos = tagEnd + 1;
-				}
+				} else depth++;
+				pos = tagEnd + 1;
 			} else pos = tagStart + 1;
 		} else if (xml.startsWith("</w:p>", tagStart)) {
 			depth--;
@@ -226,11 +223,8 @@ function scanElementRange(xml, start, openLiteral, closeTag) {
 					start,
 					end: tagEnd + 1
 				};
-				pos = tagEnd + 1;
-			} else {
-				depth++;
-				pos = tagEnd + 1;
-			}
+			} else depth++;
+			pos = tagEnd + 1;
 		} else if (xml.startsWith(closeTag, tagStart)) {
 			depth--;
 			if (depth === 0) return {

package/dist/docx/serializer/numberingSerializer.js

@@ -87,7 +87,9 @@ function serializeNum(instance) {
 * change detection and per-definition splicing, never to overwrite the part.
 */
 function serializeNumberingXml(numbering) {
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:numbering xmlns:w="${W_NS}">${numbering.abstractNums.map(serializeAbstractNum).join("")}${numbering.nums.map(serializeNum).join("")}</w:numbering>`;
+	const abstractNums = numbering.abstractNums.map(serializeAbstractNum).join("");
+	const nums = numbering.nums.map(serializeNum).join("");
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:numbering xmlns:w="${W_NS}">${abstractNums}${nums}</w:numbering>`;
 }
 //#endregion
 export { serializeNumberingXml };

package/dist/docx/settingsParser.d.ts

@@ -1,8 +1,11 @@
 import { document_d_exports } from "../types/document.js";
 
 //#region src/docx/settingsParser.d.ts
+type FolioDocumentSettings = document_d_exports.DocumentSettings & {
+  /** Swap left/right section margins on even physical pages. */mirrorMargins?: boolean;
+};
 /** OOXML default per §17.6.13 when `w:defaultTabStop` is absent. */
 declare const DEFAULT_TAB_STOP_TWIPS = 720;
-declare function parseSettings(xml: string | null): document_d_exports.DocumentSettings;
-type DocumentSettings = document_d_exports.DocumentSettings;
-export { DEFAULT_TAB_STOP_TWIPS, type DocumentSettings, parseSettings };
+declare function parseSettings(xml: string | null): FolioDocumentSettings;
+//#endregion
+export { DEFAULT_TAB_STOP_TWIPS, FolioDocumentSettings, parseSettings };

package/dist/docx/settingsParser.js

@@ -13,6 +13,8 @@ function parseSettings(xml) {
 	const settings = { defaultTabStop: parseDefaultTabStop(root) };
 	const evenAndOddHeaders = root ? findChild(root, "w", "evenAndOddHeaders") : null;
 	if (evenAndOddHeaders && parseBooleanElement(evenAndOddHeaders)) settings.evenAndOddHeaders = true;
+	const mirrorMargins = root ? findChild(root, "w", "mirrorMargins") : null;
+	if (mirrorMargins && parseBooleanElement(mirrorMargins)) settings.mirrorMargins = true;
 	const themeFontLangEl = root ? findChild(root, "w", "themeFontLang") : null;
 	const eastAsiaLang = themeFontLangEl ? getAttribute(themeFontLangEl, "w", "eastAsia") || void 0 : void 0;
 	const bidiLang = themeFontLangEl ? getAttribute(themeFontLangEl, "w", "bidi") || void 0 : void 0;

package/dist/docx/unzip.d.ts

@@ -13,8 +13,9 @@ type DocxUnzipLimits = {
   maxTotalUncompressedBytes: number;
   allowedMediaMimeTypes: ReadonlySet<string>;
 };
-type PartialDocxUnzipLimits = Partial<Omit<DocxUnzipLimits, "allowedMediaMimeTypes">> & {
-  allowedMediaMimeTypes?: Iterable<string>;
+type DocxUnzipOptions = Partial<Omit<DocxUnzipLimits, "allowedMediaMimeTypes">> & {
+  allowedMediaMimeTypes?: Iterable<string>; /** Password for Agile-encrypted .docx files (Office 2010+). */
+  password?: string | undefined;
 };
 /**
  * Raw extracted content from a DOCX file
@@ -45,7 +46,8 @@ type RawDocxContent = {
   allXml: Map<string, string>;
   originalZip: JSZip;
   originalBuffer: ArrayBuffer;
-  warnings: string[];
+  warnings: string[]; /** True when the input was a password-protected CFB container. */
+  wasEncrypted: boolean;
 };
 /**
  * Extract all content from a DOCX file
@@ -53,7 +55,7 @@ type RawDocxContent = {
  * @param buffer - DOCX file as ArrayBuffer
  * @returns Promise resolving to extracted content
  */
-declare function unzipDocx(buffer: ArrayBuffer, options?: PartialDocxUnzipLimits): Promise<RawDocxContent>;
+declare function unzipDocx(buffer: ArrayBuffer, options?: DocxUnzipOptions): Promise<RawDocxContent>;
 declare function isPreservableDocxEntry(path: string): boolean;
 /**
  * Get a list of all files in the DOCX
@@ -115,4 +117,4 @@ declare function getContentSummary(content: RawDocxContent): {
   totalFiles: number;
 };
 //#endregion
-export { DocxSecurityError, DocxUnzipLimits, RawDocxContent, extractFile, getContentSummary, getFileList, getMediaMimeType, hasFile, isPreservableDocxEntry, mediaToDataUrl, unzipDocx };
+export { DocxSecurityError, DocxUnzipLimits, DocxUnzipOptions, RawDocxContent, extractFile, getContentSummary, getFileList, getMediaMimeType, hasFile, isPreservableDocxEntry, mediaToDataUrl, unzipDocx };

package/dist/docx/unzip.js

@@ -1,3 +1,5 @@
+import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "./encryption/containerFormat.js";
+import { openDocxBuffer } from "./encryption/openEncryptedDocx.js";
 import JSZip from "jszip";
 //#region src/docx/unzip.ts
 /**
@@ -71,7 +73,10 @@ const ZIP_CENTRAL_DIRECTORY_FILE_HEADER_SIZE = 46;
 async function unzipDocx(buffer, options = {}) {
 	const limits = createUnzipLimits(options);
 	if (buffer.byteLength > limits.maxInputBytes) throw new DocxSecurityError("DOCX file exceeds the maximum allowed size");
-	const loaded = await loadDocxZip(buffer, limits.maxFiles);
+	const zipBuffer = await openDocxBuffer(buffer, { password: options.password });
+	if (zipBuffer.byteLength > limits.maxInputBytes) throw new DocxSecurityError("DOCX file exceeds the maximum allowed size");
+	const wasEncrypted = detectDocxContainerType(buffer) === DOCX_CONTAINER_TYPES.CFB;
+	const loaded = await loadDocxZip(zipBuffer, limits.maxFiles);
 	if (loaded.buffer.byteLength > limits.maxInputBytes) throw new DocxSecurityError("DOCX file exceeds the maximum allowed size");
 	const { zip } = loaded;
 	const entries = Object.entries(zip.files).filter(([, file]) => !file.dir);
@@ -102,7 +107,8 @@ async function unzipDocx(buffer, options = {}) {
 		allXml: /* @__PURE__ */ new Map(),
 		originalZip: zip,
 		originalBuffer: loaded.buffer,
-		warnings: []
+		warnings: [],
+		wasEncrypted
 	};
 	let totalUncompressedBytes = 0;
 	for (const [path, file] of entries) {

package/dist/docx/xmlParser.js

@@ -31,6 +31,7 @@ const fxpParserOptions = {
 	parseAttributeValue: false,
 	ignoreDeclaration: true,
 	ignorePiTags: true,
+	jPath: false,
 	processEntities: true,
 	htmlEntities: true
 };
@@ -65,15 +66,19 @@ function fxpNodeToElement(node) {
 		text: node[TEXT_KEY]
 	};
 	const attrs = node[ATTR_KEY];
-	for (const key of Object.keys(node)) {
+	for (const key in node) {
 		if (key === ATTR_KEY) continue;
 		const children = node[key];
 		const element = {
 			type: "element",
 			name: key
 		};
-		if (attrs && Object.keys(attrs).length > 0) element.attributes = attrs;
-		if (children.length > 0) element.elements = children.map(fxpNodeToElement);
+		if (attrs) element.attributes = attrs;
+		if (children.length > 0) {
+			const elements = [];
+			for (const child of children) elements.push(fxpNodeToElement(child));
+			element.elements = elements;
+		}
 		return element;
 	}
 	return { type: "element" };
@@ -84,7 +89,9 @@ function fxpNodeToElement(node) {
 * `{ elements: [...] }`.
 */
 function fxpToRootElement(nodes) {
-	return { elements: nodes.map(fxpNodeToElement) };
+	const elements = [];
+	for (const node of nodes) elements.push(fxpNodeToElement(node));
+	return { elements };
 }
 /**
 * Convert an XmlElement back into the fast-xml-parser preserveOrder format

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIComment, FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditOperation, FolioAIEditReviewMeta, FolioAIEditSeverity, FolioAIEditSkipReason, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAISignatureParty } from "./ai-edits/types.js";
+import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIComment, FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditReviewMeta, FolioAIEditSeverity, FolioAIEditSkipReason, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAISignatureParty } from "./ai-edits/types.js";
 import { applyFolioAIEditOperations } from "./ai-edits/apply.js";
 import { document_d_exports } from "./types/document.js";
+import { ApplyFolioDocumentOperationsOptions, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationStatus, FolioDocumentOperationType, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { createFolioAIEditSnapshot, hashFolioAIBlockText, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
 import { DeriveBlockIdInput, FolioBlockId, deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import { WordDiffSegment, diffWordSegments } from "./ai-edits/word-diff.js";
@@ -26,4 +27,4 @@ import { toMarkdown, toMarkdownResult } from "./markdown/index.js";
 import { EmbeddedFont, EmbeddedFontParts, extractEmbeddedFonts, getEmbeddedFontFaces } from "./fonts/embeddedFonts.js";
 import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 type Document = document_d_exports.Document;
-export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocxCompatibility, type EmbeddedFont, type EmbeddedFontParts, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAISignatureParty, type FolioBlockId, type ImageMeta, type ImageRef, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applySuggestions, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, deriveBlockId, diffWordSegments, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, isFolioBlockId, isSequentialFolioBlockId, isSuggestionStale, normalizeFolioAIBlockText, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyFolioDocumentOperationsOptions, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocxCompatibility, type EmbeddedFont, type EmbeddedFontParts, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAISignatureParty, type FolioBlockId, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationStatus, type FolioDocumentOperationType, type ImageMeta, type ImageRef, InvalidFolioDocumentOperationBatchError, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, deriveBlockId, diffWordSegments, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/index.js

@@ -1,13 +1,14 @@
+import { deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
+import { createFolioAIEditSnapshot, hashFolioAIBlockText, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
+import { diffWordSegments } from "./ai-edits/word-diff.js";
+import { applyFolioAIEditOperations } from "./ai-edits/apply.js";
+import { FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { createEmptyDocument } from "./utils/createDocument.js";
 import { createDocx } from "./docx/rezip.js";
-import { deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import { DEFAULT_AI_SUGGESTION_PRESETS } from "./ai-suggestions/types.js";
 import { buildPositionalText } from "./ai-suggestions/text-positions.js";
 import { isSuggestionStale, resolveSuggestionAnchor } from "./ai-suggestions/conflict.js";
 import { applySuggestions } from "./ai-suggestions/apply.js";
-import { createFolioAIEditSnapshot, hashFolioAIBlockText, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
-import { diffWordSegments } from "./ai-edits/word-diff.js";
-import { applyFolioAIEditOperations } from "./ai-edits/apply.js";
 import { setAISuggestionsMeta, setFocusedSuggestionMeta } from "./prosemirror/plugins/aiSuggestionDecorations.js";
 import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 import { scrollFolioPositionIntoView } from "./paged-layout/scrollToPmPosition.js";
@@ -21,4 +22,4 @@ import { DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, acceptAutocompleteSuggestion, acc
 import { fromMarkdown } from "./markdown/fromMarkdown.js";
 import { toMarkdown, toMarkdownResult } from "./markdown/index.js";
 import { extractEmbeddedFonts, getEmbeddedFontFaces } from "./fonts/embeddedFonts.js";
-export { DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applySuggestions, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, deriveBlockId, diffWordSegments, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, isFolioBlockId, isSequentialFolioBlockId, isSuggestionStale, normalizeFolioAIBlockText, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, deriveBlockId, diffWordSegments, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/layout-bridge/convert/footnoteLayout.d.ts

@@ -23,6 +23,42 @@ declare function collectFootnoteRefs(blocks: FlowBlock[]): {
   footnoteId: number;
   pmPos: number;
 }[];
+/**
+ * Scan FlowBlocks for runs with endnoteRefId set, in document order.
+ * Same recursive walk as `collectFootnoteRefs`.
+ */
+declare function collectEndnoteRefs(blocks: FlowBlock[]): {
+  endnoteId: number;
+  pmPos: number;
+}[];
+type NumberableNote = {
+  id: number;
+  noteType?: document_d_exports.Footnote["noteType"];
+};
+/**
+ * Assign sequential display numbers (1, 2, 3, …) to notes in order of first
+ * reference. Word numbers footnotes/endnotes by reference order, not by their
+ * `w:id` values, which may be non-contiguous or out of document order. Only
+ * `normal` notes are numbered; separator/continuation notes and refs to
+ * missing notes consume no number.
+ */
+declare function computeNoteDisplayNumbers(notes: readonly NumberableNote[], refNoteIds: readonly number[]): Map<number, number>;
+type NoteDisplayNumberMaps = {
+  /** footnote `w:id` → sequential display number */footnoteNumbers?: ReadonlyMap<number, number>; /** endnote `w:id` → sequential display number */
+  endnoteNumbers?: ReadonlyMap<number, number>;
+};
+/**
+ * Rewrite body reference-marker run text from the raw `w:id` (which the PM
+ * doc stores as the marker text; the save path serializes from the mark
+ * attrs, never from this text) to the sequential display number, so the
+ * inline marker matches the number rendered in the note area. Must run
+ * before measurement so marker widths match the painted digits. Untouched
+ * blocks/runs are returned by reference so the painter's fingerprinting and
+ * the incremental measure path see them unchanged. Runs keep their PM range,
+ * so click-to-position still resolves into the marker (same contract as the
+ * template preview substitution).
+ */
+declare function remapNoteMarkerText(blocks: FlowBlock[], maps: NoteDisplayNumberMaps): FlowBlock[];
 /**
  * After layout, determine which footnotes appear on which pages.
  * Checks each page's fragments to see if any footnoteRef PM positions fall within.
@@ -54,4 +90,4 @@ declare function calculateFootnoteReservedHeights(pageFootnoteMap: Map<number, n
   height: number;
 }>): Map<number, number>;
 //#endregion
-export { ConvertFootnoteOptions, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, MeasureBlocksFn, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectFootnoteRefs, convertFootnoteToContent, mapFootnotesToPages };
+export { ConvertFootnoteOptions, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, MeasureBlocksFn, NoteDisplayNumberMaps, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, convertFootnoteToContent, mapFootnotesToPages, remapNoteMarkerText };

package/dist/layout-bridge/convert/footnoteLayout.js

@@ -16,20 +16,149 @@ const FOOTNOTE_FONT_SIZE = 8;
 * area.
 */
 function collectFootnoteRefs(blocks) {
+	return collectNoteRefs(blocks, "footnoteRefId").map(({ noteId, pmPos }) => ({
+		footnoteId: noteId,
+		pmPos
+	}));
+}
+/**
+* Scan FlowBlocks for runs with endnoteRefId set, in document order.
+* Same recursive walk as `collectFootnoteRefs`.
+*/
+function collectEndnoteRefs(blocks) {
+	return collectNoteRefs(blocks, "endnoteRefId").map(({ noteId, pmPos }) => ({
+		endnoteId: noteId,
+		pmPos
+	}));
+}
+function collectNoteRefs(blocks, idKey) {
 	const refs = [];
 	const walk = (containerBlocks) => {
-		for (const block of containerBlocks) if (block.kind === "paragraph") {
-			for (const run of block.runs) if (run.kind === "text" && run.footnoteRefId !== void 0) refs.push({
-				footnoteId: run.footnoteRefId,
+		for (const block of containerBlocks) if (block.kind === "paragraph") for (const run of block.runs) {
+			if (run.kind !== "text") continue;
+			const noteId = run[idKey];
+			if (noteId !== void 0) refs.push({
+				noteId,
 				pmPos: run.pmStart ?? 0
 			});
-		} else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) walk(cell.blocks);
+		}
+		else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) walk(cell.blocks);
 		else if (block.kind === "textBox") walk(block.content);
 	};
 	walk(blocks);
 	return refs;
 }
 /**
+* Assign sequential display numbers (1, 2, 3, …) to notes in order of first
+* reference. Word numbers footnotes/endnotes by reference order, not by their
+* `w:id` values, which may be non-contiguous or out of document order. Only
+* `normal` notes are numbered; separator/continuation notes and refs to
+* missing notes consume no number.
+*/
+function computeNoteDisplayNumbers(notes, refNoteIds) {
+	const numberable = /* @__PURE__ */ new Set();
+	for (const note of notes) if (note.noteType === "normal") numberable.add(note.id);
+	const displayNumbers = /* @__PURE__ */ new Map();
+	let nextNumber = 1;
+	for (const noteId of refNoteIds) {
+		if (displayNumbers.has(noteId) || !numberable.has(noteId)) continue;
+		displayNumbers.set(noteId, nextNumber);
+		nextNumber++;
+	}
+	return displayNumbers;
+}
+/**
+* Rewrite body reference-marker run text from the raw `w:id` (which the PM
+* doc stores as the marker text; the save path serializes from the mark
+* attrs, never from this text) to the sequential display number, so the
+* inline marker matches the number rendered in the note area. Must run
+* before measurement so marker widths match the painted digits. Untouched
+* blocks/runs are returned by reference so the painter's fingerprinting and
+* the incremental measure path see them unchanged. Runs keep their PM range,
+* so click-to-position still resolves into the marker (same contract as the
+* template preview substitution).
+*/
+function remapNoteMarkerText(blocks, maps) {
+	if ((maps.footnoteNumbers?.size ?? 0) === 0 && (maps.endnoteNumbers?.size ?? 0) === 0) return blocks;
+	let changed = false;
+	const next = blocks.map((block) => {
+		const remapped = remapNoteMarkerBlock(block, maps);
+		changed ||= remapped !== block;
+		return remapped;
+	});
+	return changed ? next : blocks;
+}
+function remapNoteMarkerBlock(block, maps) {
+	if (block.kind === "paragraph") return remapNoteMarkerParagraph(block, maps);
+	if (block.kind === "table") {
+		let tableChanged = false;
+		const rows = block.rows.map((row) => {
+			let rowChanged = false;
+			const cells = row.cells.map((cell) => {
+				let cellChanged = false;
+				const cellBlocks = cell.blocks.map((cellBlock) => {
+					const remapped = remapNoteMarkerBlock(cellBlock, maps);
+					cellChanged ||= remapped !== cellBlock;
+					return remapped;
+				});
+				return cellChanged ? {
+					...cell,
+					blocks: cellBlocks
+				} : cell;
+			});
+			rowChanged = cells.some((cell, index) => cell !== row.cells[index]);
+			tableChanged ||= rowChanged;
+			return rowChanged ? {
+				...row,
+				cells
+			} : row;
+		});
+		return tableChanged ? {
+			...block,
+			rows
+		} : block;
+	}
+	if (block.kind === "textBox") {
+		let boxChanged = false;
+		const content = block.content.map((paragraph) => {
+			const remapped = remapNoteMarkerParagraph(paragraph, maps);
+			boxChanged ||= remapped !== paragraph;
+			return remapped;
+		});
+		return boxChanged ? {
+			...block,
+			content
+		} : block;
+	}
+	return block;
+}
+function remapNoteMarkerParagraph(block, maps) {
+	let changed = false;
+	const runs = block.runs.map((run) => {
+		const remapped = remapNoteMarkerRun(run, maps);
+		changed ||= remapped !== run;
+		return remapped;
+	});
+	return changed ? {
+		...block,
+		runs
+	} : block;
+}
+function remapNoteMarkerRun(run, maps) {
+	if (run.kind !== "text") return run;
+	const displayNumber = getRunDisplayNumber(run, maps);
+	if (displayNumber === void 0) return run;
+	const text = String(displayNumber);
+	return run.text === text ? run : {
+		...run,
+		text
+	};
+}
+function getRunDisplayNumber(run, maps) {
+	if (run.footnoteRefId !== void 0) return maps.footnoteNumbers?.get(run.footnoteRefId);
+	if (run.endnoteRefId !== void 0) return maps.endnoteNumbers?.get(run.endnoteRefId);
+}
+/**
 * After layout, determine which footnotes appear on which pages.
 * Checks each page's fragments to see if any footnoteRef PM positions fall within.
 *
@@ -279,16 +408,11 @@ function buildFootnoteContentMap(footnotes, footnoteRefs, contentWidth, options
 	const contentMap = /* @__PURE__ */ new Map();
 	const footnoteById = /* @__PURE__ */ new Map();
 	for (const fn of footnotes) if (fn.noteType === "normal") footnoteById.set(fn.id, fn);
-	let displayNumber = 1;
-	const seen = /* @__PURE__ */ new Set();
-	for (const ref of footnoteRefs) {
-		if (seen.has(ref.footnoteId)) continue;
-		seen.add(ref.footnoteId);
-		const footnote = footnoteById.get(ref.footnoteId);
+	const displayNumbers = computeNoteDisplayNumbers(footnotes, footnoteRefs.map((ref) => ref.footnoteId));
+	for (const [footnoteId, displayNumber] of displayNumbers) {
+		const footnote = footnoteById.get(footnoteId);
 		if (!footnote) continue;
-		const content = convertFootnoteToContent(footnote, displayNumber, contentWidth, options);
-		contentMap.set(ref.footnoteId, content);
-		displayNumber++;
+		contentMap.set(footnoteId, convertFootnoteToContent(footnote, displayNumber, contentWidth, options));
 	}
 	return contentMap;
 }
@@ -313,4 +437,4 @@ function calculateFootnoteReservedHeights(pageFootnoteMap, footnoteContentMap) {
 	return reserved;
 }
 //#endregion
-export { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectFootnoteRefs, convertFootnoteToContent, mapFootnotesToPages };
+export { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, convertFootnoteToContent, mapFootnotesToPages, remapNoteMarkerText };

package/dist/layout-bridge/convert/headerFooterLayout.d.ts

@@ -12,7 +12,7 @@ type HeaderFooterMetrics = {
   };
   margins: PageMargins;
 };
-declare function normalizeHeaderFooterMeasureBlocks(blocks: FlowBlock[]): FlowBlock[];
+declare function normalizeHeaderFooterMeasureBlocks(blocks: FlowBlock[], section?: HeaderFooterMetrics["section"]): FlowBlock[];
 declare function resolveHeaderFooterPositionedVisualTop(position: ImageRunPosition | undefined, elementHeight: number, sourceY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
 declare function resolveHeaderFooterVisualTop(run: ImageRun, paragraphY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
 declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
@@ -20,13 +20,11 @@ declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures
   visualBottom: number;
 };
 /**
- * Compute the header/footer bounds used by `computeHeaderFooterMarginExtender`
- * to push body margins clear of HF overflow. Excludes anchored/floating objects
- * (full-page letterheads, watermarks): Word positions them on the page instead
- * of in the header/footer flow, so they must not reserve body push-down. Keeping
- * them in `visualBottom` is still correct for the renderer (and for the
- * page-hash invalidation signal), but the margin extender needs the flow-only
- * extent.
+ * Compute flow-only header/footer bounds, excluding anchored/floating objects
+ * such as full-page letterheads and watermarks. Word positions those objects on
+ * the page independently from header/footer flow. Keeping them in
+ * `visualBottom` is still correct for rendering and page-hash invalidation;
+ * these bounds separately describe the in-flow portion for API consumers.
  */
 declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
   top: number;

package/dist/layout-bridge/convert/headerFooterLayout.js

@@ -16,13 +16,13 @@ function hasAuthoredVisualContent(block) {
 	if (attrs.spacingExplicit?.before || attrs.spacingExplicit?.after) return true;
 	return false;
 }
-function normalizeHeaderFooterMeasureBlocks(blocks) {
-	return normalizeFlowBlockArray(blocks);
+function normalizeHeaderFooterMeasureBlocks(blocks, section = "header") {
+	return normalizeFlowBlockArray(blocks, { suppressTrailingEmptyAfterTable: section === "header" });
 }
-function normalizeFlowBlockArray(blocks) {
+function normalizeFlowBlockArray(blocks, normalization) {
 	const trailingEmptyAfterTable = /* @__PURE__ */ new Set();
 	const lastIndex = blocks.length - 1;
-	if (lastIndex > 0) {
+	if (normalization.suppressTrailingEmptyAfterTable && lastIndex > 0) {
 		const cur = blocks[lastIndex];
 		if (blocks[lastIndex - 1]?.kind === "table" && cur?.kind === "paragraph" && cur.runs.length === 0 && !hasAuthoredVisualContent(cur)) trailingEmptyAfterTable.add(lastIndex);
 	}
@@ -70,12 +70,21 @@ function normalizeFlowBlockArray(blocks) {
 		};
 	});
 }
+function isCanonicalTrailingEmptyParagraphAfterTable(blocks, index) {
+	const cur = blocks[index];
+	const prev = blocks[index - 1];
+	return index === blocks.length - 1 && prev?.kind === "table" && cur?.kind === "paragraph" && isVisuallyEmptyParagraph(cur) && !hasAuthoredVisualContent(cur);
+}
+function isVisuallyEmptyParagraph(block) {
+	if (block.kind !== "paragraph") return false;
+	return block.runs.every((run) => run.kind === "text" && run.text.trim().length === 0);
+}
 function normalizeTableBlock(block) {
 	const blockState = { changed: false };
 	const rows = block.rows.map((row) => {
 		const rowState = { changed: false };
 		const cells = row.cells.map((cell) => {
-			const normalizedBlocks = normalizeFlowBlockArray(cell.blocks);
+			const normalizedBlocks = normalizeFlowBlockArray(cell.blocks, { suppressTrailingEmptyAfterTable: true });
 			if (!normalizedBlocks.some((normalizedBlock, idx) => normalizedBlock !== cell.blocks[idx])) return cell;
 			rowState.changed = true;
 			return {
@@ -216,13 +225,11 @@ function calculateHeaderFooterVisualBounds(blocks, measures, flowHeight, metrics
 	};
 }
 /**
-* Compute the header/footer bounds used by `computeHeaderFooterMarginExtender`
-* to push body margins clear of HF overflow. Excludes anchored/floating objects
-* (full-page letterheads, watermarks): Word positions them on the page instead
-* of in the header/footer flow, so they must not reserve body push-down. Keeping
-* them in `visualBottom` is still correct for the renderer (and for the
-* page-hash invalidation signal), but the margin extender needs the flow-only
-* extent.
+* Compute flow-only header/footer bounds, excluding anchored/floating objects
+* such as full-page letterheads and watermarks. Word positions those objects on
+* the page independently from header/footer flow. Keeping them in
+* `visualBottom` is still correct for rendering and page-hash invalidation;
+* these bounds separately describe the in-flow portion for API consumers.
 */
 function calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, metrics) {
 	let top = 0;
@@ -232,6 +239,7 @@ function calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, met
 		const block = blocks[i];
 		const measure = measures[i];
 		if (!block || !measure) continue;
+		if (isCanonicalTrailingEmptyParagraphAfterTable(blocks, i)) continue;
 		if (block.kind === "paragraph" && measure.kind === "paragraph") {
 			const paragraphBottomY = cursorY + measure.totalHeight;
 			top = Math.min(top, cursorY);
@@ -312,7 +320,7 @@ function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options
 }
 function finalizeHeaderFooterContent(blocks, contentWidth, metrics, options) {
 	if (blocks.length === 0) return;
-	const blocksForMeasure = normalizeHeaderFooterMeasureBlocks(blocks);
+	const blocksForMeasure = normalizeHeaderFooterMeasureBlocks(blocks, metrics.section);
 	const measures = options.measureBlocks(blocksForMeasure, contentWidth);
 	let flowHeight = 0;
 	for (let i = 0; i < measures.length; i++) {