@a3s-lab/office 0.48.1 → 0.50.0

package/dist/0~work-docx-export.js

@@ -4128,6 +4128,131 @@ function directListItemContentRoot(item) {
     for (const child of item.childNodes)if (!(child instanceof HTMLElement) || 'ol' !== child.tagName.toLowerCase() && 'ul' !== child.tagName.toLowerCase()) root.append(child.cloneNode(true));
     return root;
 }
+const work_docx_move_revision_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const work_docx_move_revision_export_STORY_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
+const MAX_MOVE_REVISION_PATCHES = 65536;
+const MAX_MOVE_TEXT_LENGTH = 1000000;
+class DocxMoveRevisionPatchCollector {
+    patches = [];
+    registrations = new WeakMap();
+    nextWireId = -1;
+    register(element, id, revisionDate = work_docx_move_revision_export_normalizedRevisionDate(element.dataset.changeDate)) {
+        if (!element.hasAttribute('data-document-change') || 'move' !== element.dataset.changeKind) return null;
+        const existing = this.registrations.get(element);
+        if (existing) return existing;
+        const role = moveRole(element.dataset.changeMoveRole);
+        const author = element.dataset.changeAuthor?.trim() ?? '';
+        const date = revisionDate;
+        const key = element.dataset.changeId?.trim() ?? '';
+        const text = element.textContent ?? '';
+        if (!role || !key || key.length > 255 || /[\u0000-\u001f\u007f]/.test(key) || !Number.isSafeInteger(id) || id < 0 || !author || author.length > 255 || /[\u0000-\u001f\u007f]/.test(author) || !text || text.length > MAX_MOVE_TEXT_LENGTH || element.querySelector('[data-document-change]') || element.querySelector('[data-document-equation], [data-document-field], [data-document-note-reference], [data-document-content-control], img, br')) throw new Error('Document contains an invalid move revision.');
+        if (this.patches.length >= MAX_MOVE_REVISION_PATCHES) throw new Error('Document exceeds the move revision limit.');
+        const wireId = this.nextWireId;
+        this.nextWireId -= 1;
+        const registration = {
+            kind: 'from' === role ? 'move-from' : 'move-to',
+            wireId,
+            id,
+            author,
+            date
+        };
+        this.registrations.set(element, registration);
+        this.patches.push({
+            wireId,
+            id,
+            role,
+            author,
+            date
+        });
+        return registration;
+    }
+}
+async function patchDocxMoveRevisions(buffer, patches) {
+    if (!patches.length) return buffer;
+    if (patches.length > MAX_MOVE_REVISION_PATCHES) throw new Error('Document exceeds the move revision limit.');
+    const archive = await jszip.loadAsync(buffer);
+    const byWireId = new Map();
+    const logicalSides = new Map();
+    for (const patch of patches){
+        if (byWireId.has(patch.wireId)) throw new Error('Generated DOCX move revision wire IDs are duplicated.');
+        byWireId.set(patch.wireId, patch);
+        const logicalKey = `${patch.id}\u0000${patch.author}\u0000${patch.date}`;
+        const sides = logicalSides.get(logicalKey) ?? {
+            from: [],
+            to: []
+        };
+        sides[patch.role].push(patch);
+        logicalSides.set(logicalKey, sides);
+    }
+    for (const sides of logicalSides.values())if (!sides.from.length || !sides.to.length) throw new Error('A DOCX move revision must contain both moveFrom and moveTo sides.');
+    const applied = new Map();
+    const emittedText = new Map();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !work_docx_move_revision_export_STORY_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
+        let changed = false;
+        const wrappers = [
+            ...descendants(document, 'ins'),
+            ...descendants(document, 'del')
+        ];
+        for (const wrapper of wrappers){
+            if (!wrapper.parentNode) continue;
+            if (!DOCX_WORDPROCESSING_NAMESPACES.has(wrapper.namespaceURI ?? '')) continue;
+            const wireId = numericWordAttribute(wrapper, 'id');
+            if (null === wireId) continue;
+            const patch = byWireId.get(wireId);
+            if (!patch) continue;
+            const expectedName = 'from' === patch.role ? 'del' : 'ins';
+            if (wrapper.localName !== expectedName) throw new Error(`Generated DOCX move revision ${patch.wireId} has the wrong wrapper kind.`);
+            const replacement = document.createElementNS(wrapper.namespaceURI, `${xmlNamespacePrefix(wrapper, wrapper.namespaceURI) ?? 'w'}:${'from' === patch.role ? 'moveFrom' : 'moveTo'}`);
+            for (const child of Array.from(wrapper.attributes)){
+                const namespace = xmlAttributeNamespace(wrapper, child);
+                if (namespace) replacement.setAttributeNS(namespace, child.name, child.value);
+                else replacement.setAttribute(child.name, child.value);
+            }
+            work_docx_move_revision_export_setWordAttribute(replacement, 'id', String(patch.id));
+            work_docx_move_revision_export_setWordAttribute(replacement, 'author', patch.author);
+            work_docx_move_revision_export_setWordAttribute(replacement, 'date', patch.date);
+            const text = Array.from(wrapper.querySelectorAll('*')).filter((element)=>'from' === patch.role ? 'delText' === element.localName : 't' === element.localName).map((element)=>element.textContent ?? '').join('');
+            emittedText.set(patch.wireId, `${emittedText.get(patch.wireId) ?? ''}${text}`);
+            while(wrapper.firstChild)replacement.append(wrapper.firstChild);
+            wrapper.replaceWith(replacement);
+            applied.set(patch.wireId, (applied.get(patch.wireId) ?? 0) + 1);
+            changed = true;
+        }
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.wireId));
+    if (missing.length) throw new Error(`DOCX move revision markers were not emitted: ${missing.map((patch)=>patch.wireId).join(', ')}.`);
+    for (const sides of logicalSides.values()){
+        const from = sides.from.map((patch)=>emittedText.get(patch.wireId) ?? '').join('');
+        const to = sides.to.map((patch)=>emittedText.get(patch.wireId) ?? '').join('');
+        if (!from || !to || from !== to) throw new Error('A DOCX move revision source and destination must contain the same text.');
+    }
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function moveRole(value) {
+    return 'from' === value || 'to' === value ? value : null;
+}
+function numericWordAttribute(element, localName) {
+    const namespace = element.namespaceURI;
+    if (!namespace) return null;
+    const attributes = Array.from(element.attributes).filter((candidate)=>xmlAttributeLocalName(candidate) === localName && xmlAttributeNamespace(element, candidate) === namespace);
+    if (1 !== attributes.length) return null;
+    const value = Number(attributes[0]?.value);
+    return Number.isSafeInteger(value) ? value : null;
+}
+function work_docx_move_revision_export_setWordAttribute(element, localName, value) {
+    const namespace = element.namespaceURI ?? work_docx_move_revision_export_WORD_NAMESPACE;
+    const prefix = xmlNamespacePrefix(element, namespace) ?? element.prefix ?? 'w';
+    element.setAttributeNS(namespace, `${prefix}:${localName}`, value);
+}
+function work_docx_move_revision_export_normalizedRevisionDate(value) {
+    const time = Date.parse(value ?? '');
+    return Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString();
+}
 const DRAWINGML_NAMESPACES = new Set([
     'http://schemas.openxmlformats.org/drawingml/2006/main',
     'http://purl.oclc.org/ooxml/drawingml/main'
@@ -8526,6 +8651,8 @@ async function createDocxBlob(content, sourcePackage) {
         usedOpenTypeMarkers: new Set(),
         paragraphFormattingChangePatches: new DocxParagraphFormattingChangePatchCollector(),
         numberingChangePatches: new DocxNumberingChangePatchCollector(),
+        moveRevisionPatches: new DocxMoveRevisionPatchCollector(),
+        moveRevisionDefaultDate: new Date().toISOString(),
         tableOfContentsPatches: new DocxTableOfContentsPatchCollector(),
         indexPatches: new DocxIndexPatchCollector(),
         hasExplicitZeroCharacterSpacing: false,
@@ -8606,7 +8733,8 @@ async function createDocxBlob(content, sourcePackage) {
     const indexPatched = await patchDocxIndexes(tableOfContentsPatched, noteContext.indexPatches.patches);
     const paragraphFormattingChangesPatched = await patchDocxParagraphFormattingChanges(indexPatched, noteContext.paragraphFormattingChangePatches.patches);
     const numberingChangesPatched = await patchDocxNumberingChanges(paragraphFormattingChangesPatched, noteContext.numberingChangePatches.patches);
-    const equationPatched = await patchDocxEquations(numberingChangesPatched, noteContext.equationPatches.patches);
+    const moveRevisionsPatched = await patchDocxMoveRevisions(numberingChangesPatched, noteContext.moveRevisionPatches.patches);
+    const equationPatched = await patchDocxEquations(moveRevisionsPatched, noteContext.equationPatches.patches);
     const patched = await patchDocxPageColor(equationPatched, normalizedContent.pageColor);
     const contentControlsPatched = await patchDocxContentControls(patched, noteContext.contentControlPatches.patches);
     const preserved = sourcePackage ? await preserveDocxSourcePackage(contentControlsPatched, sourcePackage, {
@@ -8987,19 +9115,19 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
             markDocxRunStyleMarkersUsed(inherited.style, noteContext);
             markDocxRunBorderUsed(inherited.border, noteContext);
             markDocxRunShadingUsed(inherited.shading, noteContext);
-            if (revision?.kind === 'insertion') return [
+            if (revision?.kind === 'insertion' || revision?.kind === 'move-to') return [
                 new docx.InsertedTextRun({
                     ...inherited,
-                    id: revision.id,
+                    id: revision.wireId ?? revision.id,
                     author: revision.author,
                     date: revision.date,
                     text: node.textContent
                 })
             ];
-            if (revision?.kind === 'deletion') return [
+            if (revision?.kind === 'deletion' || revision?.kind === 'move-from') return [
                 new docx.DeletedTextRun({
                     ...inherited,
-                    id: revision.id,
+                    id: revision.wireId ?? revision.id,
                     author: revision.author,
                     date: revision.date,
                     text: node.textContent
@@ -9050,7 +9178,7 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
             for (const child of node.childNodes)children.push(...await visit(child, inherited, revision));
             return docxContentControlRuns(node, docx, noteContext.contentControlPatches, children);
         }
-        const textRevisionKind = 'del' === tag ? 'deletion' : 'ins' === tag ? 'insertion' : null;
+        const textRevisionKind = 'del' === tag ? 'move' === node.dataset.changeKind ? 'move-from' : 'deletion' : 'ins' === tag ? 'move' === node.dataset.changeKind ? 'move-to' : 'insertion' : null;
         const change = node.hasAttribute('data-document-change') && textRevisionKind ? docxTextRevision(node, textRevisionKind, noteContext) : revision;
         const formattingChange = node.hasAttribute('data-document-change') && 'formatting' === node.dataset.changeKind ? noteContext.formattingChangePatches.register(node, docxRevisionId(node, noteContext)) : null;
         const commentBoundary = node.hasAttribute('data-document-comment') ? nextDocxCommentBoundary(node.dataset.commentId, noteContext) : null;
@@ -9273,12 +9401,18 @@ function docxTextRevision(element, kind, context) {
     const id = docxRevisionId(element, context);
     const sourceDate = element.dataset.changeDate?.trim() ?? '';
     const time = Date.parse(sourceDate);
-    return {
+    const revision = {
         kind,
         id,
         author: element.dataset.changeAuthor?.trim() || 'A3S Work',
-        date: Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString()
+        date: Number.isFinite(time) ? new Date(time).toISOString() : 'move-from' === kind || 'move-to' === kind ? context.moveRevisionDefaultDate : new Date().toISOString()
     };
+    if ('move-from' === kind || 'move-to' === kind) {
+        const registration = context.moveRevisionPatches.register(element, id, revision.date);
+        if (!registration) throw new Error('Document contains an invalid move revision.');
+        revision.wireId = registration.wireId;
+    }
+    return revision;
 }
 function docxRevisionId(element, context, suffix) {
     const baseKey = element.dataset.changeId?.trim() || `change-${context.nextChangeId}`;
@@ -9293,7 +9427,7 @@ function docxRevisionId(element, context, suffix) {
 }
 function documentHasTrackedChanges(html) {
     const document = new DOMParser().parseFromString(html, 'text/html');
-    return Boolean(document.body.querySelector('ins[data-document-change], del[data-document-change], span[data-document-change][data-change-kind="formatting"], [data-document-change][data-change-kind="paragraph-formatting"], [data-document-change][data-change-kind="numbering"]'));
+    return Boolean(document.body.querySelector('ins[data-document-change], del[data-document-change], span[data-document-change][data-change-kind="formatting"], [data-document-change][data-change-kind="paragraph-formatting"], [data-document-change][data-change-kind="numbering"], [data-document-change][data-change-kind="move"]'));
 }
 function anchoredDocumentComments(content) {
     const document = new DOMParser().parseFromString(content.html, 'text/html');

package/dist/0~work-docx-import.js

@@ -1,7 +1,7 @@
 import jszip from "jszip";
 import { documentRunBorderDomAttributes, contentTypeForPart, bytesToDataUrl, OoxmlPackage, normalizeDocumentIndexesHtml, firstDescendant, normalizeDocumentParagraphId, applyDocumentParagraphIdentityToElement, descendants, documentHighlightDomAttributes, attribute as work_ooxml_package_attribute, documentHighlightFromDocxValue, serializeDocxThemeReference, normalizeDocumentTableOfContentsHtml, directChildren, documentParagraphShadingDomAttributes, documentProofingDomAttributes, documentParagraphBordersDomAttributes, directChild, documentScriptFontSegments, normalizeDocumentParagraphIdentity, documentRunShadingDomAttributes } from "./6968.js";
 import { normalizeDocumentBookmarkName, renderDocumentTableCellMarginOverrides, applyDocumentImageIdentityToElement, documentCharacterPositionDomAttributes, createDocumentImageIdentityRegistry, normalizeDocumentColumns, documentStrikeDomAttributes, normalizeDocumentImageWrapContour, DOCUMENT_TABLE_ROW_ID_ATTRIBUTE, normalizeDocumentBookmarksHtml, applyDocumentTableRowIdentityToElement, normalizeDocumentCaptionsHtml, documentCharacterSpacingDomAttributes, normalizeDocumentImageAlignment, applyDocumentImageLayerToElement, normalizeDocumentNotesHtml, normalizeDocumentBookmarkReferencesHtml, documentCitationTagsFromInstruction, applyDocumentImageWrapContourToElement, documentUnderlineDomAttributes, documentHiddenTextDomAttributes, normalizeDocumentPageChrome, normalizeDocumentImageLayoutOptions, applyDocumentImageCropToElement, documentPageMarginsForLayout, applyDocumentPageGeometry, createDocumentNoteElement, normalizeDocumentImageLayer, DOCUMENT_TABLE_ROW_TEXT_ID_ATTRIBUTE, documentBookmarkReferenceInstruction, applyDocumentImageTransformToElement, documentInitialSectionLayout, normalizeDocumentFieldsHtml, documentCaptionLabel, documentTableBordersFromElement, isContourImageLayout, normalizeDocumentCitationsHtml, normalizeDocumentImageIdentity, normalizeDocumentImageWrapSide, supportedDocxDocumentFieldInstruction, documentKerningDomAttributes, docxDocumentFieldKind, renderDocumentTableBorders, docxBookmarkReferenceTarget, normalizeDocumentImagePosition, wrapsBesideImage, documentPageChromeLegacyFields, documentCharacterScaleDomAttributes, DEFAULT_DOCUMENT_TABLE_GEOMETRY, documentSectionDomAttributes, DEFAULT_DOCUMENT_TABLE_CELL_MARGINS, documentPageMarginBody, documentLegacyTextEffectsDomAttributes, normalizeDocumentTableRowIdentity, normalizeDocumentBookmarkNativeId, documentOpenTypeDomAttributes, uniqueDocumentImageIdentity, applyDocumentTableGeometryToElement, normalizeDocumentImageCrop, documentContentLayoutProperties, documentEmphasisMarkDomAttributes, docxDocumentFieldTarget } from "./4174.js";
-import { hasImportedDocxIndexMarkers, markDocxRunFormattingIntoState, applyImportedDocxParagraphSpacingMarkers, hasImportedDocxParagraphDirectionMarkers, hasImportedDocxParagraphIndentMarkers, resolveDocxParagraphBordersForParagraph, applyImportedDocxTextBoxMarkers, applyImportedDocxNumberingChangeMarkers, applyImportedDocxParagraphShadingMarkers, markDocxParagraphSpacing, docxCaptionBookmark, docxFieldResultText, applyImportedDocxContentControlMarkers, createDocxParagraphStyleResolver, markDocxTextBoxes, docxTableCellStyleLayers, createImportedDocxRunFormattingMarkerState, markDocxContentControls, parseDocxPaperSource, resolveDocxLegacyTextEffects, markDocxTablesOfContents, applyImportedDocxIndexMarkers, docxTablePropertySources, applyImportedDocxTableOfContentsMarkers, markDocxIndexes, parseDirectDocxParagraphShading, markDocxPackageEquations, hasImportedDocxParagraphSpacingMarkers, markDocxParagraphIndents, parseDocxPageMargins, resolveDocxRunBorder, parseDocxPageGeometry, docxCaptionReferenceTarget, applyImportedDocxEquationMarkers, hasImportedDocxParagraphPaginationMarkers, createDocxTableStyleResolver, hasImportedDocxParagraphShadingMarkers, isDocxEquationLikeRoot, importedDocxStrike, docxTableRunPropertySources, hasImportedDocxNumberingChangeMarkers, inspectDocxPageMarginSettings, hasImportedDocxRunFormattingMarkers, hasImportedDocxTableOfContentsMarkers, applyImportedDocxParagraphFormattingChangeMarkers, hasImportedDocxContentControlMarkers, hasImportedDocxParagraphTabStopMarkers, resolveDocxRunShading, docxCaptionSequenceKind, applyImportedDocxRunFormattingMarkers, markDocxParagraphAlignments, markDocxParagraphDirections, hasImportedDocxParagraphBorderMarkers, hasImportedDocxParagraphFormattingChangeMarkers, resolveDocxHiddenText, docxEquationHtml, docxFieldOccurrences, hasImportedDocxParagraphAlignmentMarkers, markDocxParagraphTabStops, applyImportedDocxParagraphIndentMarkers, resolveDocxTableStyleResolver, applyImportedDocxParagraphAlignmentMarkers, hasImportedDocxTextBoxMarkers, markDocxNumberingChanges, importedDocxUnderline, markDocxParagraphBorders, applyImportedDocxParagraphDirectionMarkers, markDocxParagraphPagination, docxFieldOccurrenceIsInlineEditable, applyImportedDocxParagraphBorderMarkers, applyImportedDocxParagraphPaginationMarkers, applyImportedDocxParagraphTabStopMarkers, docxRunPropertySources, markDocxParagraphFormattingChanges, markDocxParagraphShading, parseDocxPageBorders } from "./0~3320.js";
+import { hasImportedDocxIndexMarkers, markDocxRunFormattingIntoState, applyImportedDocxParagraphSpacingMarkers, hasImportedDocxParagraphDirectionMarkers, hasImportedDocxParagraphIndentMarkers, resolveDocxParagraphBordersForParagraph, applyImportedDocxTextBoxMarkers, applyImportedDocxNumberingChangeMarkers, applyImportedDocxParagraphShadingMarkers, applyImportedDocxChangeMarkers, markDocxParagraphSpacing, docxCaptionBookmark, docxFieldResultText, applyImportedDocxContentControlMarkers, createDocxParagraphStyleResolver, markDocxTextBoxes, docxTableCellStyleLayers, markDocxTextChanges, markDocxContentControls, createImportedDocxRunFormattingMarkerState, parseDocxPaperSource, resolveDocxLegacyTextEffects, markDocxTablesOfContents, applyImportedDocxIndexMarkers, docxTablePropertySources, applyImportedDocxTableOfContentsMarkers, markDocxIndexes, parseDirectDocxParagraphShading, markDocxPackageEquations, hasImportedDocxParagraphSpacingMarkers, markDocxParagraphIndents, parseDocxPageMargins, resolveDocxRunBorder, parseDocxPageGeometry, docxCaptionReferenceTarget, applyImportedDocxEquationMarkers, hasImportedDocxParagraphPaginationMarkers, createDocxTableStyleResolver, hasImportedDocxParagraphShadingMarkers, isDocxEquationLikeRoot, importedDocxStrike, docxTableRunPropertySources, hasImportedDocxNumberingChangeMarkers, inspectDocxPageMarginSettings, hasImportedDocxRunFormattingMarkers, hasImportedDocxTableOfContentsMarkers, applyImportedDocxParagraphFormattingChangeMarkers, hasImportedDocxContentControlMarkers, hasImportedDocxParagraphTabStopMarkers, resolveDocxRunShading, docxCaptionSequenceKind, applyImportedDocxRunFormattingMarkers, markDocxParagraphAlignments, markDocxParagraphDirections, hasImportedDocxParagraphBorderMarkers, hasImportedDocxParagraphFormattingChangeMarkers, resolveDocxHiddenText, docxEquationHtml, docxFieldOccurrences, hasImportedDocxParagraphAlignmentMarkers, markDocxParagraphTabStops, applyImportedDocxParagraphIndentMarkers, applyImportedDocxParagraphDirectionMarkers, applyImportedDocxParagraphAlignmentMarkers, resolveDocxTableStyleResolver, hasImportedDocxTextBoxMarkers, importedDocxUnderline, markDocxParagraphBorders, markDocxNumberingChanges, markDocxParagraphPagination, hasImportedDocxChangeMarkers, docxFieldOccurrenceIsInlineEditable, applyImportedDocxParagraphBorderMarkers, applyImportedDocxParagraphPaginationMarkers, applyImportedDocxParagraphTabStopMarkers, docxRunPropertySources, markDocxParagraphFormattingChanges, markDocxParagraphShading, parseDocxPageBorders } from "./0~5600.js";
 import { readDocxBibliography, resolveDocxProofing, XMLNS_NAMESPACE, docxCharacterScalePercentFromProperties, docxCharacterSpacingTwipsFromProperties, parseBoundedDocxInteger, resolveDocxOpenTypeFeatures, xmlAttributeLocalName, resolveDocxEmphasisMark, createDocxThemeResolver, docxCharacterPositionHalfPointsFromProperties, readDocxImageTransform, docxThemeColor, parseDocxParagraphDefaultCollapsed, resolveDocxKerningThresholdHalfPoints, resolveDocxThemeResolver, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace } from "./0~3534.js";
 import { importDocxPageColor, importedDocumentNoteId } from "./0~4980.js";
 const WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
@@ -428,121 +428,6 @@ function work_docx_caption_import_textNodes(root) {
     while(walker.nextNode())nodes.push(walker.currentNode);
     return nodes;
 }
-const work_docx_change_import_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
-const work_docx_change_import_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
-function markDocxTextChanges(document) {
-    const changes = [];
-    const revisions = [
-        ...descendants(document, 'ins'),
-        ...descendants(document, 'del')
-    ].sort(compareDocumentOrder);
-    for (const revision of revisions){
-        if (!revision.parentNode || closestRevision(revision.parentElement)) continue;
-        const kind = 'del' === revision.localName ? 'deletion' : 'insertion';
-        if (!revisionText(revision, kind)) continue;
-        if ('deletion' === kind) convertDeletedText(document, revision);
-        const index = changes.length + 1;
-        const sourceId = work_ooxml_package_attribute(revision, 'id')?.trim() ?? '';
-        const id = uniqueChangeId(sourceId ? `docx-change-${sourceId}` : `docx-change-${index}`, changes);
-        const marker = {
-            id,
-            kind,
-            author: work_ooxml_package_attribute(revision, 'author')?.trim() || '未知审阅者',
-            date: normalizeDate(work_ooxml_package_attribute(revision, 'date')),
-            start: `__A3S_WORK_CHANGE_START_${index}__`,
-            end: `__A3S_WORK_CHANGE_END_${index}__`
-        };
-        unwrapRevision(document, revision, marker.start, marker.end);
-        changes.push(marker);
-    }
-    return {
-        changes
-    };
-}
-function applyImportedDocxChangeMarkers(document, markers) {
-    for (const marker of markers.changes){
-        const element = document.createElement('deletion' === marker.kind ? 'del' : 'ins');
-        element.dataset.documentChange = 'true';
-        element.dataset.changeKind = marker.kind;
-        element.dataset.changeId = marker.id;
-        element.dataset.changeAuthor = marker.author;
-        element.dataset.changeDate = marker.date;
-        wrapMarkerRange(document.body, marker.start, marker.end, element);
-    }
-}
-function hasImportedDocxChangeMarkers(markers) {
-    return markers.changes.length > 0;
-}
-function revisionText(revision, kind) {
-    const names = 'deletion' === kind ? [
-        'delText',
-        't'
-    ] : [
-        't'
-    ];
-    return names.flatMap((name)=>descendants(revision, name)).map((element)=>element.textContent ?? '').join('');
-}
-function convertDeletedText(document, revision) {
-    for (const deleted of descendants(revision, 'delText')){
-        const text = document.createElementNS(work_docx_change_import_WORD_NAMESPACE, 'w:t');
-        const preserve = deleted.getAttributeNS(work_docx_change_import_XML_NAMESPACE, 'space') ?? deleted.getAttribute('xml:space');
-        if (preserve) text.setAttributeNS(work_docx_change_import_XML_NAMESPACE, 'xml:space', preserve);
-        text.textContent = deleted.textContent;
-        deleted.replaceWith(text);
-    }
-}
-function unwrapRevision(document, revision, start, end) {
-    const parent = revision.parentNode;
-    if (!parent) return;
-    parent.insertBefore(work_docx_change_import_markerRun(document, start), revision);
-    while(revision.firstChild)parent.insertBefore(revision.firstChild, revision);
-    parent.insertBefore(work_docx_change_import_markerRun(document, end), revision);
-    revision.remove();
-}
-function work_docx_change_import_markerRun(document, value) {
-    const run = document.createElementNS(work_docx_change_import_WORD_NAMESPACE, 'w:r');
-    const text = document.createElementNS(work_docx_change_import_WORD_NAMESPACE, 'w:t');
-    text.setAttributeNS(work_docx_change_import_XML_NAMESPACE, 'xml:space', 'preserve');
-    text.textContent = value;
-    run.append(text);
-    return run;
-}
-function wrapMarkerRange(root, start, end, wrapper) {
-    const html = root.innerHTML;
-    const startIndex = html.indexOf(start);
-    const endIndex = html.indexOf(end, startIndex + start.length);
-    if (startIndex < 0 || endIndex < 0) return false;
-    const closingTag = `</${wrapper.localName}>`;
-    const serializedWrapper = wrapper.outerHTML;
-    if (!serializedWrapper.endsWith(closingTag)) return false;
-    const openingTag = serializedWrapper.slice(0, -closingTag.length);
-    root.innerHTML = `${html.slice(0, startIndex)}${openingTag}${html.slice(startIndex + start.length, endIndex)}${closingTag}${html.slice(endIndex + end.length)}`;
-    return true;
-}
-function closestRevision(element) {
-    let current = element;
-    while(current){
-        if ('ins' === current.localName || 'del' === current.localName) return current;
-        current = current.parentElement;
-    }
-    return null;
-}
-function uniqueChangeId(base, changes) {
-    const ids = new Set(changes.map((change)=>change.id));
-    if (!ids.has(base)) return base;
-    let suffix = 2;
-    while(ids.has(`${base}-${suffix}`))suffix += 1;
-    return `${base}-${suffix}`;
-}
-function normalizeDate(value) {
-    if (!value) return '';
-    const time = Date.parse(value);
-    return Number.isFinite(time) ? new Date(time).toISOString() : '';
-}
-function compareDocumentOrder(left, right) {
-    if (left === right) return 0;
-    return left.compareDocumentPosition(right) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1;
-}
 const work_docx_citation_import_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const work_docx_citation_import_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
 function markDocxCitationFields(document) {
@@ -744,7 +629,7 @@ async function markDocxComments(document, archive) {
     const workIds = new Map();
     const ranges = [];
     const comments = [];
-    const starts = descendants(document, 'commentRangeStart').sort(work_docx_comment_import_compareDocumentOrder);
+    const starts = descendants(document, 'commentRangeStart').sort(compareDocumentOrder);
     for (const start of starts){
         const sourceId = work_ooxml_package_attribute(start, 'id')?.trim() ?? '';
         if (!sourceId) continue;
@@ -794,7 +679,7 @@ async function readCommentDefinitions(archive) {
         return {
             sourceId: work_ooxml_package_attribute(comment, 'id')?.trim() ?? '',
             author: work_ooxml_package_attribute(comment, 'author')?.trim() || '未知审阅者',
-            date: work_docx_comment_import_normalizeDate(work_ooxml_package_attribute(comment, 'date')),
+            date: normalizeDate(work_ooxml_package_attribute(comment, 'date')),
             text: commentText(comment),
             paraId,
             parentParaId: metadata?.parentParaId ?? '',
@@ -922,12 +807,12 @@ function uniqueWorkCommentId(base, comments) {
     while(ids.has(`${base}-${suffix}`))suffix += 1;
     return `${base}-${suffix}`;
 }
-function work_docx_comment_import_normalizeDate(value) {
+function normalizeDate(value) {
     if (!value) return '';
     const time = Date.parse(value);
     return Number.isFinite(time) ? new Date(time).toISOString() : '';
 }
-function work_docx_comment_import_compareDocumentOrder(left, right) {
+function compareDocumentOrder(left, right) {
     if (left === right) return 0;
     return left.compareDocumentPosition(right) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1;
 }

package/dist/0~work-office-diagnostics.js

@@ -1,7 +1,7 @@
 import { __webpack_require__ } from "./0~rslib-runtime.js";
 import { contentTypeForPart, directChildren, OoxmlPackage, parseXml, firstDescendant, isDocumentParagraphArtBorderStyle, descendants, directChild, xmlContainsAnyElement, attribute, documentRunBorderIsVisible } from "./6968.js";
 import { normalizeDocumentBookmarkName, docxBookmarkReferenceTarget, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, normalizeDocumentBookmarkNativeId, supportedDocxDocumentFieldInstruction, supportedDocxBookmarkReferenceInstruction, documentCitationTagsFromInstruction, docxDocumentFieldKind, docxDocumentFieldTarget } from "./4174.js";
-import { isSupportedDocxEquationPlacement, inspectDocxPageSize, inspectDocxContentControls, hasInvalidDocxFieldStructure, createDocxTableStyleResolver, inspectDocxRunBorder, inspectDocxEquation, inspectDocxPageMarginSettings, inspectDocxRunShading, supportedDocxIndexField, docxCaptionSequenceKind, inspectDocxPageBorders, docxCaptionBookmark, inspectDocxLegacyTextEffects, inspectDocxPageMargins, inspectDocxPaperSource, createDocxParagraphStyleResolver, inspectDocxRunFonts, supportedDocxTableOfContentsField, docxFieldOccurrences, supportedDocxIndexEntryField, inspectDocxTextBoxes, markDocxParagraphBorders, isSupportedDocxParagraphFormattingChange, docxFieldOccurrenceIsInlineEditable, inspectDocxHiddenText, isSupportedDocxRunFormattingChange, isSupportedDocxNumberingChange, markDocxParagraphShading, docxFieldInstructions } from "./0~3320.js";
+import { isSupportedDocxEquationPlacement, inspectDocxPageSize, inspectDocxContentControls, hasInvalidDocxFieldStructure, createDocxTableStyleResolver, inspectDocxRunBorder, inspectDocxEquation, inspectDocxPageMarginSettings, inspectDocxRunShading, supportedDocxMovePairCount, supportedDocxIndexField, docxCaptionSequenceKind, inspectDocxPageBorders, isSupportedDocxMoveChange, docxCaptionBookmark, inspectDocxLegacyTextEffects, inspectDocxPageMargins, inspectDocxPaperSource, createDocxParagraphStyleResolver, inspectDocxRunFonts, supportedDocxTableOfContentsField, docxFieldOccurrences, supportedDocxIndexEntryField, inspectDocxTextBoxes, markDocxParagraphBorders, isSupportedDocxParagraphFormattingChange, docxFieldOccurrenceIsInlineEditable, inspectDocxHiddenText, isSupportedDocxRunFormattingChange, isSupportedDocxNumberingChange, markDocxParagraphShading, docxFieldInstructions } from "./0~5600.js";
 import { normalizeDocumentHref } from "./0~work-document-links.js";
 import { xmlAttributeLocalName, resolveDocxOpenTypeFeatures, inspectDocxProofingLanguages, readDocxBibliography, inspectDocxEmphasisMark, createDocxThemeResolver, DOCX_WORD_2010_NAMESPACE, inspectDocxNoProof, parseDocxParagraphDefaultCollapsed, readDocxImageTransform, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace, inspectDocxKerningThresholdHalfPoints } from "./0~3534.js";
 import { updateSpreadsheetWorksheetCompatibilitySummary, inspectXlsxPivotTables, isSupportedXlsxChartLegend, isSupportedXlsxChartPlotLayout, xlsxChartNodeUsesStackedGrouping, isSupportedXlsxChartSeriesFormatting, readXlsxFormulaFeaturesFromPackage, inspectXlsxHeaderFooterText, emptySpreadsheetWorksheetCompatibilitySummary, isSupportedXlsxWorksheetImageContentType, MAX_XLSX_WORKSHEET_IMAGE_BYTES, xlsxChartSeriesFormattingShapeProperties, diagnoseXlsxProtection, isEditableXlsxPaperSizeCode, isSupportedXlsxCombinationChartNodes } from "./4166.js";
@@ -2223,6 +2223,14 @@ async function analyzeDocxCompatibility(file, messages, sourcePackage) {
                 ...descendants(document, 'ins'),
                 ...descendants(document, 'del')
             ];
+            const moveFromRevisions = descendants(document, 'moveFrom');
+            const moveToRevisions = descendants(document, 'moveTo');
+            const moveRevisionCount = moveFromRevisions.length + moveToRevisions.length;
+            const supportedMovePairCount = supportedDocxMovePairCount(document);
+            const supportedMoveRevisionCount = [
+                ...moveFromRevisions,
+                ...moveToRevisions
+            ].filter(isSupportedDocxMoveChange).length;
             const runFormattingRevisions = descendants(document, 'rPrChange');
             const paragraphFormattingRevisions = descendants(document, 'pPrChange');
             const numberingRevisions = descendants(document, 'numberingChange');
@@ -2233,14 +2241,17 @@ async function analyzeDocxCompatibility(file, messages, sourcePackage) {
             if (supportedRunFormattingRevisionCount) issues.push(work_office_diagnostics_issue('docx.revisions.formatting', 'Character-formatting revisions', `${supportedRunFormattingRevisionCount} bounded character-formatting revision(s) preserve author, date, current formatting, and prior bold, italic, underline, strike, text case, hidden text, outline, shadow, emboss, imprint, subscript, superscript, font, size, color, highlight, character borders, character shading, character scale, spacing, kerning threshold, emphasis mark, baseline position, grid state, proofing languages, and explicit proofing state. They remain reviewable in Work and round-trip as native w:rPrChange records.`, 'info'));
             if (supportedParagraphFormattingRevisionCount) issues.push(work_office_diagnostics_issue('docx.revisions.paragraph-formatting', 'Paragraph-formatting revisions', `${supportedParagraphFormattingRevisionCount} bounded paragraph-formatting revision(s) preserve author, date, current formatting, and prior alignment, direction, indentation, spacing, pagination, outline, tab-stop, border, shading, and collapsed state. They remain reviewable in Work and round-trip as native w:pPrChange records.`, 'info'));
             if (supportedNumberingRevisionCount) issues.push(work_office_diagnostics_issue('docx.revisions.numbering', 'Numbering revisions', `${supportedNumberingRevisionCount} bounded ordered-list numbering revision(s) preserve author, date, prior start, and common decimal, letter, or Roman formats. Contiguous list-item records remain reviewable as one Work change and round-trip as native w:numberingChange records.`, 'info'));
-            if (textRevisions.some((revision)=>!descendants(revision, 't').length && !descendants(revision, 'delText').length) || supportedRunFormattingRevisionCount !== runFormattingRevisions.length || supportedParagraphFormattingRevisionCount !== paragraphFormattingRevisions.length || supportedNumberingRevisionCount !== numberingRevisions.length || [
-                'moveFrom',
-                'moveTo',
+            if (supportedMovePairCount) issues.push(work_office_diagnostics_issue('docx.revisions.move', 'Move revisions', `${supportedMovePairCount} bounded text move revision(s) preserve author, date, source and destination text, remain reviewable as one atomic Work change, and round-trip as native w:moveFrom and w:moveTo records. Rich content, range markers, and relationship-bound moves remain on the compatibility path.`, 'info'));
+            if (textRevisions.some((revision)=>!descendants(revision, 't').length && !descendants(revision, 'delText').length) || supportedRunFormattingRevisionCount !== runFormattingRevisions.length || supportedParagraphFormattingRevisionCount !== paragraphFormattingRevisions.length || supportedNumberingRevisionCount !== numberingRevisions.length || supportedMoveRevisionCount !== moveRevisionCount || supportedMoveRevisionCount !== 2 * supportedMovePairCount || [
+                'moveFromRangeStart',
+                'moveFromRangeEnd',
+                'moveToRangeStart',
+                'moveToRangeEnd',
                 'tblPrChange',
                 'trPrChange',
                 'tcPrChange',
                 'sectPrChange'
-            ].some((name)=>descendants(document, name).length)) issues.push(work_office_diagnostics_issue('docx.revisions.structural', 'Structural revisions', 'Moved content plus unsupported character formatting, paragraph formatting, numbering, section, row, cell, and table-property revisions may be normalized; Work currently reviews body-text insertions/deletions and bounded character-, paragraph-, and ordered-list-numbering subsets.'));
+            ].some((name)=>descendants(document, name).length)) issues.push(work_office_diagnostics_issue('docx.revisions.structural', 'Structural revisions', 'Moved content plus unsupported character formatting, paragraph formatting, numbering, section, row, cell, and table-property revisions may be normalized; Work currently reviews body-text insertions/deletions and bounded text moves, character-, paragraph-, and ordered-list-numbering subsets.'));
             if (captionDiagnostics.hasUnsupportedFields) issues.push(work_office_diagnostics_issue('docx.fields', 'Fields', 'Fields beyond supported body fields, citations, bibliographies, caption SEQ fields, and bookmark or caption REF fields are converted to their current displayed value.'));
             const sectionProperties = descendants(document, 'sectPr');
             const columnProperties = descendants(document, 'cols');