docxmlater 11.0.10 → 12.0.1

package/dist/elements/Revision.d.ts

@@ -68,6 +68,10 @@ export declare class Revision {
     toXML(): XMLElement | null;
     private isPropertyChangeType;
     private createPropertiesElement;
+    private static readonly PROPERTY_KEY_TO_ELEMENT;
+    private static readonly PROPERTY_CHILD_ORDER;
+    private createPreviousPropertyXml;
+    private createObjectPropertyXml;
     private createDeletedRunXml;
     private createHyperlinkWrappedRevisionXml;
     private convertRunXmlToDeleted;

package/dist/elements/Revision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Revision.d.ts","sourceRoot":"","sources":["../../src/elements/Revision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Revision.d.ts","sourceRoot":"","sources":["../../src/elements/Revision.ts"],"names":[],"mappings":"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"}

package/dist/elements/Revision.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Revision = void 0;
 const Run_js_1 = require("./Run.js");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
 const RevisionContent_js_1 = require("./RevisionContent.js");
 const dateFormatting_js_1 = require("../utils/dateFormatting.js");
 class Revision {
@@ -191,9 +192,6 @@ class Revision {
             'w:author': this.author,
             'w:date': this.formatDate(this.date),
         };
-        if ((this.type === 'moveFrom' || this.type === 'moveTo') && this.moveId) {
-            attributes['w:moveId'] = this.moveId;
-        }
         const elementName = this.getElementName();
         const children = [];
         if (this.isPropertyChangeType()) {
@@ -201,10 +199,50 @@ class Revision {
                 children.push(this.createPropertiesElement());
             }
         }
-        const firstItem = this.content[0];
-        const singleHyperlink = this.content.length === 1 && firstItem && (0, RevisionContent_js_1.isHyperlinkContent)(firstItem) ? firstItem : null;
-        if (singleHyperlink && !this.isPropertyChangeType()) {
-            return this.createHyperlinkWrappedRevisionXml(singleHyperlink, elementName, attributes);
+        if (!this.isPropertyChangeType()) {
+            const segments = [];
+            const segmentAttributes = (segmentIndex) => segmentIndex === 0
+                ? attributes
+                : {
+                    ...attributes,
+                    'w:id': String(500000000 + (this.id % 1000000) * 1000 + segmentIndex),
+                };
+            let pendingRuns = [];
+            const flushRuns = () => {
+                if (pendingRuns.length > 0) {
+                    segments.push({
+                        name: elementName,
+                        attributes: segmentAttributes(segments.length),
+                        children: pendingRuns,
+                    });
+                    pendingRuns = [];
+                }
+            };
+            for (const item of this.content) {
+                if ((0, RevisionContent_js_1.isHyperlinkContent)(item)) {
+                    flushRuns();
+                    segments.push(this.createHyperlinkWrappedRevisionXml(item, elementName, segmentAttributes(segments.length)));
+                }
+                else if ((0, RevisionContent_js_1.isRunContent)(item)) {
+                    if (this.type === 'delete' || this.type === 'moveFrom') {
+                        pendingRuns.push(this.createDeletedRunXml(item));
+                    }
+                    else {
+                        pendingRuns.push(item.toXML());
+                    }
+                }
+            }
+            flushRuns();
+            if (segments.length === 0) {
+                return { name: elementName, attributes, children: [] };
+            }
+            if (segments.length === 1) {
+                return segments[0];
+            }
+            return {
+                name: '__rawXml',
+                rawXml: segments.map((segment) => XMLBuilder_js_1.XMLBuilder.elementToString(segment)).join(''),
+            };
         }
         for (const item of this.content) {
             if ((0, RevisionContent_js_1.isHyperlinkContent)(item)) {
@@ -212,24 +250,13 @@ class Revision {
                 if (hyperlinkXml.children) {
                     for (const child of hyperlinkXml.children) {
                         if (typeof child === 'object' && child.name === 'w:r') {
-                            if (this.type === 'delete' || this.type === 'moveFrom') {
-                                children.push(this.convertRunXmlToDeleted(child));
-                            }
-                            else {
-                                children.push(child);
-                            }
+                            children.push(child);
                         }
                     }
                 }
             }
             else if ((0, RevisionContent_js_1.isRunContent)(item)) {
-                if (this.type === 'delete' || this.type === 'moveFrom') {
-                    const runXml = this.createDeletedRunXml(item);
-                    children.push(runXml);
-                }
-                else {
-                    children.push(item.toXML());
-                }
+                children.push(item.toXML());
             }
         }
         return {
@@ -282,27 +309,340 @@ class Revision {
                 propElementName = 'w:numPr';
                 break;
         }
+        const keyMap = Revision.PROPERTY_KEY_TO_ELEMENT[this.type] ?? {};
         const propChildren = [];
         if (this.previousProperties) {
             for (const [key, value] of Object.entries(this.previousProperties)) {
-                if (typeof value === 'boolean' && value) {
-                    propChildren.push({ name: `w:${key}`, attributes: {}, children: [] });
-                }
-                else if (typeof value === 'string' || typeof value === 'number') {
-                    propChildren.push({
-                        name: `w:${key}`,
-                        attributes: { 'w:val': value.toString() },
-                        children: [],
-                    });
+                const child = this.createPreviousPropertyXml(`w:${keyMap[key] ?? key}`, value);
+                if (child) {
+                    propChildren.push(child);
                 }
             }
         }
+        const order = Revision.PROPERTY_CHILD_ORDER[propElementName];
+        if (order) {
+            const rank = (name) => {
+                const index = order.indexOf(name);
+                return index === -1 ? order.length : index;
+            };
+            propChildren.sort((a, b) => rank(a.name) - rank(b.name));
+        }
         return {
             name: propElementName,
             attributes: {},
             children: propChildren,
         };
     }
+    static PROPERTY_KEY_TO_ELEMENT = {
+        paragraphPropertiesChange: {
+            alignment: 'jc',
+            style: 'pStyle',
+            styleId: 'pStyle',
+            indentation: 'ind',
+            numbering: 'numPr',
+            outlineLevel: 'outlineLvl',
+            shading: 'shd',
+            borders: 'pBdr',
+        },
+        tablePropertiesChange: {
+            alignment: 'jc',
+            style: 'tblStyle',
+            styleId: 'tblStyle',
+            width: 'tblW',
+            indent: 'tblInd',
+            borders: 'tblBorders',
+            shading: 'shd',
+            layout: 'tblLayout',
+            cellMargins: 'tblCellMar',
+            cellSpacing: 'tblCellSpacing',
+        },
+        tableExceptionPropertiesChange: {
+            alignment: 'jc',
+            width: 'tblW',
+            indent: 'tblInd',
+            borders: 'tblBorders',
+            shading: 'shd',
+            layout: 'tblLayout',
+            cellMargins: 'tblCellMar',
+            cellSpacing: 'tblCellSpacing',
+        },
+        tableRowPropertiesChange: {
+            alignment: 'jc',
+            height: 'trHeight',
+            isHeader: 'tblHeader',
+            cellSpacing: 'tblCellSpacing',
+        },
+        tableCellPropertiesChange: {
+            width: 'tcW',
+            borders: 'tcBorders',
+            shading: 'shd',
+            verticalAlignment: 'vAlign',
+            margins: 'tcMar',
+        },
+        sectionPropertiesChange: {
+            pageSize: 'pgSz',
+            margins: 'pgMar',
+            columns: 'cols',
+            pageNumbering: 'pgNumType',
+        },
+    };
+    static PROPERTY_CHILD_ORDER = {
+        'w:pPr': [
+            'w:pStyle',
+            'w:keepNext',
+            'w:keepLines',
+            'w:pageBreakBefore',
+            'w:framePr',
+            'w:widowControl',
+            'w:numPr',
+            'w:suppressLineNumbers',
+            'w:pBdr',
+            'w:shd',
+            'w:tabs',
+            'w:suppressAutoHyphens',
+            'w:kinsoku',
+            'w:wordWrap',
+            'w:overflowPunct',
+            'w:topLinePunct',
+            'w:autoSpaceDE',
+            'w:autoSpaceDN',
+            'w:bidi',
+            'w:adjustRightInd',
+            'w:snapToGrid',
+            'w:spacing',
+            'w:ind',
+            'w:contextualSpacing',
+            'w:mirrorIndents',
+            'w:suppressOverlap',
+            'w:jc',
+            'w:textDirection',
+            'w:textAlignment',
+            'w:textboxTightWrap',
+            'w:outlineLvl',
+        ],
+        'w:tblPr': [
+            'w:tblStyle',
+            'w:tblpPr',
+            'w:tblOverlap',
+            'w:bidiVisual',
+            'w:tblStyleRowBandSize',
+            'w:tblStyleColBandSize',
+            'w:tblW',
+            'w:jc',
+            'w:tblCellSpacing',
+            'w:tblInd',
+            'w:tblBorders',
+            'w:shd',
+            'w:tblLayout',
+            'w:tblCellMar',
+            'w:tblLook',
+            'w:tblCaption',
+            'w:tblDescription',
+        ],
+        'w:tblPrEx': [
+            'w:tblW',
+            'w:jc',
+            'w:tblCellSpacing',
+            'w:tblInd',
+            'w:tblBorders',
+            'w:shd',
+            'w:tblLayout',
+            'w:tblCellMar',
+            'w:tblLook',
+        ],
+        'w:trPr': [
+            'w:cnfStyle',
+            'w:divId',
+            'w:gridBefore',
+            'w:gridAfter',
+            'w:wBefore',
+            'w:wAfter',
+            'w:cantSplit',
+            'w:trHeight',
+            'w:tblHeader',
+            'w:tblCellSpacing',
+            'w:jc',
+            'w:hidden',
+        ],
+        'w:tcPr': [
+            'w:cnfStyle',
+            'w:tcW',
+            'w:gridSpan',
+            'w:hMerge',
+            'w:vMerge',
+            'w:tcBorders',
+            'w:shd',
+            'w:noWrap',
+            'w:tcMar',
+            'w:textDirection',
+            'w:tcFitText',
+            'w:vAlign',
+            'w:hideMark',
+        ],
+        'w:sectPr': [
+            'w:headerReference',
+            'w:footerReference',
+            'w:footnotePr',
+            'w:endnotePr',
+            'w:type',
+            'w:pgSz',
+            'w:pgMar',
+            'w:paperSrc',
+            'w:pgBorders',
+            'w:lnNumType',
+            'w:pgNumType',
+            'w:cols',
+            'w:formProt',
+            'w:vAlign',
+            'w:noEndnote',
+            'w:titlePg',
+            'w:textDirection',
+            'w:bidi',
+            'w:rtlGutter',
+            'w:docGrid',
+        ],
+        'w:numPr': ['w:ilvl', 'w:numId', 'w:numberingChange', 'w:ins'],
+    };
+    createPreviousPropertyXml(name, value) {
+        if (typeof value === 'boolean') {
+            return { name, attributes: value ? {} : { 'w:val': '0' }, children: [] };
+        }
+        if (typeof value === 'string' || typeof value === 'number') {
+            return { name, attributes: { 'w:val': value.toString() }, children: [] };
+        }
+        if (value && typeof value === 'object') {
+            return this.createObjectPropertyXml(name, value);
+        }
+        return null;
+    }
+    createObjectPropertyXml(name, value) {
+        switch (name) {
+            case 'w:spacing':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:before': value.before,
+                        'w:beforeLines': value.beforeLines,
+                        'w:beforeAutospacing': value.beforeAutospacing === undefined
+                            ? undefined
+                            : value.beforeAutospacing
+                                ? '1'
+                                : '0',
+                        'w:after': value.after,
+                        'w:afterLines': value.afterLines,
+                        'w:afterAutospacing': value.afterAutospacing === undefined ? undefined : value.afterAutospacing ? '1' : '0',
+                        'w:line': value.line,
+                        'w:lineRule': value.lineRule,
+                    }),
+                    children: [],
+                };
+            case 'w:ind':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:start': value.start,
+                        'w:end': value.end,
+                        'w:left': value.left,
+                        'w:leftChars': value.leftChars,
+                        'w:right': value.right,
+                        'w:rightChars': value.rightChars,
+                        'w:firstLine': value.firstLine,
+                        'w:firstLineChars': value.firstLineChars,
+                        'w:hanging': value.hanging,
+                        'w:hangingChars': value.hangingChars,
+                    }),
+                    children: [],
+                };
+            case 'w:numPr': {
+                const numPrChildren = [];
+                const level = value.level ?? value.ilvl;
+                const numId = value.numId ?? value.id;
+                if (level !== undefined) {
+                    numPrChildren.push({
+                        name: 'w:ilvl',
+                        attributes: { 'w:val': String(level) },
+                        children: [],
+                    });
+                }
+                if (numId !== undefined) {
+                    numPrChildren.push({
+                        name: 'w:numId',
+                        attributes: { 'w:val': String(numId) },
+                        children: [],
+                    });
+                }
+                return numPrChildren.length > 0 ? { name, attributes: {}, children: numPrChildren } : null;
+            }
+            case 'w:shd':
+                return XMLBuilder_js_1.XMLBuilder.createShading(value);
+            case 'w:pBdr':
+            case 'w:tblBorders':
+            case 'w:tcBorders': {
+                const sides = name === 'w:pBdr'
+                    ? ['top', 'left', 'bottom', 'right', 'between', 'bar']
+                    : ['top', 'left', 'bottom', 'right', 'insideH', 'insideV'];
+                const borderChildren = [];
+                for (const side of sides) {
+                    if (value[side]) {
+                        borderChildren.push(XMLBuilder_js_1.XMLBuilder.createBorder(side, value[side]));
+                    }
+                }
+                return borderChildren.length > 0
+                    ? { name, attributes: {}, children: borderChildren }
+                    : null;
+            }
+            case 'w:tblW':
+            case 'w:tcW':
+            case 'w:tblInd':
+            case 'w:tblCellSpacing':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:w': value.w ?? value.width ?? value.value,
+                        'w:type': value.type ?? 'dxa',
+                    }),
+                    children: [],
+                };
+            case 'w:trHeight':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:val': value.value ?? value.val ?? value.height,
+                        'w:hRule': value.rule ?? value.hRule,
+                    }),
+                    children: [],
+                };
+            case 'w:tcMar':
+            case 'w:tblCellMar':
+                return XMLBuilder_js_1.XMLBuilder.createMargins(name.slice(2), value);
+            case 'w:pgSz':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:w': value.width ?? value.w,
+                        'w:h': value.height ?? value.h,
+                        'w:orient': value.orientation ?? value.orient,
+                    }),
+                    children: [],
+                };
+            case 'w:pgMar':
+                return {
+                    name,
+                    attributes: XMLBuilder_js_1.XMLBuilder.buildAttributes({
+                        'w:top': value.top,
+                        'w:right': value.right,
+                        'w:bottom': value.bottom,
+                        'w:left': value.left,
+                        'w:header': value.header,
+                        'w:footer': value.footer,
+                        'w:gutter': value.gutter,
+                    }),
+                    children: [],
+                };
+            default:
+                return null;
+        }
+    }
     createDeletedRunXml(run) {
         const runXml = run.toXML();
         const deletedTextElement = this.isFieldInstruction ? 'w:delInstrText' : 'w:delText';