@ckeditor/ckeditor5-engine 29.0.0 → 31.0.0

package/LICENSE.md

@@ -1,7 +1,7 @@
 Software License Agreement
 ==========================
 
-**CKEditor 5 Editing Engine** – https://github.com/ckeditor/ckeditor5-engine <br>
+**CKEditor 5 editing engine** – https://github.com/ckeditor/ckeditor5-engine <br>
 Copyright (c) 2003-2021, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

package/README.md

@@ -21,7 +21,7 @@ The CKEditor 5 editing engine implements a flexible MVC-based architecture for c
 
 ## Documentation
 
-For a general introduction see the [Overview of CKEditor 5 Framework](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/overview.html) guide and then the [Editing engine architecture](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/architecture/editing-engine.html) guide.
+For a general introduction see the [Overview of CKEditor 5 Framework](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/overview.html) guide and then the [Editing engine architecture guide](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/architecture/editing-engine.html).
 
 Additionally, refer to the [`@ckeditor/ckeditor5-engine` package](https://ckeditor.com/docs/ckeditor5/latest/api/engine.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/) for even more information.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "29.0.0",
+  "version": "31.0.0",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -23,28 +23,30 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "^29.0.0",
+    "@ckeditor/ckeditor5-utils": "^31.0.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^29.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^29.0.0",
-    "@ckeditor/ckeditor5-clipboard": "^29.0.0",
-    "@ckeditor/ckeditor5-core": "^29.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^29.0.0",
-    "@ckeditor/ckeditor5-enter": "^29.0.0",
-    "@ckeditor/ckeditor5-essentials": "^29.0.0",
-    "@ckeditor/ckeditor5-heading": "^29.0.0",
-    "@ckeditor/ckeditor5-image": "^29.0.0",
-    "@ckeditor/ckeditor5-link": "^29.0.0",
-    "@ckeditor/ckeditor5-list": "^29.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^29.0.0",
-    "@ckeditor/ckeditor5-table": "^29.0.0",
-    "@ckeditor/ckeditor5-theme-lark": "^29.0.0",
-    "@ckeditor/ckeditor5-typing": "^29.0.0",
-    "@ckeditor/ckeditor5-ui": "^29.0.0",
-    "@ckeditor/ckeditor5-undo": "^29.0.0",
-    "@ckeditor/ckeditor5-widget": "^29.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^31.0.0",
+    "@ckeditor/ckeditor5-block-quote": "^31.0.0",
+    "@ckeditor/ckeditor5-clipboard": "^31.0.0",
+    "@ckeditor/ckeditor5-cloud-services": "^31.0.0",
+    "@ckeditor/ckeditor5-core": "^31.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^31.0.0",
+    "@ckeditor/ckeditor5-enter": "^31.0.0",
+    "@ckeditor/ckeditor5-essentials": "^31.0.0",
+    "@ckeditor/ckeditor5-heading": "^31.0.0",
+    "@ckeditor/ckeditor5-image": "^31.0.0",
+    "@ckeditor/ckeditor5-link": "^31.0.0",
+    "@ckeditor/ckeditor5-list": "^31.0.0",
+    "@ckeditor/ckeditor5-mention": "^31.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^31.0.0",
+    "@ckeditor/ckeditor5-table": "^31.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^31.0.0",
+    "@ckeditor/ckeditor5-typing": "^31.0.0",
+    "@ckeditor/ckeditor5-ui": "^31.0.0",
+    "@ckeditor/ckeditor5-undo": "^31.0.0",
+    "@ckeditor/ckeditor5-widget": "^31.0.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },
@@ -64,6 +66,7 @@
   "files": [
     "lang",
     "src",
-    "theme"
+    "theme",
+    "ckeditor5-metadata.json"
   ]
 }

package/src/controller/datacontroller.js

@@ -145,6 +145,7 @@ export default class DataController {
 
 		this.decorate( 'init' );
 		this.decorate( 'set' );
+		this.decorate( 'get' );
 
 		// Fire the `ready` event when the initialization has completed. Such low-level listener gives possibility
 		// to plug into the initialization pipeline without interrupting the initialization flow.
@@ -163,6 +164,7 @@ export default class DataController {
 	 * Returns the model's data converted by downcast dispatchers attached to {@link #downcastDispatcher} and
 	 * formatted by the {@link #processor data processor}.
 	 *
+	 * @fires get
 	 * @param {Object} [options] Additional configuration for the retrieved data. `DataController` provides two optional
 	 * properties: `rootName` and `trim`. Other properties of this object are specified by various editor features.
 	 * @param {String} [options.rootName='main'] Root name.
@@ -523,6 +525,15 @@ export default class DataController {
 	 *
 	 * @event set
 	 */
+
+	/**
+	 * Event fired after {@link #get get() method} has been run.
+	 *
+	 * The `get` event is fired by decorated {@link #get} method.
+	 * See {@link module:utils/observablemixin~ObservableMixin#decorate} for more information and samples.
+	 *
+	 * @event get
+	 */
 }
 
 mix( DataController, ObservableMixin );
@@ -559,5 +570,43 @@ function _getMarkersRelativeToElement( element ) {
 		}
 	}
 
-	return result;
+	// Sort the markers in a stable fashion to ensure that the order that they are
+	// added to the model's marker collection does not affect how they are
+	// downcast. One particular use case that we're targeting here is one where
+	// two markers are adjacent but not overlapping, such as an insertion/deletion
+	// suggestion pair represting the replacement of a range of text. In this
+	// case, putting the markers in DOM order causes the first marker's end to be
+	// serialized right after the second marker's start, while putting the markers
+	// in reverse DOM order causes it to be right before the second marker's
+	// start. So, we sort in a way that ensures non-intersecting ranges are in
+	// reverse DOM order, and intersecting ranges are in something approximating
+	// reverse DOM order (since reverse DOM order doesn't have a precise meaning
+	// when working with intersectng ranges).
+	return result.sort( ( [ n1, r1 ], [ n2, r2 ] ) => {
+		if ( r1.end.compareWith( r2.start ) !== 'after' ) {
+			// m1.end <= m2.start -- m1 is entirely <= m2
+			return 1;
+		} else if ( r1.start.compareWith( r2.end ) !== 'before' ) {
+			// m1.start >= m2.end -- m1 is entirely >= m2
+			return -1;
+		} else {
+			// they overlap, so use their start positions as the primary sort key and
+			// end positions as the secondary sort key
+			switch ( r1.start.compareWith( r2.start ) ) {
+				case 'before':
+					return 1;
+				case 'after':
+					return -1;
+				default:
+					switch ( r1.end.compareWith( r2.end ) ) {
+						case 'before':
+							return 1;
+						case 'after':
+							return -1;
+						default:
+							return n2.localeCompare( n1 );
+					}
+			}
+		}
+	} );
 }

package/src/conversion/downcasthelpers.js

@@ -272,8 +272,11 @@ export default class DowncastHelpers extends ConversionHelpers {
 	/**
 	 * Model marker to view element conversion helper.
 	 *
-	 * **Note**: This method should be used only for editing downcast. For data downcast, use
-	 * {@link #markerToData `#markerToData()`} that produces valid HTML data.
+	 * **Note**: This method should be used mainly for editing downcast and it is recommended
+	 * to use {@link #markerToData `#markerToData()`} helper instead.
+	 *
+	 * This helper may produce invalid HTML code (e.g. a span between table cells).
+	 * It should be used only when you are sure that the produced HTML will be semantically correct.
 	 *
 	 * This conversion results in creating a view element on the boundaries of the converted marker. If the converted marker
 	 * is collapsed, only one element is created. For example, model marker set like this: `<paragraph>F[oo b]ar</paragraph>`
@@ -406,32 +409,32 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * This conversion creates a representation for model marker boundaries in the view:
 	 *
 	 * * If the marker boundary is before or after a model element, a view attribute is set on a corresponding view element.
-	 * * In other cases, a view element with the specified tag name is inserted at corresponding view position.
+	 * * In other cases, a view element with the specified tag name is inserted at the corresponding view position.
 	 *
-	 * Typically, marker names use the `group:uniqueId:otherData` convention. For example: `comment:e34zfk9k2n459df53sjl34:zx32c`.
+	 * Typically, the marker names use the `group:uniqueId:otherData` convention. For example: `comment:e34zfk9k2n459df53sjl34:zx32c`.
 	 * The default configuration for this conversion is that the first part is the `group` part and the rest of
 	 * the marker name becomes the `name` part.
 	 *
 	 * Tag and attribute names and values are generated from the marker name:
 	 *
-	 * * Templates for attributes are `data-[group]-start-before="[name]"`, `data-[group]-start-after="[name]"`,
+	 * * The templates for attributes are `data-[group]-start-before="[name]"`, `data-[group]-start-after="[name]"`,
 	 * `data-[group]-end-before="[name]"` and `data-[group]-end-after="[name]"`.
-	 * * Templates for view elements are `<[group]-start name="[name]">` and `<[group]-end name="[name]">`.
+	 * * The templates for view elements are `<[group]-start name="[name]">` and `<[group]-end name="[name]">`.
 	 *
 	 * Attributes mark whether the given marker's start or end boundary is before or after the given element.
-	 * Attributes `data-[group]-start-before` and `data-[group]-end-after` are favored.
+	 * The `data-[group]-start-before` and `data-[group]-end-after` attributes are favored.
 	 * The other two are used when the former two cannot be used.
 	 *
 	 * The conversion configuration can take a function that will generate different group and name parts.
-	 * If such function is set as the `config.view` parameter, it is passed a marker name and it is expected to return an object with two
+	 * If such a function is set as the `config.view` parameter, it is passed a marker name and it is expected to return an object with two
 	 * properties: `group` and `name`. If the function returns a falsy value, the conversion will not take place.
 	 *
 	 * Basic usage:
 	 *
 	 *		// Using the default conversion.
-	 *		// In this case, all markers whose name starts with 'comment:' will be converted.
+	 *		// In this case, all markers with names starting with 'comment:' will be converted.
 	 *		// The `group` parameter will be set to `comment`.
-	 *		// The `name` parameter will be the rest of the marker name (without `:`).
+	 *		// The `name` parameter will be the rest of the marker name (without the `:`).
 	 *		editor.conversion.for( 'dataDowncast' ).markerToData( {
 	 *			model: 'comment'
 	 *		} );
@@ -454,7 +457,7 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *		<p>Foo <myMarker-start></myMarker-start>bar</p>
 	 *		<figure data-myMarker-end-after="" class="image"><img src="abc.jpg" /></figure>
 	 *
-	 * **Note:** A situation where some markers have the `name` part and some do not have it is incorrect and should be avoided.
+	 * **Note:** A situation where some markers have the `name` part and some do not, is incorrect and should be avoided.
 	 *
 	 * Examples where `data-group-start-after` and `data-group-end-before` are used:
 	 *
@@ -498,14 +501,14 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 * This kind of conversion is useful for saving data into the database, so it should be used in the data conversion pipeline.
 	 *
-	 * See {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} to learn how to add a converter
-	 * to the conversion process.
+	 * See the {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} API guide to learn how to
+	 * add a converter to the conversion process.
 	 *
 	 * @method #markerToData
 	 * @param {Object} config Conversion configuration.
-	 * @param {String} config.model The name of the model marker (or model marker group) to convert.
+	 * @param {String} config.model The name of the model marker (or the model marker group) to convert.
 	 * @param {Function} [config.view] A function that takes the model marker name and
-	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as a parameters
+	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as the parameters
 	 * and returns an object with the `group` and `name` properties.
 	 * @param {module:utils/priorities~PriorityString} [config.converterPriority='normal'] Converter priority.
 	 * @returns {module:engine/conversion/downcasthelpers~DowncastHelpers}
@@ -548,7 +551,7 @@ export function insertText() {
  */
 export function remove() {
 	return ( evt, data, conversionApi ) => {
-		// Find view range start position by mapping model position at which the remove happened.
+		// Find the view range start position by mapping the model position at which the remove happened.
 		const viewStart = conversionApi.mapper.toViewPosition( data.position );
 
 		const modelEnd = data.position.getShiftedBy( data.length );
@@ -569,7 +572,7 @@ export function remove() {
 
 /**
  * Creates a `<span>` {@link module:engine/view/attributeelement~AttributeElement view attribute element} from the information
- * provided by the {@link module:engine/conversion/downcasthelpers~HighlightDescriptor highlight descriptor} object. If a priority
+ * provided by the {@link module:engine/conversion/downcasthelpers~HighlightDescriptor highlight descriptor} object. If the priority
  * is not provided in the descriptor, the default priority will be used.
  *
  * @param {module:engine/view/downcastwriter~DowncastWriter} writer
@@ -966,7 +969,7 @@ function handleMarkerBoundary( range, isStart, conversionApi, data, viewMarkerDa
 
 		const viewElement = conversionApi.mapper.toViewElement( modelElement );
 
-		// On rare circumstances, the model element could be not mapped to any view element and that would cause an error.
+		// In rare circumstances, the model element may be not mapped to any view element and that would cause an error.
 		// One of those situations is a soft break inside code block.
 		if ( viewElement ) {
 			insertMarkerAsAttribute( viewElement, isStart, isBefore, conversionApi, data, viewMarkerData );

package/src/conversion/upcasthelpers.js

@@ -7,7 +7,6 @@ import Matcher from '../view/matcher';
 import ConversionHelpers from './conversionhelpers';
 
 import { cloneDeep } from 'lodash-es';
-import { logWarning } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 import priorities from '@ckeditor/ckeditor5-utils/src/priorities';
 import { isParagraphable, wrapInParagraph } from '../model/utils/autoparagraphing';
@@ -294,13 +293,17 @@ export default class UpcastHelpers extends ConversionHelpers {
 	/**
 	 * View element to model marker conversion helper.
 	 *
-	 * **Note**: This method was deprecated. Please use {@link #dataToMarker} instead.
-	 *
 	 * This conversion results in creating a model marker. For example, if the marker was stored in a view as an element:
 	 * `<p>Fo<span data-marker="comment" data-comment-id="7"></span>o</p><p>B<span data-marker="comment" data-comment-id="7"></span>ar</p>`,
 	 * after the conversion is done, the marker will be available in
 	 * {@link module:engine/model/model~Model#markers model document markers}.
 	 *
+	 * **Note**: When this helper is used in the data upcast in combination with
+	 * {@link module:engine/conversion/downcasthelpers~DowncastHelpers#markerToData `#markerToData()`} in the data downcast,
+	 * then invalid HTML code (e.g. a span between table cells) may be produced by the latter converter.
+	 *
+	 * In most of the cases, the {@link #dataToMarker} should be used instead.
+	 *
 	 *		editor.conversion.for( 'upcast' ).elementToMarker( {
 	 *			view: 'marker-search',
 	 *			model: 'search'
@@ -330,7 +333,6 @@ export default class UpcastHelpers extends ConversionHelpers {
 	 * See {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} to learn how to add a converter
 	 * to the conversion process.
 	 *
-	 * @deprecated
 	 * @method #elementToMarker
 	 * @param {Object} config Conversion configuration.
 	 * @param {module:engine/view/matcher~MatcherPattern} config.view Pattern matching all view elements which should be converted.
@@ -340,15 +342,6 @@ export default class UpcastHelpers extends ConversionHelpers {
 	 * @returns {module:engine/conversion/upcasthelpers~UpcastHelpers}
 	 */
 	elementToMarker( config ) {
-		/**
-		 * The {@link module:engine/conversion/upcasthelpers~UpcastHelpers#elementToMarker `UpcastHelpers#elementToMarker()`}
-		 * method was deprecated and will be removed in the near future.
-		 * Please use {@link module:engine/conversion/upcasthelpers~UpcastHelpers#dataToMarker `UpcastHelpers#dataToMarker()`} instead.
-		 *
-		 * @error upcast-helpers-element-to-marker-deprecated
-		 */
-		logWarning( 'upcast-helpers-element-to-marker-deprecated' );
-
 		return this.add( upcastElementToMarker( config ) );
 	}
 
@@ -651,11 +644,11 @@ function upcastDataToMarker( config ) {
 		// Below is a hack that is needed to properly handle `converterPriority` for both elements and attributes.
 		// Attribute conversion needs to be performed *after* element conversion.
 		// This converter handles both element conversion and attribute conversion, which means that if a single
-		// `config.converterPriority` is used, it will lead to problems. For example, if `'high'` priority is used,
-		// then attribute conversion will be performed before a lot of element upcast converters.
-		// On the other hand we want to support `config.converterPriority` and overwriting converters.
+		// `config.converterPriority` is used, it will lead to problems. For example, if the `'high'` priority is used,
+		// the attribute conversion will be performed before a lot of element upcast converters.
+		// On the other hand, we want to support `config.converterPriority` and converter overwriting.
 		//
-		// To have it work, we need to do some extra processing for priority for attribute converter.
+		// To make it work, we need to do some extra processing for priority for attribute converter.
 		// Priority `'low'` value should be the base value and then we will change it depending on `config.converterPriority` value.
 		//
 		// This hack probably would not be needed if attributes are upcasted separately.

package/src/dataprocessor/htmldataprocessor.js

@@ -28,26 +28,23 @@ export default class HtmlDataProcessor {
 		/**
 		 * A DOM parser instance used to parse an HTML string to an HTML document.
 		 *
-		 * @private
 		 * @member {DOMParser}
 		 */
-		this._domParser = new DOMParser();
+		this.domParser = new DOMParser();
 
 		/**
 		 * A DOM converter used to convert DOM elements to view elements.
 		 *
-		 * @private
 		 * @member {module:engine/view/domconverter~DomConverter}
 		 */
-		this._domConverter = new DomConverter( document, { blockFillerMode: 'nbsp' } );
+		this.domConverter = new DomConverter( document, { renderingMode: 'data' } );
 
 		/**
 		 * A basic HTML writer instance used to convert DOM elements to an HTML string.
 		 *
-		 * @private
-		 * @member {module:engine/dataprocessor/basichtmlwriter~BasicHtmlWriter}
+		 * @member {module:engine/dataprocessor/htmlwriter~HtmlWriter}
 		 */
-		this._htmlWriter = new BasicHtmlWriter();
+		this.htmlWriter = new BasicHtmlWriter();
 	}
 
 	/**
@@ -59,10 +56,10 @@ export default class HtmlDataProcessor {
 	 */
 	toData( viewFragment ) {
 		// Convert view DocumentFragment to DOM DocumentFragment.
-		const domFragment = this._domConverter.viewToDom( viewFragment, document );
+		const domFragment = this.domConverter.viewToDom( viewFragment, document );
 
 		// Convert DOM DocumentFragment to HTML output.
-		return this._htmlWriter.getHtml( domFragment );
+		return this.htmlWriter.getHtml( domFragment );
 	}
 
 	/**
@@ -76,7 +73,7 @@ export default class HtmlDataProcessor {
 		const domFragment = this._toDom( data );
 
 		// Convert DOM DocumentFragment to view DocumentFragment.
-		return this._domConverter.domToView( domFragment );
+		return this.domConverter.domToView( domFragment );
 	}
 
 	/**
@@ -90,22 +87,22 @@ export default class HtmlDataProcessor {
 	 * be treated as raw data.
 	 */
 	registerRawContentMatcher( pattern ) {
-		this._domConverter.registerRawContentMatcher( pattern );
+		this.domConverter.registerRawContentMatcher( pattern );
 	}
 
 	/**
 	 * If the processor is set to use marked fillers, it will insert `&nbsp;` fillers wrapped in `<span>` elements
 	 * (`<span data-cke-filler="true">&nbsp;</span>`) instead of regular `&nbsp;` characters.
 	 *
-	 * This mode allows for more precise handling of block fillers (so they do not leak into the editor content) but bloats the
-	 * editor data with additional markup.
+	 * This mode allows for a more precise handling of the block fillers (so they do not leak into the editor content) but
+	 * bloats the editor data with additional markup.
 	 *
 	 * This mode may be required by some features and will be turned on by them automatically.
 	 *
-	 * @param {'default'|'marked'} type Whether to use the default or marked `&nbsp;` block fillers.
+	 * @param {'default'|'marked'} type Whether to use the default or the marked `&nbsp;` block fillers.
 	 */
 	useFillerType( type ) {
-		this._domConverter.blockFillerMode = type == 'marked' ? 'markedNbsp' : 'nbsp';
+		this.domConverter.blockFillerMode = type == 'marked' ? 'markedNbsp' : 'nbsp';
 	}
 
 	/**
@@ -117,7 +114,7 @@ export default class HtmlDataProcessor {
 	 * @returns {DocumentFragment}
 	 */
 	_toDom( data ) {
-		const document = this._domParser.parseFromString( data, 'text/html' );
+		const document = this.domParser.parseFromString( data, 'text/html' );
 		const fragment = document.createDocumentFragment();
 
 		// The rules for parsing an HTML string can be read on https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inhtml.

package/src/dataprocessor/xmldataprocessor.js

@@ -26,7 +26,7 @@ export default class XmlDataProcessor {
 	 *
 	 * @param {module:engine/view/document~Document} document The view document instance.
 	 * @param {Object} options Configuration options.
-	 * @param {Array<String>} [options.namespaces=[]] A list of namespaces allowed to use in the XML input.
+	 * @param {Array.<String>} [options.namespaces=[]] A list of namespaces allowed to use in the XML input.
 	 */
 	constructor( document, options = {} ) {
 		/**
@@ -35,35 +35,31 @@ export default class XmlDataProcessor {
 		 * For example, registering namespaces [ 'attribute', 'container' ] allows to use `<attirbute:tagName></attribute:tagName>`
 		 * and `<container:tagName></container:tagName>` input. It is mainly for debugging.
 		 *
-		 * @public
-		 * @member {DOMParser}
+		 * @member {Array.<String>}
 		 */
 		this.namespaces = options.namespaces || [];
 
 		/**
 		 * DOM parser instance used to parse an XML string to an XML document.
 		 *
-		 * @private
 		 * @member {DOMParser}
 		 */
-		this._domParser = new DOMParser();
+		this.domParser = new DOMParser();
 
 		/**
 		 * DOM converter used to convert DOM elements to view elements.
 		 *
-		 * @private
 		 * @member {module:engine/view/domconverter~DomConverter}
 		 */
-		this._domConverter = new DomConverter( document, { blockFillerMode: 'nbsp' } );
+		this.domConverter = new DomConverter( document, { renderingMode: 'data' } );
 
 		/**
 		 * A basic HTML writer instance used to convert DOM elements to an XML string.
 		 * There is no need to use a dedicated XML writer because the basic HTML writer works well in this case.
 		 *
-		 * @private
-		 * @member {module:engine/dataprocessor/basichtmlwriter~BasicHtmlWriter}
+		 * @member {module:engine/dataprocessor/htmlwriter~HtmlWriter}
 		 */
-		this._htmlWriter = new BasicHtmlWriter();
+		this.htmlWriter = new BasicHtmlWriter();
 	}
 
 	/**
@@ -75,11 +71,11 @@ export default class XmlDataProcessor {
 	 */
 	toData( viewFragment ) {
 		// Convert view DocumentFragment to DOM DocumentFragment.
-		const domFragment = this._domConverter.viewToDom( viewFragment, document );
+		const domFragment = this.domConverter.viewToDom( viewFragment, document );
 
 		// Convert DOM DocumentFragment to XML output.
 		// There is no need to use dedicated for XML serializing method because BasicHtmlWriter works well in this case.
-		return this._htmlWriter.getHtml( domFragment );
+		return this.htmlWriter.getHtml( domFragment );
 	}
 
 	/**
@@ -93,7 +89,7 @@ export default class XmlDataProcessor {
 		const domFragment = this._toDom( data );
 
 		// Convert DOM DocumentFragment to view DocumentFragment.
-		return this._domConverter.domToView( domFragment, { keepOriginalCase: true } );
+		return this.domConverter.domToView( domFragment, { keepOriginalCase: true } );
 	}
 
 	/**
@@ -107,22 +103,22 @@ export default class XmlDataProcessor {
 	 * be treated as raw data.
 	 */
 	registerRawContentMatcher( pattern ) {
-		this._domConverter.registerRawContentMatcher( pattern );
+		this.domConverter.registerRawContentMatcher( pattern );
 	}
 
 	/**
 	 * If the processor is set to use marked fillers, it will insert `&nbsp;` fillers wrapped in `<span>` elements
 	 * (`<span data-cke-filler="true">&nbsp;</span>`) instead of regular `&nbsp;` characters.
 	 *
-	 * This mode allows for more precise handling of block fillers (so they do not leak into editor content) but bloats the
-	 * editor data with additional markup.
+	 * This mode allows for a more precise handling of block fillers (so they do not leak into editor content) but
+	 * bloats the editor data with additional markup.
 	 *
 	 * This mode may be required by some features and will be turned on by them automatically.
 	 *
-	 * @param {'default'|'marked'} type Whether to use the default or marked `&nbsp;` block fillers.
+	 * @param {'default'|'marked'} type Whether to use the default or the marked `&nbsp;` block fillers.
 	 */
 	useFillerType( type ) {
-		this._domConverter.blockFillerMode = type == 'marked' ? 'markedNbsp' : 'nbsp';
+		this.domConverter.blockFillerMode = type == 'marked' ? 'markedNbsp' : 'nbsp';
 	}
 
 	/**
@@ -140,7 +136,7 @@ export default class XmlDataProcessor {
 		// Wrap data into root element with optional namespace definitions.
 		data = `<xml ${ namespaces }>${ data }</xml>`;
 
-		const parsedDocument = this._domParser.parseFromString( data, 'text/xml' );
+		const parsedDocument = this.domParser.parseFromString( data, 'text/xml' );
 
 		// Parse validation.
 		const parserError = parsedDocument.querySelector( 'parsererror' );

package/src/dev-utils/view.js

@@ -39,6 +39,13 @@ const allowedTypes = {
 	'ui': UIElement,
 	'raw': RawElement
 };
+// Returns simplified implementation of {@link module:engine/view/domconverter~DomConverter#setContentOf DomConverter.setContentOf} method.
+// Used to render UIElement and RawElement.
+const domConverterStub = {
+	setContentOf: ( node, html ) => {
+		node.innerHTML = html;
+	}
+};
 
 /**
  * Writes the content of the {@link module:engine/view/document~Document document} to an HTML-like string.
@@ -59,6 +66,9 @@ const allowedTypes = {
  * {@link module:engine/view/uielement~UIElement} will be printed.
  * @param {Boolean} [options.renderRawElements=false] When set to `true`, the inner content of each
  * {@link module:engine/view/rawelement~RawElement} will be printed.
+ * @param {Object} [options.domConverter=null] When set to an actual {@link module:engine/view/domconverter~DomConverter DomConverter}
+ * instance it lets the conversion go through exactly the same flow the editing view is going, i.e. with view data
+ * filtering. Otherwise the simple stub is used.
  * @returns {String} The stringified data.
  */
 export function getData( view, options = {} ) {
@@ -75,7 +85,8 @@ export function getData( view, options = {} ) {
 		showPriority: options.showPriority,
 		renderUIElements: options.renderUIElements,
 		renderRawElements: options.renderRawElements,
-		ignoreRoot: true
+		ignoreRoot: true,
+		domConverter: options.domConverter
 	};
 
 	return withoutSelection ?
@@ -241,6 +252,9 @@ setData._parse = parse;
  * {@link module:engine/view/uielement~UIElement} will be printed.
  * @param {Boolean} [options.renderRawElements=false] When set to `true`, the inner content of each
  * {@link module:engine/view/rawelement~RawElement} will be printed.
+ * @param {Object} [options.domConverter={}] When set to an actual {@link module:engine/view/domconverter~DomConverter DomConverter}
+ * instance it lets the conversion go through exactly the same flow the editing view is going, i.e. with view data
+ * filtering. Otherwise the simple stub is used.
  * @returns {String} An HTML-like string representing the view.
  */
 export function stringify( node, selectionOrPositionOrRange = null, options = {} ) {
@@ -630,6 +644,9 @@ class ViewStringify {
 	 * @param {Boolean} [options.renderUIElements=false] When set to `true`, the inner content of each
 	 * {@link module:engine/view/uielement~UIElement} will be printed.
 	 * @param {Boolean} [options.renderRawElements=false] When set to `true`, the inner content of each
+	 * @param {Object} [options.domConverter={}] When set to an actual {@link module:engine/view/domconverter~DomConverter DomConverter}
+	 * instance it lets the conversion go through exactly the same flow the editing view is going, i.e. with view data
+	 * filtering. Otherwise the simple stub is used.
 	 * {@link module:engine/view/rawelement~RawElement} will be printed.
 	 */
 	constructor( root, selection, options ) {
@@ -648,6 +665,7 @@ class ViewStringify {
 		this.sameSelectionCharacters = !!options.sameSelectionCharacters;
 		this.renderUIElements = !!options.renderUIElements;
 		this.renderRawElements = !!options.renderRawElements;
+		this.domConverter = options.domConverter || domConverterStub;
 	}
 
 	/**
@@ -681,12 +699,12 @@ class ViewStringify {
 			}
 
 			if ( ( this.renderUIElements && root.is( 'uiElement' ) ) ) {
-				callback( root.render( document ).innerHTML );
+				callback( root.render( document, this.domConverter ).innerHTML );
 			} else if ( this.renderRawElements && root.is( 'rawElement' ) ) {
 				// There's no DOM element for "root" to pass to render(). Creating
 				// a surrogate container to render the children instead.
 				const rawContentContainer = document.createElement( 'div' );
-				root.render( rawContentContainer );
+				root.render( rawContentContainer, this.domConverter );
 
 				callback( rawContentContainer.innerHTML );
 			} else {

package/src/index.js

@@ -30,6 +30,7 @@ export { default as TreeWalker } from './model/treewalker';
 export { default as Element } from './model/element';
 
 export { default as DomConverter } from './view/domconverter';
+export { default as Renderer } from './view/renderer';
 export { default as ViewDocument } from './view/document';
 
 export { getFillerOffset } from './view/containerelement';

package/src/model/markercollection.js

@@ -52,12 +52,13 @@ export default class MarkerCollection {
 	}
 
 	/**
-	 * Checks if marker with given `markerName` is in the collection.
+	 * Checks if given {@link ~Marker marker} or marker name is in the collection.
 	 *
-	 * @param {String} markerName Marker name.
-	 * @returns {Boolean} `true` if marker with given `markerName` is in the collection, `false` otherwise.
+	 * @param {String|module:engine/model/markercollection~Marker} markerOrName Name of marker or marker instance to check.
+	 * @returns {Boolean} `true` if marker is in the collection, `false` otherwise.
 	 */
-	has( markerName ) {
+	has( markerOrName ) {
+		const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
 		return this._markers.has( markerName );
 	}