@stll/folio-core 0.35.1 → 0.36.0

package/dist/docx/xmlSafety.js

@@ -1,8 +1,165 @@
 import { XMLValidator } from "fast-xml-parser";
 //#region src/docx/xmlSafety.ts
 const DOCTYPE_PATTERN = /<!DOCTYPE(?:\s|>)/iu;
+const BUILT_IN_ENTITIES = /* @__PURE__ */ new Set([
+	"amp",
+	"apos",
+	"gt",
+	"lt",
+	"quot"
+]);
+const DECIMAL_CHARACTER_REFERENCE = /^#[0-9]+$/u;
+const HEX_CHARACTER_REFERENCE = /^#[xX][0-9A-Fa-f]+$/u;
+const NCNAME = /^[\p{L}_][\p{L}\p{N}._\-\u00b7\p{M}]*$/u;
+const BYTE_ORDER_MARK = "";
+const ENCODING_NAME = String.raw`[A-Za-z][A-Za-z0-9._-]*`;
+const XML_DECLARATION = new RegExp(String.raw`^<\?xml[ \t\r\n]+version[ \t\r\n]*=[ \t\r\n]*(?:"1\.0"|'1\.0')(?:[ \t\r\n]+encoding[ \t\r\n]*=[ \t\r\n]*(?:"${ENCODING_NAME}"|'${ENCODING_NAME}'))?(?:[ \t\r\n]+standalone[ \t\r\n]*=[ \t\r\n]*(?:"(?:yes|no)"|'(?:yes|no)'))?[ \t\r\n]*\?>$`, "u");
+const isXmlCharacter = (codePoint) => codePoint === 9 || codePoint === 10 || codePoint === 13 || codePoint >= 32 && codePoint <= 55295 || codePoint >= 57344 && codePoint <= 65533 || codePoint >= 65536 && codePoint <= 1114111;
+const validEntity = (entity) => {
+	if (BUILT_IN_ENTITIES.has(entity)) return true;
+	if (!DECIMAL_CHARACTER_REFERENCE.test(entity) && !HEX_CHARACTER_REFERENCE.test(entity)) return false;
+	const digits = entity[1]?.toLowerCase() === "x" ? entity.slice(2) : entity.slice(1);
+	const significantDigits = digits.replace(/^0+/u, "") || "0";
+	const hexadecimal = entity[1]?.toLowerCase() === "x";
+	if (digits.length === 0 || significantDigits.length > (hexadecimal ? 6 : 7)) return false;
+	return isXmlCharacter(Number.parseInt(significantDigits, hexadecimal ? 16 : 10));
+};
+const hasForbiddenEntity = (xml) => {
+	let cursor = 0;
+	while (cursor < xml.length) {
+		if (xml.startsWith("<!--", cursor)) {
+			const end = xml.indexOf("-->", cursor + 4);
+			cursor = end === -1 ? xml.length : end + 3;
+			continue;
+		}
+		if (xml.startsWith("<![CDATA[", cursor)) {
+			const end = xml.indexOf("]]>", cursor + 9);
+			cursor = end === -1 ? xml.length : end + 3;
+			continue;
+		}
+		if (xml.startsWith("<?", cursor)) {
+			const end = xml.indexOf("?>", cursor + 2);
+			cursor = end === -1 ? xml.length : end + 2;
+			continue;
+		}
+		if (xml[cursor] !== "&") {
+			cursor += 1;
+			continue;
+		}
+		const end = xml.indexOf(";", cursor + 1);
+		if (end === -1) return true;
+		if (!validEntity(xml.slice(cursor + 1, end))) return true;
+		cursor = end + 1;
+	}
+	return false;
+};
+const isValidQName = (name) => {
+	const parts = name.split(":");
+	return parts.length <= 2 && parts.every((part) => NCNAME.test(part));
+};
+const containsOnlyXmlCharacters = (xml) => {
+	for (const character of xml) {
+		const codePoint = character.codePointAt(0);
+		if (codePoint === void 0 || !isXmlCharacter(codePoint)) return false;
+	}
+	return true;
+};
+const isWhitespace = (character) => character === " " || character === "	" || character === "\r" || character === "\n";
+const scanName = (xml, start) => {
+	let cursor = start;
+	while (cursor < xml.length && !isWhitespace(xml[cursor]) && xml[cursor] !== ">" && xml[cursor] !== "/" && xml[cursor] !== "=" && xml[cursor] !== "?") cursor += 1;
+	const name = xml.slice(start, cursor);
+	return name !== "" && isValidQName(name) ? {
+		name,
+		next: cursor
+	} : null;
+};
+/**
+* Reject lexical forms that fast-xml-parser's permissive validator repairs.
+* This is deliberately a small XML lexer, not a second tree parser: structural
+* nesting remains XMLValidator's job.
+*/
+const hasInvalidXmlLexicalForm = (xml) => {
+	if (!containsOnlyXmlCharacters(xml)) return true;
+	const byteOrderMark = xml.indexOf(BYTE_ORDER_MARK);
+	if (byteOrderMark > 0 || byteOrderMark === 0 && xml.indexOf(BYTE_ORDER_MARK, 1) !== -1) return true;
+	let cursor = 0;
+	while (cursor < xml.length) {
+		const opening = xml.indexOf("<", cursor);
+		const textEnd = opening === -1 ? xml.length : opening;
+		if (xml.slice(cursor, textEnd).includes("]]>") || opening === -1) return xml.slice(cursor, textEnd).includes("]]>");
+		if (xml.startsWith("<!--", opening)) {
+			const end = xml.indexOf("-->", opening + 4);
+			if (end === -1) return true;
+			const body = xml.slice(opening + 4, end);
+			if (body.includes("--") || body.endsWith("-")) return true;
+			cursor = end + 3;
+			continue;
+		}
+		if (xml.startsWith("<![CDATA[", opening)) {
+			const end = xml.indexOf("]]>", opening + 9);
+			if (end === -1) return true;
+			cursor = end + 3;
+			continue;
+		}
+		if (xml.startsWith("<?", opening)) {
+			const end = xml.indexOf("?>", opening + 2);
+			if (end === -1) return true;
+			let targetEnd = opening + 2;
+			while (targetEnd < end && !isWhitespace(xml[targetEnd]) && xml[targetEnd] !== "?") targetEnd += 1;
+			const target = xml.slice(opening + 2, targetEnd);
+			if (!NCNAME.test(target)) return true;
+			if (target.toLowerCase() === "xml") {
+				if (opening !== (xml.startsWith(BYTE_ORDER_MARK) ? 1 : 0) || target !== "xml" || !XML_DECLARATION.test(xml.slice(opening, end + 2))) return true;
+			}
+			cursor = end + 2;
+			continue;
+		}
+		if (xml.startsWith("<!", opening)) return true;
+		let tagCursor = opening + 1;
+		const closing = xml[tagCursor] === "/";
+		if (closing) tagCursor += 1;
+		const tagName = scanName(xml, tagCursor);
+		if (!tagName) return true;
+		tagCursor = tagName.next;
+		if (closing) {
+			while (isWhitespace(xml[tagCursor])) tagCursor += 1;
+			if (xml[tagCursor] !== ">") return true;
+			cursor = tagCursor + 1;
+			continue;
+		}
+		while (tagCursor < xml.length) {
+			while (isWhitespace(xml[tagCursor])) tagCursor += 1;
+			if (xml[tagCursor] === ">") {
+				cursor = tagCursor + 1;
+				break;
+			}
+			if (xml[tagCursor] === "/" && xml[tagCursor + 1] === ">") {
+				cursor = tagCursor + 2;
+				break;
+			}
+			const attribute = scanName(xml, tagCursor);
+			if (!attribute) return true;
+			if (attribute.name.startsWith("xmlns:") && (!NCNAME.test(attribute.name.slice(6)) || attribute.name.slice(6).includes(":"))) return true;
+			tagCursor = attribute.next;
+			while (isWhitespace(xml[tagCursor])) tagCursor += 1;
+			if (xml[tagCursor] !== "=") return true;
+			tagCursor += 1;
+			while (isWhitespace(xml[tagCursor])) tagCursor += 1;
+			const quote = xml[tagCursor];
+			if (quote !== "\"" && quote !== "'") return true;
+			const valueEnd = xml.indexOf(quote, tagCursor + 1);
+			if (valueEnd === -1 || xml.slice(tagCursor + 1, valueEnd).includes("<")) return true;
+			tagCursor = valueEnd + 1;
+		}
+		if (tagCursor >= xml.length && cursor !== xml.length) return true;
+	}
+	return false;
+};
 const getDocxXmlSafetyIssue = (xml) => {
 	if (DOCTYPE_PATTERN.test(xml)) return "doctype-forbidden";
+	if (hasForbiddenEntity(xml)) return "entity-forbidden";
+	if (hasInvalidXmlLexicalForm(xml)) return "not-well-formed";
 	return XMLValidator.validate(xml) === true ? null : "not-well-formed";
 };
 //#endregion

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { document_d_exports } from "./types/document.js";
 import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIBlockTableLocation, FolioAIComment, FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditNormalization, FolioAIEditNormalizationCode, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditReviewMeta, FolioAIEditSeverity, FolioAIEditSkipReason, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAISignatureParty } from "./ai-edits/types.js";
 import { WORD_DIFF_GRANULARITIES, WordDiffGranularity, WordDiffNormalization, WordDiffOptions, WordDiffSegment, diffWordSegments } from "./ai-edits/word-diff.js";
 import { FolioAIEditApplyOutcome, FolioRevisionStamp, FolioWordDiffOptions, applyFolioAIEditOperations } from "./ai-edits/apply.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, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.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, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { createFolioAIEditSnapshot, hashFolioAIBlockText, isFolioAIContentBlock, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
 import { DeriveBlockIdInput, FolioBlockId, currentFolioBlockId, deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import "./ai-edits/index.js";
@@ -38,4 +38,4 @@ import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
 type Document = document_d_exports.Document;
 type DocxConformanceClass = document_d_exports.DocxConformanceClass;
-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 BlockRect, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFormatRange, type CompareResult, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, 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 FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, 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 FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioWordDiffOptions, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, 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 BlockRect, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFormatRange, type CompareResult, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, 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, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, type FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, 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 FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioWordDiffOptions, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/index.js

@@ -8,7 +8,7 @@ import { DEFAULT_AI_SUGGESTION_PRESETS } from "./ai-suggestions/types.js";
 import { MAX_COMPARE_OPERATIONS, compareDocx } from "./compare/compare.js";
 import { COMPARE_UNSUPPORTED_REASONS, CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, InvalidCompareDocxOptionsError } from "./compare/types.js";
 import { COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS } from "./compare/verification.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 { 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, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { inspectDocxCompatibility } from "./docx/compatibility.js";
 import { createDocx } from "./docx/rezip.js";
 import { buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily } from "./fonts/embeddedFonts.js";
@@ -31,4 +31,4 @@ import { createEmptyDocument } from "./utils/createDocument.js";
 import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 import { mergeDocumentContent } from "./utils/mergeDocumentContent.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
-export { COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, 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, InvalidCompareDocxOptionsError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, 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, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, InvalidCompareDocxOptionsError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

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

@@ -1,3 +1,4 @@
+import { cloneParagraphWithPropertySource } from "../../docx/paragraphPropertySource.js";
 import { isFloatingImageRun, isFloatingTextBoxBlock } from "../../layout-engine/types.js";
 import { headerFooterToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
 import { emuToPixels } from "../../utils/units.js";
@@ -7,10 +8,9 @@ const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const headerFooterToProseDocWithDetachedWatermarkHost = (headerFooter, options) => {
 	return headerFooterToProseDoc(headerFooter.content.map((block, blockIndex) => {
 		if (blockIndex !== headerFooter.watermarkBlockIndex || block.type !== "paragraph") return block;
-		return {
-			...block,
-			[DETACHED_WATERMARK_HOST]: true
-		};
+		const marked = cloneParagraphWithPropertySource(block, {});
+		Reflect.set(marked, DETACHED_WATERMARK_HOST, true);
+		return marked;
 	}), options);
 };
 function isAnchoredImageRun(run) {

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

@@ -717,15 +717,20 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme, fon
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
+const FLOW_ALIGNMENT_BY_PARAGRAPH_ALIGNMENT = {
+	left: "left",
+	center: "center",
+	right: "right",
+	both: "justify",
+	distribute: "justify",
+	mediumKashida: "justify",
+	highKashida: "justify",
+	lowKashida: "justify",
+	thaiDistribute: "justify"
+};
 function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStreams, defaultTabStopTwips }) {
 	const attrs = {};
-	if (pmAttrs.alignment) {
-		const align = pmAttrs.alignment;
-		if (align === "both" || align === "distribute") attrs.alignment = "justify";
-		else if (align === "left") attrs.alignment = "left";
-		else if (align === "center") attrs.alignment = "center";
-		else if (align === "right") attrs.alignment = "right";
-	}
+	if (pmAttrs.alignment) attrs.alignment = FLOW_ALIGNMENT_BY_PARAGRAPH_ALIGNMENT[pmAttrs.alignment];
 	if (typeof pmAttrs.outlineLevel === "number") attrs.outlineLevel = pmAttrs.outlineLevel;
 	const spaceBefore = pmAttrs.spaceBefore;
 	const spaceAfter = pmAttrs.spaceAfter;

package/dist/markdown/renderBlock.js

@@ -1,3 +1,4 @@
+import { cloneParagraphWithoutPropertySource } from "../docx/paragraphPropertySource.js";
 import { renderParagraph } from "./renderParagraph.js";
 import { renderTable } from "./renderTable.js";
 //#region src/markdown/renderBlock.ts
@@ -16,17 +17,13 @@ function mergeAcceptedParagraphBreaks(blocks) {
 	for (const block of blocks) {
 		const prev = merged.at(-1);
 		if (prev?.type === "paragraph" && prev.pPrMark?.kind === "del" && block.type === "paragraph") {
-			const { pPrMark: _resolved, ...base } = prev;
 			const next = block.pPrMark;
-			const content = [...prev.content, ...block.content];
-			merged[merged.length - 1] = next ? {
-				...base,
-				content,
-				pPrMark: next
-			} : {
-				...base,
-				content
-			};
+			const joined = cloneParagraphWithoutPropertySource(prev, {
+				content: [...prev.content, ...block.content],
+				...next ? { pPrMark: next } : {}
+			});
+			if (!next) Reflect.deleteProperty(joined, "pPrMark");
+			merged[merged.length - 1] = joined;
 			continue;
 		}
 		merged.push(block);

package/dist/prosemirror/attrs/index.js

@@ -148,6 +148,7 @@ const readParagraphAttrs = (node) => {
 	optionalString(attrs, "paraId", "paragraph.attrs.paraId", issues);
 	optionalString(attrs, "textId", "paragraph.attrs.textId", issues);
 	optionalOneOf(attrs, "alignment", "paragraph.attrs.alignment", issues, PARAGRAPH_ALIGNMENT_VALUES);
+	optionalOneOf(attrs, "alignmentFromStyle", "paragraph.attrs.alignmentFromStyle", issues, PARAGRAPH_ALIGNMENT_VALUES);
 	optionalString(attrs, "styleId", "paragraph.attrs.styleId", issues);
 	optionalNumber(attrs, "_tableOfContentsLevel", "paragraph.attrs._tableOfContentsLevel", issues);
 	optionalBoolean(attrs, "kinsoku", "paragraph.attrs.kinsoku", issues);
@@ -655,6 +656,7 @@ const readTrackedChangeMarkAttrs = (mark) => {
 	requiredNumber(attrs, "revisionId", `${mark.type.name}.attrs.revisionId`, issues);
 	requiredString(attrs, "author", `${mark.type.name}.attrs.author`, issues);
 	optionalString(attrs, "date", `${mark.type.name}.attrs.date`, issues);
+	optionalString(attrs, "utcDate", `${mark.type.name}.attrs.utcDate`, issues);
 	optionalString(attrs, "initials", `${mark.type.name}.attrs.initials`, issues);
 	optionalOneOf(attrs, "moveKind", `${mark.type.name}.attrs.moveKind`, issues, TRACKED_CHANGE_MOVE_KINDS);
 	optionalOneOf(attrs, "provenance", `${mark.type.name}.attrs.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
@@ -1005,6 +1007,7 @@ const optionalTableRowRevision = (attrs, key, issues) => {
 	requiredNumber(value, "revisionId", `${path}.revisionId`, issues);
 	requiredString(value, "author", `${path}.author`, issues);
 	optionalString(value, "date", `${path}.date`, issues);
+	optionalString(value, "utcDate", `${path}.utcDate`, issues);
 	optionalString(value, "initials", `${path}.initials`, issues);
 	optionalOneOf(value, "provenance", `${path}.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
 	optionalString(value, "suggestionId", `${path}.suggestionId`, issues);
@@ -1036,6 +1039,7 @@ const optionalTableCellRevision = (attrs, issues) => {
 	requiredNumber(info, "revisionId", `${path}.info.revisionId`, issues);
 	requiredString(info, "author", `${path}.info.author`, issues);
 	optionalString(info, "date", `${path}.info.date`, issues);
+	optionalString(info, "utcDate", `${path}.info.utcDate`, issues);
 	optionalString(info, "initials", `${path}.info.initials`, issues);
 	if (value["kind"] === "merge") {
 		if (info["provenance"] !== void 0) issues.push({
@@ -1568,7 +1572,18 @@ const validatePropertyChangeInfo = (value, path, issues) => {
 	requiredNumber(value, "id", `${path}.id`, issues);
 	requiredString(value, "author", `${path}.author`, issues);
 	optionalString(value, "date", `${path}.date`, issues);
+	const utcDate = value["utcDate"];
+	if (utcDate !== void 0) if (!isRecord(utcDate)) issues.push({
+		path: `${path}.utcDate`,
+		message: "Expected an object."
+	});
+	else {
+		requiredString(utcDate, "attribute", `${path}.utcDate.attribute`, issues);
+		requiredString(utcDate, "value", `${path}.utcDate.value`, issues);
+	}
 	optionalString(value, "rsid", `${path}.rsid`, issues);
+	optionalOneOf(value, "provenance", `${path}.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
+	optionalString(value, "suggestionId", `${path}.suggestionId`, issues);
 };
 const optionalImagePosition = (attrs, key, path, issues) => {
 	const value = attrs[key];