@a3s-lab/office 0.48.1 → 0.49.0

package/dist/0~document-editor.js

@@ -1172,6 +1172,7 @@ function documentChangeKindLabel(kind) {
     if ('formatting' === kind) return '格式';
     if ('paragraph-formatting' === kind) return '段落格式';
     if ('numbering' === kind) return '编号格式';
+    if ('move' === kind) return '移动';
     return '删除';
 }
 function documentChangeWindowKey(change) {
@@ -19872,7 +19873,10 @@ function createDocumentPaginationRunCoordinator({ cancelFrame, onAbort, onCoales
     };
 }
 const MAX_DOCUMENT_BLOCK_RESIZE_OBSERVATIONS = 4096;
-function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, page, selectionVersion, wasmUrl, layoutFonts, loadedLayoutFontIds }) {
+function neverComposing() {
+    return false;
+}
+function useDocumentPagination({ compositionRevision = 0, editor, documentRevision, enabled, isComposing = neverComposing, layoutKey, page, selectionVersion, wasmUrl, layoutFonts, loadedLayoutFontIds }) {
     const client = useOfficeKernelClient(wasmUrl, layoutFonts);
     const editorMounted = useEditorMounted(editor);
     const revision = useRef(0);
@@ -20011,6 +20015,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             for (const element of observedElements)observer?.observe(element);
         };
         const run = async (signal)=>{
+            if (isComposing()) return void measurementRange.ensureDirty();
             stopObservingBlocks();
             const nextRevision = ++revision.current;
             editor.commands.clearDocumentPagination(nextRevision);
@@ -20040,7 +20045,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                                 documentRevision,
                                 paragraphs
                             }, signal);
-                            if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed) return;
+                            if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                             textLayoutEngine ||= textLayout.engine;
                             unsupportedTextLayoutCount += textLayout.unsupportedParagraphIds.length + textLayout.layouts.filter((layout)=>layout.missingGlyphCount > 0).length;
                             for (const layout of textLayout.layouts)if (0 === layout.missingGlyphCount) {
@@ -20051,7 +20056,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                         editorDom.dataset.paginationTextEngine = textLayoutEngine;
                         editorDom.dataset.paginationUnsupportedText = String(unsupportedTextLayoutCount);
                     } catch (error) {
-                        if (signal.aborted || error instanceof DOMException && 'AbortError' === error.name) return;
+                        if (signal.aborted || isComposing() || error instanceof DOMException && 'AbortError' === error.name) return;
                         textLayouts.clear();
                         fallbackGlyphCount = 0;
                         editorDom.dataset.paginationTextEngine = 'dom';
@@ -20069,6 +20074,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                 const snapshot = await measureDocumentLayoutBlocksIncrementally(editor, measurementCache.current, measurementStart, textLayouts, 1000000, {
                     signal
                 });
+                if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                 measurementCache.current = snapshot;
                 editorDom.dataset.paginationBlocks = String(snapshot.blocks.length);
                 editorDom.dataset.paginationFlows = String(new Set(snapshot.blocks.flatMap((block)=>block.block.flowId ? [
@@ -20098,7 +20104,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                         pageStyles: snapshot.pageStyles,
                         blocks: layoutPlan.blocks
                     }, signal);
-                    if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed) return;
+                    if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                     const layout = previousPagination && layoutPlan.startPageIndex > 0 ? mergeIncrementalDocumentLayout(previousPagination.layout, partialLayout) : partialLayout;
                     const blockById = new Map(snapshot.blocks.map((block)=>[
                             block.block.id,
@@ -20147,7 +20153,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                     measurementRange.commit(measurementPass);
                     setPagination(nextPagination);
                 } catch (error) {
-                    if (disposed || signal.aborted || error instanceof DOMException && 'AbortError' === error.name) return;
+                    if (disposed || signal.aborted || isComposing() || error instanceof DOMException && 'AbortError' === error.name) return;
                     editorDom.dataset.paginationState = 'error';
                     editorDom.dataset.paginationError = error instanceof Error ? `${error.name}: ${error.message}` : 'UnknownError';
                     editor.commands.clearDocumentPagination(nextRevision);
@@ -20167,7 +20173,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             onCoalescedRequest: ()=>updateDiagnostic('coalescedRequests', 'paginationCoalescedRequests'),
             onError: (error)=>{
                 measurementRange.restoreActive();
-                if (disposed || editor.isDestroyed) return;
+                if (disposed || editor.isDestroyed || isComposing()) return;
                 editorDom.dataset.paginationState = 'error';
                 editorDom.dataset.paginationError = error instanceof Error ? `${error.name}: ${error.message}` : 'UnknownError';
                 paginationCache.current = null;
@@ -20184,6 +20190,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             run
         });
         const schedule = (invalidateActive = false)=>{
+            if (isComposing()) return;
             coordinator.request({
                 invalidateActive
             });
@@ -20200,6 +20207,15 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             markDirty(earliestChangedPosition(transaction));
             schedule(true);
         };
+        const handleCompositionStart = ()=>{
+            measurementRange.ensureDirty();
+            coordinator.request({
+                invalidateActive: true
+            });
+        };
+        const handleCompositionEnd = ()=>{
+            schedule(true);
+        };
         const handleLoadedAsset = (event)=>{
             updateDiagnostic('assetTriggers', 'paginationAssetTriggers');
             const target = event.target;
@@ -20219,6 +20235,8 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         };
         const fonts = document.fonts;
         editor.on('update', handleDocumentUpdate);
+        editorDom.addEventListener('compositionstart', handleCompositionStart);
+        editorDom.addEventListener('compositionend', handleCompositionEnd);
         editorDom.addEventListener('load', handleLoadedAsset, true);
         fonts?.addEventListener('loadingdone', handleFontLoading);
         window.addEventListener('resize', handleWindowResize);
@@ -20227,6 +20245,8 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             disposed = true;
             stopObservingBlocks();
             editor.off('update', handleDocumentUpdate);
+            editorDom.removeEventListener('compositionstart', handleCompositionStart);
+            editorDom.removeEventListener('compositionend', handleCompositionEnd);
             editorDom.removeEventListener('load', handleLoadedAsset, true);
             fonts?.removeEventListener('loadingdone', handleFontLoading);
             window.removeEventListener('resize', handleWindowResize);
@@ -20234,6 +20254,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         };
     }, [
         client,
+        compositionRevision,
         documentRevision,
         editor,
         editorMounted,
@@ -20243,6 +20264,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         layoutFonts,
         loadedLayoutFontKey,
         loadedLayoutFontIds,
+        isComposing,
         pageKey
     ]);
     const resolveFieldContext = useMemo(()=>pagination ? createDocumentFieldPaginationContextResolver(pagination) : null, [
@@ -20929,12 +20951,24 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
             },
             handleDOMEvents: {
                 compositionstart: ()=>{
-                    composition.start();
+                    composition.start(editorRef.current);
+                    return false;
+                },
+                compositionupdate: ()=>{
+                    composition.start(editorRef.current);
                     return false;
                 },
-                compositionend: ()=>{
+                beforeinput: (_view, event)=>{
+                    composition.noteInput(event);
+                    return false;
+                },
+                input: (_view, event)=>{
+                    composition.noteInput(event);
+                    return false;
+                },
+                compositionend: (_view, event)=>{
                     const current = editorRef.current;
-                    if (current) composition.end(current, (settled)=>settleCompositionRef.current(settled));
+                    if (current) composition.end(current, event.data ?? null, (settled, snapshot)=>settleCompositionRef.current(settled, snapshot));
                     return false;
                 }
             }
@@ -21010,7 +21044,20 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
         publishDocumentUpdate,
         queueLazyDocumentPublication
     ]);
-    settleCompositionRef.current = (current)=>{
+    settleCompositionRef.current = (current, snapshot)=>{
+        if (null !== snapshot.text && snapshot.range && !current.isDestroyed) {
+            const maximum = current.state.doc.content.size;
+            const from = Math.max(0, Math.min(maximum, snapshot.range.from));
+            const to = Math.max(0, Math.min(maximum, snapshot.range.to));
+            const start = Math.min(from, to);
+            const end = Math.max(from, to);
+            const currentText = current.state.doc.textBetween(start, end, '\n', '\n');
+            if (currentText !== snapshot.text) {
+                if (trackChangesRef.current) current.commands.replaceDocumentTextWithTrackedChange(start, end, snapshot.text);
+                else current.view.dispatch(current.state.tr.insertText(snapshot.text, start, end).setMeta('composition', snapshot.id).setMeta('uiEvent', 'input'));
+                current.view.dom.dataset.documentCompositionNormalized = 'true';
+            }
+        }
         const pending = pendingLazyPublicationRef.current;
         if (pending) {
             pending.cancel();
@@ -21065,6 +21112,8 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
             composition.destroy();
         },
         onTransaction: ({ appendedTransactions, editor: current, transaction })=>{
+            composition.recordTransaction(transaction);
+            for (const appended of appendedTransactions ?? [])composition.recordTransaction(appended);
             if (documentTransactionsOnlyHydrateChunks([
                 transaction,
                 ...appendedTransactions
@@ -21429,10 +21478,16 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
         JSON.stringify(layout.pageMargins),
         layout.pageSize
     ]);
+    const documentCompositionIsActive = useCallback(()=>composition.isBlocking(editor), [
+        composition,
+        editor
+    ]);
     const pagination = useDocumentPagination({
+        compositionRevision,
         editor,
         documentRevision: editorInput.revision,
         enabled: Boolean(editor && 'page' === viewMode),
+        isComposing: documentCompositionIsActive,
         layoutKey: [
             layout.breakAfter,
             layout.columns.count,

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;
 }