devexpress-richedit 24.1.6-build-24232-0102 → 24.2.1-alpha-24260-0102

package/lib/common/formats/html/import/html-importer.js

@@ -68,6 +68,18 @@ export class HtmlImportData {
     }
 }
 export class HtmlImporter {
+    get currElement() { return ListUtils.last(this.levelInfo).element; }
+    ;
+    get currElementChildren() { return ListUtils.last(this.levelInfo).childElements; }
+    ;
+    get prevLevelInfo() { return this.levelInfo[this.levelInfo.length - 2]; }
+    get currLevelInfo() { return ListUtils.last(this.levelInfo); }
+    get currListItemLevelInfo() { return ListUtils.reverseElementBy(this.levelInfo, (levelInfo) => { var _a; return ((_a = levelInfo.tagImporter) === null || _a === void 0 ? void 0 : _a.elementTag()) === 'LI'; }); }
+    get currListInfo() {
+        const currListItemLevelInfo = this.currListItemLevelInfo;
+        return currListItemLevelInfo && !currListItemLevelInfo.tagImporter.paragraphWasAddedBefore ? ListUtils.last(this.listInfos) : null;
+    }
+    get subDocument() { return this.subDocPosition.subDocument; }
     constructor(modelManager, measurer, subDocPosition, initElements, charPropsBundle, formatImagesImporter) {
         this.fieldsId = 0;
         this.listIndex = 0;
@@ -119,18 +131,6 @@ export class HtmlImporter {
         for (let importerConst of HtmlImporter.importers)
             this.tagImporters[new importerConst(this).elementTag()] = importerConst;
     }
-    get currElement() { return ListUtils.last(this.levelInfo).element; }
-    ;
-    get currElementChildren() { return ListUtils.last(this.levelInfo).childElements; }
-    ;
-    get prevLevelInfo() { return this.levelInfo[this.levelInfo.length - 2]; }
-    get currLevelInfo() { return ListUtils.last(this.levelInfo); }
-    get currListItemLevelInfo() { return ListUtils.reverseElementBy(this.levelInfo, (levelInfo) => { var _a; return ((_a = levelInfo.tagImporter) === null || _a === void 0 ? void 0 : _a.elementTag()) === 'LI'; }); }
-    get currListInfo() {
-        const currListItemLevelInfo = this.currListItemLevelInfo;
-        return currListItemLevelInfo && !currListItemLevelInfo.tagImporter.paragraphWasAddedBefore ? ListUtils.last(this.listInfos) : null;
-    }
-    get subDocument() { return this.subDocPosition.subDocument; }
     import() {
         this.importStarted = false;
         this.importedRunsInfo = [];

package/lib/common/formats/html/import/html-model-inserter.js

@@ -11,6 +11,10 @@ import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { PasteHtmlDataHistoryItem } from '../model/history/paste-html-data-history-item';
 export class HtmlModelInserter {
+    get options() { return this.modelManager.richOptions.control; }
+    ;
+    get subDocument() { return this.subDocPos.subDocument; }
+    ;
     constructor(modelManager, subDocPos, htmlData, charPropsBundle) {
         this.pastedListsIndices = {};
         this.fieldsMap = {};
@@ -38,10 +42,6 @@ export class HtmlModelInserter {
             HtmlModelInserter.runConverterMap[RunType.FieldResultEndRun] = this.convertFieldResultEndRun;
         }
     }
-    get options() { return this.modelManager.richOptions.control; }
-    ;
-    get subDocument() { return this.subDocPos.subDocument; }
-    ;
     insert() {
         for (let runInfo of this.htmlData.runsInfo)
             this.position += HtmlModelInserter.runConverterMap[runInfo.runType].call(this, runInfo);

package/lib/common/formats/html/import/importers/base.js

@@ -1,11 +1,11 @@
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class HtmlTagImporterBase {
+    get colorProvider() { return this.importer.modelManager.model.colorProvider; }
     constructor(importer) {
         this.enablePreserveLineBreaks = false;
         this.paragraphWasAddedBefore = false;
         this.importer = importer;
     }
-    get colorProvider() { return this.importer.modelManager.model.colorProvider; }
     getClosestImporterByTagName(tagName) {
         return ListUtils.reverseElementBy(this.importer.levelInfo, (levelInfo) => levelInfo.tagImporter.elementTag() == tagName).tagImporter;
     }

package/lib/common/formats/html/import/utils/character-properties-utils.js

@@ -9,16 +9,16 @@ import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { LoadFontInfo } from '../load-font-info';
 import { HtmlImporterFontUtils } from './font-utils';
 export class HtmlImporterMaskedCharacterProperties {
+    get model() { return this.importer.modelManager.model; }
+    ;
+    get controlOptions() { return this.importer.modelManager.richOptions.control; }
+    ;
     constructor(importer, loadFontInfos, tempFontInfoCache, allowCreateNewFonts) {
         this.importer = importer;
         this.loadFontInfos = loadFontInfos;
         this.tempFontInfoCache = tempFontInfoCache;
         this.allowCreateNewFonts = allowCreateNewFonts;
     }
-    get model() { return this.importer.modelManager.model; }
-    ;
-    get controlOptions() { return this.importer.modelManager.richOptions.control; }
-    ;
     getBundleFrom(element, interval) {
         return new MaskedCharacterPropertiesBundle(this.import(element, interval, this.importer.charPropsBundle.props), this.importer.charPropsBundle.style);
     }

package/lib/common/formats/i-document-importer.d.ts

@@ -1,8 +1,8 @@
 import { DocumentModel, IModelOptions } from '../model/document-model';
 import { DocumentImporterErrors } from './document-importer-errors';
 import { FormatImagesImporter } from './utils/images-import';
-export declare type FormatImportCallback = (model: DocumentModel, formatImagesImporter: FormatImagesImporter) => void;
-export declare type FormatImportReject = (reason: DocumentImporterErrors) => void;
+export type FormatImportCallback = (model: DocumentModel, formatImagesImporter: FormatImagesImporter) => void;
+export type FormatImportReject = (reason: DocumentImporterErrors) => void;
 export interface IDocumentImporter {
     importFromFile(blob: Blob, modelOptions: IModelOptions, callback: FormatImportCallback, reject: FormatImportReject): void;
 }

package/lib/common/formats/pdf/exporter.js

@@ -7,9 +7,6 @@ import { afterFontsLoaded, fontWebApiAvailable } from '@devexpress/utils/lib/uti
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { PdfLayoutPageExporter } from './page-exporter';
 export class PdfExporter {
-    constructor(docProcessor) {
-        this.docProcessor = docProcessor;
-    }
     get layoutFormatterManager() {
         return this.docProcessor.layoutFormatterManager;
     }
@@ -25,6 +22,9 @@ export class PdfExporter {
     get fontsSettings() {
         return this.docProcessor.modelManager.richOptions.fonts;
     }
+    constructor(docProcessor) {
+        this.docProcessor = docProcessor;
+    }
     export(callback, options) {
         const modifyPdfDocument = typeof options == 'function' ? options :
             (!options || !options.modifyPdfDocument ? () => { } : options.modifyPdfDocument);

package/lib/common/formats/pdf/interfaces.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare type IPdfKitColorValue = string | [number, number, number] | [number, number, number, number];
+export type IPdfKitColorValue = string | [number, number, number] | [number, number, number, number];
 export interface IPdfKitDocument {
     pipe(stream: any): void;
     registerFont(font: string, source: ArrayBuffer, fontFamily: string): IPdfKitDocument;
@@ -31,7 +31,7 @@ export interface IPdfKitDocument {
     fillOpacity(opacity: number): IPdfKitDocument;
     fill(rule: IPdfKitRuleValue): IPdfKitDocument;
 }
-export declare type IPdfKitRuleValue = 'even-odd' | 'evenodd' | 'non-zero' | 'nonzero';
+export type IPdfKitRuleValue = 'even-odd' | 'evenodd' | 'non-zero' | 'nonzero';
 export interface IPdfKitPageOptions {
     size?: [number, number] | string;
     margin?: number;

package/lib/common/formats/rtf/export/exporter.js

@@ -10,6 +10,7 @@ import { RtfExportSR } from '../translation-table/rtf-export-sr';
 import { RtfContentExporter } from './exporters/rtf-content-exporter';
 import { RtfExportHelper } from './helpers/rtf-export-helper';
 export class RtfExporter {
+    get documentModel() { return this.modelManipulator.model; }
     constructor(modelManipulator, options) {
         this.modelManipulator = modelManipulator;
         this.options = options;
@@ -17,7 +18,6 @@ export class RtfExporter {
         this.contentExporter = new RtfContentExporter(this.documentModel, options, this.rtfExportHelper);
         this.rtfBuilder = this.contentExporter.createRtfBuilder();
     }
-    get documentModel() { return this.modelManipulator.model; }
     exportToBlob(callback) {
         this.modelManipulator.picture.loader.ensureAllPicturesLoaded(this.options.ensurePictureLoadedTimeout, (_loaded) => {
             callback(new Blob([this.exportAsString()], { type: 'application/rtf' }));

package/lib/common/formats/rtf/export/exporters/rtf-anchored-picture-run-exporter.js

@@ -1,17 +1,17 @@
 import { RtfFloatingObjectPictureExportStrategy } from './picture/rtf-floating-object-picture-export-strategy';
 import { RtfAnchoredRunExporter } from './rtf-anchored-run-exporter';
 export class RtfAnchoredPictureRunExporter extends RtfAnchoredRunExporter {
-    constructor(rtfBuilder, pictureRun, imageCache) {
-        super(rtfBuilder, pictureRun.anchorInfo, pictureRun.shape, pictureRun.size, pictureRun.info.containerProperties);
-        this.pictureRun = pictureRun;
-        this.imageCache = imageCache;
-    }
     getWidth() {
         return this.size.actualSize.width;
     }
     getHeight() {
         return this.size.actualSize.height;
     }
+    constructor(rtfBuilder, pictureRun, imageCache) {
+        super(rtfBuilder, pictureRun.anchorInfo, pictureRun.shape, pictureRun.size, pictureRun.info.containerProperties);
+        this.pictureRun = pictureRun;
+        this.imageCache = imageCache;
+    }
     exportContent() {
         const exportStrategy = new RtfFloatingObjectPictureExportStrategy();
         exportStrategy.export(this.rtfBuilder, this.pictureRun.info, this.imageCache, this.pictureRun.info.containerProperties);

package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.d.ts

@@ -15,7 +15,7 @@ import { DocumentPropertyNames, RtfDocumentExporterOptions } from '../rtf-docume
 import { RtfCharacterPropertiesExporter } from './rtf-character-properties-exporter';
 import { RtfParagraphPropertiesExporter } from './rtf-paragraph-properties-exporter';
 import { RtfSectionPropertiesExporter } from './rtf-section-properties-exporter';
-export declare type RunHandler = (run: RunBase, runText: string, absolutePosition: number) => void;
+export type RunHandler = (run: RunBase, runText: string, absolutePosition: number) => void;
 export declare class RtfContentExporter {
     documentModel: DocumentModel;
     subDocument: SubDocument;

package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.js

@@ -35,6 +35,8 @@ import { RtfSectionPropertiesExporter } from './rtf-section-properties-exporter'
 import { RtfStyleExporter } from './rtf-style-exporter';
 import { RtfTableExporter } from './table/rtf-table-exporter';
 export class RtfContentExporter {
+    get shouldExportHiddenText() { return true; }
+    ;
     constructor(documentModel, options, rtfExportHelper) {
         this.shouldFourceUpdateIterators = false;
         this.documentModel = documentModel;
@@ -57,8 +59,6 @@ export class RtfContentExporter {
             .add(RunType.AnchoredTextBoxRun, this.anchoredTextBoxRunHandler)
             .get();
     }
-    get shouldExportHiddenText() { return true; }
-    ;
     createRtfBuilder() {
         return new RtfBuilder();
     }

package/lib/common/formats/rtf/export/rtf-builder.d.ts

@@ -1,7 +1,7 @@
 import { ChunkedText } from '@devexpress/utils/lib/class/chunked-text';
 import { NonVisualDrawingObjectInfo } from '../../../model/manipulators/picture-manipulator/non-visual-drawing-object-info';
-declare type SpecialMarksTable = Record<string, string>;
-declare type Action = () => void;
+type SpecialMarksTable = Record<string, string>;
+type Action = () => void;
 export declare class RtfBuilder {
     static readonly specialMarks: SpecialMarksTable;
     static readonly byteToHexString: string[];

package/lib/common/formats/rtf/import/destination/base/destination.d.ts

@@ -2,10 +2,10 @@ import { SubDocument } from '../../../../../model/sub-document';
 import { RtfFormattingInfo } from '../../model/character/rtf-formatting-info';
 import { RtfImportData } from '../../rtf-import-data';
 import { DestinationType } from '../utils/destination-type';
-export declare type TranslateControlCharHandler = (importer: RtfImportData, ch: string) => void;
-export declare type ControlCharTranslatorTable = Record<string, TranslateControlCharHandler>;
-export declare type TranslateKeywordHandler = (importer: RtfImportData, parameterValue: number, hasParameter: boolean) => void;
-export declare type KeywordTranslatorTable = Record<string, TranslateKeywordHandler>;
+export type TranslateControlCharHandler = (importer: RtfImportData, ch: string) => void;
+export type ControlCharTranslatorTable = Record<string, TranslateControlCharHandler>;
+export type TranslateKeywordHandler = (importer: RtfImportData, parameterValue: number, hasParameter: boolean) => void;
+export type KeywordTranslatorTable = Record<string, TranslateKeywordHandler>;
 export declare abstract class DestinationBase {
     static readonly macCodePage: number;
     static readonly pcCodePage: number;

package/lib/common/formats/rtf/import/destination/base/destination.js

@@ -4,6 +4,7 @@ import { RtfFormattingInfo } from '../../model/character/rtf-formatting-info';
 import { RtfParsingState } from '../../model/enums';
 import { DestinationType } from '../utils/destination-type';
 export class DestinationBase {
+    static get empty() { return EmptyDestination._empty; }
     constructor(importer) {
         if (importer) {
             this.importer = importer;
@@ -13,7 +14,6 @@ export class DestinationBase {
             importer.importers.character.characterFormatting.rtfFormattingInfo = rtfFormattingInfo;
         }
     }
-    static get empty() { return EmptyDestination._empty; }
     createRtfFormattingInfo() {
         return new RtfFormattingInfo();
     }

package/lib/common/formats/rtf/import/destination/base/skip-destination.js

@@ -2,15 +2,15 @@ import { SkipCharacterDecoder } from '../../encoding/skip-character-decoder';
 import { DestinationType } from '../utils/destination-type';
 import { DestinationBase } from './destination';
 export class SkipDestination extends DestinationBase {
+    get destinationType() { return DestinationType.SkipDestination; }
+    get controlCharHT() { return null; }
+    ;
     constructor(importer) {
         super(importer);
         const formInfo = this.importer.importers.character.characterFormatting.rtfFormattingInfo;
         this.oldDecoder = formInfo.activeDecoder;
         formInfo.activeDecoder = new SkipCharacterDecoder();
     }
-    get destinationType() { return DestinationType.SkipDestination; }
-    get controlCharHT() { return null; }
-    ;
     beforePopRtfState() {
         this.importer.importers.character.characterFormatting.rtfFormattingInfo.activeDecoder = this.oldDecoder;
         super.beforePopRtfState();

package/lib/common/formats/rtf/import/destination/base/string-property-base-destination.js

@@ -3,13 +3,13 @@ import { StringUtils } from '@devexpress/utils/lib/utils/string';
 import { DestinationType } from '../utils/destination-type';
 import { DestinationBase } from './destination';
 export class StringPropertyBaseDestination extends DestinationBase {
+    get destinationType() { return DestinationType.StringPropertyBaseDestination; }
+    get controlCharHT() { return StringPropertyBaseDestination.controlCharHT; }
     constructor(importer, modifier) {
         super(importer);
         this.value = [];
         this.modifier = modifier;
     }
-    get destinationType() { return DestinationType.StringPropertyBaseDestination; }
-    get controlCharHT() { return StringPropertyBaseDestination.controlCharHT; }
     processCharCore(ch) {
         this.value.push(ch);
     }

package/lib/common/formats/rtf/import/destination/base/string-property-destination.js

@@ -3,12 +3,12 @@ import { StringUtils } from '@devexpress/utils/lib/utils/string';
 import { DestinationType } from '../utils/destination-type';
 import { UnicodeStringValueDestination } from './unicode-string-value-destination';
 export class StringPropertyDestination extends UnicodeStringValueDestination {
+    get destinationType() { return DestinationType.StringPropertyDestination; }
+    get controlCharHT() { return StringPropertyDestination.controlCharHT; }
     constructor(importer, setProperty) {
         super(importer);
         this.setProperty = setProperty;
     }
-    get destinationType() { return DestinationType.StringPropertyDestination; }
-    get controlCharHT() { return StringPropertyDestination.controlCharHT; }
     createEmptyClone() {
         return new StringPropertyDestination(this.importer, this.setProperty);
     }

package/lib/common/formats/rtf/import/destination/base/unicode-destination.js

@@ -1,12 +1,12 @@
 import { DestinationType } from '../utils/destination-type';
 import { DestinationBase } from './destination';
 export class UnicodeDestination extends DestinationBase {
+    get destinationType() { return DestinationType.UnicodeDestination; }
+    get controlCharHT() { return null; }
     constructor(importer, lastDestination) {
         super(importer);
         this.lastDestination = lastDestination;
     }
-    get destinationType() { return DestinationType.UnicodeDestination; }
-    get controlCharHT() { return null; }
     createClone() {
         return new UnicodeDestination(this.importer, this.lastDestination);
     }

package/lib/common/formats/rtf/import/destination/fields/field-sub-destination.js

@@ -1,11 +1,11 @@
 import { DefaultDestination } from '../sub-document/default-destination';
 import { DestinationType } from '../utils/destination-type';
 export class FieldSubDestination extends DefaultDestination {
+    get destinationType() { return DestinationType.FieldSubDestination; }
     constructor(importer) {
         super(importer, importer.subDocument);
         this.nestedGroupLevel = 1;
     }
-    get destinationType() { return DestinationType.FieldSubDestination; }
     createClone() {
         const clone = this.createInstance();
         clone.nestedGroupLevel = this.nestedGroupLevel;

package/lib/common/formats/rtf/import/destination/fields/table-content-field-destination.js

@@ -2,13 +2,13 @@ import { DestinationType } from '../utils/destination-type';
 import { TCFieldState } from './enums';
 import { FieldSubDestination } from './field-sub-destination';
 export class TableContentFieldDestination extends FieldSubDestination {
+    get destinationType() { return DestinationType.TableContentFieldDestination; }
     constructor(importer, createField) {
         super(importer);
         if (!createField)
             return;
         this.insertTextCore(TableContentFieldDestination.tcFieldName);
     }
-    get destinationType() { return DestinationType.TableContentFieldDestination; }
     tableOfContentsEntryLevelNumberKeyword(parameterValue, hasParameter) {
         this.closeQuotes();
         super.tableOfContentsEntryLevelNumberKeyword(parameterValue, hasParameter);

package/lib/common/formats/rtf/import/destination/font-table-destination.js

@@ -3,15 +3,15 @@ import { RtfFontInfo } from '../model/character/rtf-font-info';
 import { DestinationBase } from './base/destination';
 import { DestinationType } from './utils/destination-type';
 export class FontTableDestination extends DestinationBase {
+    get destinationType() { return DestinationType.FontTableDestination; }
+    get controlCharHT() { return null; }
+    get keywordHT() { return null; }
     constructor(importer, nestedState = false) {
         super(importer);
         this.nestedState = nestedState;
         this.fontInfo = new RtfFontInfo();
         this.emptyFontInfo = true;
     }
-    get destinationType() { return DestinationType.FontTableDestination; }
-    get controlCharHT() { return null; }
-    get keywordHT() { return null; }
     processKeywordCore(keyword, parameterValue, hasParameter) {
         if (!hasParameter)
             parameterValue = 0;

package/lib/common/formats/rtf/import/destination/numbering-list/destination-old-paragraph-numbering.js

@@ -8,6 +8,7 @@ import { RtfOldListLevelInfo } from '../../model/numbering-lists/rtf-old-list-le
 import { DestinationType } from '../utils/destination-type';
 import { DestinationOldParagraphNumberingBase } from './destination-old-paragraph-numbering-base';
 export class DestinationOldParagraphNumbering extends DestinationOldParagraphNumberingBase {
+    get destinationType() { return DestinationType.DestinationOldParagraphNumbering; }
     constructor(importer) {
         super(importer);
         this.oldLevelNumber = -1;
@@ -17,7 +18,6 @@ export class DestinationOldParagraphNumbering extends DestinationOldParagraphNum
         this.multiLevelListIndex = NumberingListIndexConstants.listIndexNotSetted;
         this.simpleListIndex = NumberingListIndexConstants.listIndexNotSetted;
     }
-    get destinationType() { return DestinationType.DestinationOldParagraphNumbering; }
     static onParagraphLevelKeyword(importer, parameterValue, hasParameter) {
         if (hasParameter && parameterValue == 10) {
             DestinationOldParagraphNumbering.onSimpleNumberingKeyword(importer, 0, false);

package/lib/common/formats/rtf/import/destination/numbering-list/destination-old-section-numbering-level.js

@@ -2,12 +2,12 @@ import { RtfOldListLevelInfo } from '../../model/numbering-lists/rtf-old-list-le
 import { DestinationType } from '../utils/destination-type';
 import { DestinationOldParagraphNumberingBase } from './destination-old-paragraph-numbering-base';
 export class DestinationOldSectionNumberingLevel extends DestinationOldParagraphNumberingBase {
+    get destinationType() { return DestinationType.DestinationOldSectionNumberingLevel; }
     constructor(importer, levelNumber) {
         super(importer);
         importer.importers.numbering.oldListLevelInfo = new RtfOldListLevelInfo();
         this.levelNumber = levelNumber;
     }
-    get destinationType() { return DestinationType.DestinationOldSectionNumberingLevel; }
     createClone() {
         const result = new DestinationOldSectionNumberingLevel(this.importer, this.levelNumber);
         return result;

package/lib/common/formats/rtf/import/destination/picture/picture-destination.js

@@ -12,16 +12,16 @@ import { PictureSourceType } from '../utils/enums';
 import { RtfHundredthsOfMillimeterConverter, RtfPixelsToTwipsConverter } from './picture-units-converter';
 import { SkipDestination } from '../base/skip-destination';
 export class PictureDestination extends HexContentDestination {
+    get destinationType() { return DestinationType.PictureDestination; }
+    ;
+    get controlCharHT() { return null; }
+    ;
     constructor(importer) {
         super(importer);
         this.info = new PictureDestinationInfo();
         this.oldDecoder = this.importer.importers.character.characterFormatting.rtfFormattingInfo.activeDecoder;
         this.importer.importers.character.characterFormatting.rtfFormattingInfo.activeDecoder = new EmptyCharacterDecoder();
     }
-    get destinationType() { return DestinationType.PictureDestination; }
-    ;
-    get controlCharHT() { return null; }
-    ;
     static getThis(rtfImporter) {
         return rtfImporter.destination;
     }

package/lib/common/formats/rtf/import/destination/shape/shape-properties-destination-base.js

@@ -12,12 +12,12 @@ import { DrawingObjectHorizontalPositionType, DrawingObjectVerticalPositionType
 import { ShapePropertyDestination } from './shape-property-destination';
 import { ShapeTextDestination } from './shape-text-destination';
 export class ShapePropertiesDestinationBase extends DestinationBase {
+    get destinationType() { return DestinationType.ShapePropertiesDestinationBase; }
+    get controlCharHT() { return null; }
     constructor(importer, shapeProperties = new RtfShapePropertiesInfo()) {
         super(importer);
         this.shapeProperties = shapeProperties;
     }
-    get destinationType() { return DestinationType.ShapePropertiesDestinationBase; }
-    get controlCharHT() { return null; }
     static getThis(rtfImporter) {
         return rtfImporter.destination;
     }

package/lib/common/formats/rtf/import/destination/shape/shape-property-destination.js

@@ -5,12 +5,12 @@ import { ShapePropertyHsvValueDestination } from './shape-property-hsv-value-des
 import { ShapePropertyNameDestination } from './shape-property-name-destination';
 import { ShapePropertyValueDestination } from './shape-property-value-destination';
 export class ShapePropertyDestination extends DestinationBase {
+    get destinationType() { return DestinationType.ShapePropertyDestination; }
+    get controlCharHT() { return null; }
     constructor(rtfImporter, properties) {
         super(rtfImporter);
         this.properties = properties;
     }
-    get destinationType() { return DestinationType.ShapePropertyDestination; }
-    get controlCharHT() { return null; }
     processControlCharCore(_ch) { }
     processKeywordCore(keyword, parameterValue, hasParameter) {
         const translator = this.keywordHT[keyword];

package/lib/common/formats/rtf/import/destination/shape/shape-property-hsv-value-destination.js

@@ -3,12 +3,12 @@ import { HsvInfo } from '../../model/color-collections';
 import { DestinationBase } from '../base/destination';
 import { DestinationType } from '../utils/destination-type';
 export class ShapePropertyHsvValueDestination extends DestinationBase {
+    get destinationType() { return DestinationType.ShapePropertyHsvValueDestination; }
+    get controlCharHT() { return null; }
     constructor(importer, hsvInfo = new HsvInfo()) {
         super(importer);
         this.hsvInfo = hsvInfo;
     }
-    get destinationType() { return DestinationType.ShapePropertyHsvValueDestination; }
-    get controlCharHT() { return null; }
     static getThis(importer) {
         return importer.destination;
     }

package/lib/common/formats/rtf/import/destination/styles/character-style-destination.js

@@ -4,11 +4,6 @@ import { DestinationSubDocument } from '../sub-document/destination-sub-document
 import { DestinationType } from '../utils/destination-type';
 import { StyleSheetDestination } from './style-sheet-destination';
 export class CharacterStyleDestination extends DestinationSubDocument {
-    constructor(importer, styleIndex) {
-        super(importer, importer.subDocument);
-        importer.importers.style.character.rtfStyleIndex = styleIndex;
-        this.styleName = '';
-    }
     get destinationType() { return DestinationType.CharacterStyleDestination; }
     get controlCharHT() { return null; }
     static onParentStyleIndex(importer, parameterValue, _hasParameter) {
@@ -21,6 +16,11 @@ export class CharacterStyleDestination extends DestinationSubDocument {
         importer.destination.qFormat = true;
         importer.importers.style.character.rtfParentStyleIndex = parameterValue;
     }
+    constructor(importer, styleIndex) {
+        super(importer, importer.subDocument);
+        importer.importers.style.character.rtfStyleIndex = styleIndex;
+        this.styleName = '';
+    }
     get canAppendText() {
         return false;
     }

package/lib/common/formats/rtf/import/destination/styles/style-sheet-destination.js

@@ -8,14 +8,14 @@ import { DestinationType } from '../utils/destination-type';
 import { CharacterStyleDestination } from './character-style-destination';
 import { TableStyleDestination } from './table-style-destination';
 export class StyleSheetDestination extends DestinationSubDocument {
+    get destinationType() { return DestinationType.StyleSheetDestination; }
+    get controlCharHT() { return null; }
+    get canAppendText() { return false; }
     constructor(importer) {
         super(importer, importer.subDocument);
         this.styleName = "";
         importer.rtfDocumentModelType = RtfDocumentModelType.WithStyle;
     }
-    get destinationType() { return DestinationType.StyleSheetDestination; }
-    get controlCharHT() { return null; }
-    get canAppendText() { return false; }
     static onStyleQFormatKeyword(importer, _parameterValue, _hasParameter) {
         importer.destination.qFormat = true;
     }

package/lib/common/formats/rtf/import/destination/styles/table-style-destination.js

@@ -9,13 +9,6 @@ import { RtfTableRowPropertiesMerger } from '../../../utils/mergers/rtf-table-ro
 import { DestinationSubDocument } from '../sub-document/destination-sub-document';
 import { DestinationType } from '../utils/destination-type';
 export class TableStyleDestination extends DestinationSubDocument {
-    constructor(importer, styleIndex) {
-        super(importer, importer.subDocument);
-        this.conditionalTableStyleFormattingType = ConditionalTableStyleFormatting.WholeTable;
-        this.styleName = '';
-        this.rtfStyleIndex = styleIndex;
-        this.importer.importers.character.characterFormatting.coreProperties.setUseValue(CharacterPropertiesMask.UseAll, false);
-    }
     get destinationType() { return DestinationType.TableStyleDestination; }
     get controlCharHT() { return null; }
     static onStyleQFormatKeyword(importer, _parameterValue, _hasParameter) {
@@ -69,6 +62,13 @@ export class TableStyleDestination extends DestinationSubDocument {
     get rtfStyleIndex() { return this.importer.importers.style.table.rtfStyleIndex; }
     set rtfStyleIndex(value) { this.importer.importers.style.table.rtfStyleIndex = value; }
     get rtfParentStyleIndex() { return this.importer.importers.style.table.rtfParentStyleIndex; }
+    constructor(importer, styleIndex) {
+        super(importer, importer.subDocument);
+        this.conditionalTableStyleFormattingType = ConditionalTableStyleFormatting.WholeTable;
+        this.styleName = '';
+        this.rtfStyleIndex = styleIndex;
+        this.importer.importers.character.characterFormatting.coreProperties.setUseValue(CharacterPropertiesMask.UseAll, false);
+    }
     beforePopRtfState() {
         const name = this.styleName.trim();
         let style = null;

package/lib/common/formats/rtf/import/destination/sub-document/destination-sub-document.js

@@ -32,12 +32,12 @@ import { DestinationType } from '../utils/destination-type';
 import { ParagraphFrameHorizontalPositionType, ParagraphFrameTextWrapType, ParagraphFrameVerticalPositionType } from '../utils/enums';
 import { TableCellPropertyDescriptor } from '../../../../../model/tables/properties/table-cell-properties';
 export class DestinationSubDocument extends DestinationBase {
+    get destinationType() { return DestinationType.DestinationSubDocument; }
+    get controlCharHT() { return DestinationSubDocument.controlCharHT; }
     constructor(importer, targetSubDocument) {
         super(importer);
         this.subDocument = targetSubDocument;
     }
-    get destinationType() { return DestinationType.DestinationSubDocument; }
-    get controlCharHT() { return DestinationSubDocument.controlCharHT; }
     get canAppendText() { return true; }
     canProcessSpecialHexChar() { return true; }
     get documentModel() { return this.subDocument.documentModel; }

package/lib/common/formats/rtf/import/destination/sub-document/section-header-footer-destination-base.js

@@ -1,9 +1,9 @@
 import { DestinationType } from '../utils/destination-type';
 import { DestinationSubDocument } from './destination-sub-document';
 export class SectionHeaderFooterDestinationBase extends DestinationSubDocument {
+    get destinationType() { return DestinationType.SectionHeaderFooterDestinationBase; }
     constructor(importer, section, subDocument) {
         super(importer, subDocument);
         this.section = section;
     }
-    get destinationType() { return DestinationType.SectionHeaderFooterDestinationBase; }
 }

package/lib/common/formats/rtf/import/importers/character-importer.js

@@ -14,6 +14,7 @@ class RtfCharacterImporterState {
     }
 }
 export class RtfCharacterImporter extends RtfBaseImporter {
+    get characterFormatting() { return this.states.last.characterFormatting; }
     constructor(data) {
         super(data);
         this.states = new Stack();
@@ -22,7 +23,6 @@ export class RtfCharacterImporter extends RtfBaseImporter {
         this.states.push(new RtfCharacterImporterState(defaultCharacterProperties));
         this.logPosition = 0;
     }
-    get characterFormatting() { return this.states.last.characterFormatting; }
     static getOnlyOwnCharacterProperties(source, parentCharacterStyle) {
         const parentPropertiesMerger = new CharacterPropertiesMerger();
         parentPropertiesMerger.mergeCharacterStyle(parentCharacterStyle);

package/lib/common/formats/rtf/import/importers/field-importer.js

@@ -4,12 +4,12 @@ import { FieldCodeEndRun, FieldCodeStartRun, FieldResultEndRun } from '../../../
 import { RtfFieldInfo } from '../model/fields/rtf-field-info';
 import { RtfBaseImporter } from './importer-base';
 export class RtfFieldImporter extends RtfBaseImporter {
+    get fields() { return this.data.positionStates.last.fields; }
+    get currentField() { return this.fields.last; }
     constructor(data) {
         super(data);
         this.updateFieldsOnPaste = true;
     }
-    get fields() { return this.data.positionStates.last.fields; }
-    get currentField() { return this.fields.last; }
     startField() {
         this.fields.push(new RtfFieldInfo());
     }