@ckeditor/ckeditor5-engine 33.0.0 → 34.2.0

package/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 editing engine** – https://github.com/ckeditor/ckeditor5-engine <br>
-Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.
+Copyright (c) 2003-2022, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
 
@@ -14,4 +14,4 @@ Where not otherwise indicated, all CKEditor content is authored by CKSource engi
 Trademarks
 ----------
 
-**CKEditor** is a trademark of [CKSource](http://cksource.com) Holding sp. z o.o. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
+**CKEditor** is a trademark of [CKSource Holding sp. z o.o.](https://cksource.com) All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.

package/README.md

@@ -3,7 +3,8 @@ CKEditor 5 editing engine
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-engine.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5?branch=master)
-[![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://travis-ci.com/ckeditor/ckeditor5)
+[![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://app.travis-ci.com/github/ckeditor/ckeditor5)
+![Dependency Status](https://img.shields.io/librariesio/release/npm/@ckeditor/ckeditor5-engine)
 
 The CKEditor 5 editing engine implements a flexible MVC-based architecture for creating rich text editing features.
 

package/package.json

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

package/src/conversion/downcasthelpers.js

@@ -151,8 +151,9 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * the view element. Note that the view will be reconverted if any of the listed attributes changes.
  	 * @param {Boolean} [config.model.children] Specifies whether the view element requires reconversion if the list
 	 * of the model child nodes changed.
-	 * @param {module:engine/view/elementdefinition~ElementDefinition|Function} config.view A view element definition or a function
-	 * that takes the model element and {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API}
+	 * @param {module:engine/view/elementdefinition~ElementDefinition|module:engine/conversion/downcasthelpers~ElementCreatorFunction}
+	 * config.view A view element definition or a function that takes the model element and
+	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API}
 	 * as parameters and returns a view container element.
 	 * @returns {module:engine/conversion/downcasthelpers~DowncastHelpers}
 	 */
@@ -377,7 +378,8 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * @param {Object} config Conversion configuration.
 	 * @param {String|Object} config.model The key of the attribute to convert from or a `{ key, values }` object. `values` is an array
 	 * of `String`s with possible values if the model attribute is an enumerable.
-	 * @param {module:engine/view/elementdefinition~ElementDefinition|Function|Object} config.view A view element definition or a function
+	 * @param {module:engine/view/elementdefinition~ElementDefinition|Object|
+	 * module:engine/conversion/downcasthelpers~AttributeElementCreatorFunction} config.view A view element definition or a function
 	 * that takes the model attribute value and
 	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as parameters and returns a view
 	 * attribute element. If `config.model.values` is given, `config.view` should be an object assigning values from `config.model.values`
@@ -459,8 +461,9 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * @param {Object} config Conversion configuration.
 	 * @param {String|Object} config.model The key of the attribute to convert from or a `{ key, values, [ name ] }` object describing
 	 * the attribute key, possible values and, optionally, an element name to convert from.
-	 * @param {String|Object|Function} config.view A view attribute key, or a `{ key, value }` object or a function that takes
-	 * the model attribute value and {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API}
+	 * @param {String|Object|module:engine/conversion/downcasthelpers~AttributeCreatorFunction} config.view A view attribute key,
+	 * or a `{ key, value }` object or a function that takes the model attribute value and
+	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API}
 	 * as parameters and returns a `{ key, value }` object. If the `key` is `'class'`, the `value` can be a `String` or an
 	 * array of `String`s. If the `key` is `'style'`, the `value` is an object with key-value pairs. In other cases, `value` is a `String`.
 	 * If `config.model.values` is set, `config.view` should be an object assigning values from `config.model.values` to
@@ -971,10 +974,10 @@ export function wrap( elementCreator ) {
 
 		// Recreate current wrapping node. It will be used to unwrap view range if the attribute value has changed
 		// or the attribute was removed.
-		const oldViewElement = elementCreator( data.attributeOldValue, conversionApi );
+		const oldViewElement = elementCreator( data.attributeOldValue, conversionApi, data );
 
 		// Create node to wrap with.
-		const newViewElement = elementCreator( data.attributeNewValue, conversionApi );
+		const newViewElement = elementCreator( data.attributeNewValue, conversionApi, data );
 
 		if ( !oldViewElement && !newViewElement ) {
 			return;
@@ -1037,7 +1040,7 @@ export function insertElement( elementCreator, consumer = defaultConsumer ) {
 			return;
 		}
 
-		const viewElement = elementCreator( data.item, conversionApi );
+		const viewElement = elementCreator( data.item, conversionApi, data );
 
 		if ( !viewElement ) {
 			return;
@@ -1085,7 +1088,7 @@ export function insertStructure( elementCreator, consumer ) {
 		conversionApi.writer._registerSlotFactory( createSlotFactory( data.item, slotsMap, conversionApi ) );
 
 		// View creation.
-		const viewElement = elementCreator( data.item, conversionApi );
+		const viewElement = elementCreator( data.item, conversionApi, data );
 
 		conversionApi.writer._clearSlotFactory();
 
@@ -1376,8 +1379,8 @@ function changeAttribute( attributeCreator ) {
 			return;
 		}
 
-		const oldAttribute = attributeCreator( data.attributeOldValue, conversionApi );
-		const newAttribute = attributeCreator( data.attributeNewValue, conversionApi );
+		const oldAttribute = attributeCreator( data.attributeOldValue, conversionApi, data );
+		const newAttribute = attributeCreator( data.attributeNewValue, conversionApi, data );
 
 		if ( !oldAttribute && !newAttribute ) {
 			return;
@@ -1653,7 +1656,8 @@ function removeHighlight( highlightDescriptor ) {
 // @param {String|Object} config.model The description or a name of the model element to convert.
 // @param {String|Array.<String>} [config.model.attributes] List of attributes triggering element reconversion.
 // @param {Boolean} [config.model.children] Should reconvert element if the list of model child nodes changed.
-// @param {module:engine/view/elementdefinition~ElementDefinition|Function} config.view
+// @param {module:engine/view/elementdefinition~ElementDefinition|module:engine/conversion/downcasthelpers~ElementCreatorFunction}
+// config.view
 // @returns {Function} Conversion helper.
 function downcastElementToElement( config ) {
 	config = cloneDeep( config );
@@ -1760,10 +1764,11 @@ function downcastElementToStructure( config ) {
 // @param {Object} config Conversion configuration.
 // @param {String|Object} config.model The key of the attribute to convert from or a `{ key, values }` object. `values` is an array
 // of `String`s with possible values if the model attribute is an enumerable.
-// @param {module:engine/view/elementdefinition~ElementDefinition|Function|Object} config.view A view element definition or a function
-// that takes the model attribute value and {@link module:engine/view/downcastwriter~DowncastWriter view downcast writer}
-// as parameters and returns a view attribute element. If `config.model.values` is
-// given, `config.view` should be an object assigning values from `config.model.values` to view element definitions or functions.
+// @param {module:engine/view/elementdefinition~ElementDefinition|module:engine/conversion/downcasthelpers~AttributeElementCreatorFunction|
+// Object} config.view A view element definition or a function that takes the model attribute value and
+// {@link module:engine/view/downcastwriter~DowncastWriter view downcast writer} as parameters and returns a view attribute element.
+// If `config.model.values` is given, `config.view` should be an object assigning values from `config.model.values` to view element
+// definitions or functions.
 // @param {module:utils/priorities~PriorityString} [config.converterPriority='normal'] Converter priority.
 // @returns {Function} Conversion helper.
 function downcastAttributeToElement( config ) {
@@ -1798,9 +1803,10 @@ function downcastAttributeToElement( config ) {
 // @param {Object} config Conversion configuration.
 // @param {String|Object} config.model The key of the attribute to convert from or a `{ key, values, [ name ] }` object describing
 // the attribute key, possible values and, optionally, an element name to convert from.
-// @param {String|Object|Function} config.view A view attribute key, or a `{ key, value }` object or a function that takes
-// the model attribute value and returns a `{ key, value }` object. If `key` is `'class'`, `value` can be a `String` or an
-// array of `String`s. If `key` is `'style'`, `value` is an object with key-value pairs. In other cases, `value` is a `String`.
+// @param {String|Object|module:engine/conversion/downcasthelpers~AttributeCreatorFunction} config.view A view attribute key,
+// or a `{ key, value }` object or a function that takes the model attribute value and returns a `{ key, value }` object.
+// If `key` is `'class'`, `value` can be a `String` or an array of `String`s. If `key` is `'style'`, `value` is an object with
+// key-value pairs. In other cases, `value` is a `String`.
 // If `config.model.values` is set, `config.view` should be an object assigning values from `config.model.values` to
 // `{ key, value }` objects or a functions.
 // @param {module:utils/priorities~PriorityString} [config.converterPriority='normal'] Converter priority.
@@ -2386,6 +2392,23 @@ function defaultConsumer( item, consumable, { preflight } = {} ) {
  * @see module:engine/conversion/downcasthelpers~insertStructure
  */
 
+/**
+ * A view element creator function that takes the model element and {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi
+ * downcast conversion API} as parameters and returns a view container element.
+ *
+ * @callback module:engine/conversion/downcasthelpers~ElementCreatorFunction
+ * @param {module:engine/model/element~Element} element The model element to be converted to the view structure.
+ * @param {module:engine/conversion/downcastdispatcher~DowncastConversionApi} conversionApi The conversion interface.
+ * @param {Object} data Additional information about the change (same as for
+ * {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher#event:insert `insert`} event).
+ * @param {module:engine/model/item~Item} data.item Inserted item.
+ * @param {module:engine/model/range~Range} data.range Range spanning over inserted item.
+ * @returns {module:engine/view/element~Element} The view element.
+ *
+ * @see module:engine/conversion/downcasthelpers~DowncastHelpers#elementToElement
+ * @see module:engine/conversion/downcasthelpers~insertElement
+ */
+
 /**
  * A function that takes the model element and {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast
  * conversion API} as parameters and returns a view container element with slots for model child nodes to be converted into.
@@ -2393,12 +2416,60 @@ function defaultConsumer( item, consumable, { preflight } = {} ) {
  * @callback module:engine/conversion/downcasthelpers~StructureCreatorFunction
  * @param {module:engine/model/element~Element} element The model element to be converted to the view structure.
  * @param {module:engine/conversion/downcastdispatcher~DowncastConversionApi} conversionApi The conversion interface.
+ * @param {Object} data Additional information about the change (same as for
+ * {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher#event:insert `insert`} event).
+ * @param {module:engine/model/item~Item} data.item Inserted item.
+ * @param {module:engine/model/range~Range} data.range Range spanning over inserted item.
  * @returns {module:engine/view/element~Element} The view structure with slots for model child nodes.
  *
  * @see module:engine/conversion/downcasthelpers~DowncastHelpers#elementToStructure
  * @see module:engine/conversion/downcasthelpers~insertStructure
  */
 
+/**
+ * A view element creator function that takes the model attribute value and
+ * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as parameters and returns a view
+ * attribute element.
+ *
+ * @callback module:engine/conversion/downcasthelpers~AttributeElementCreatorFunction
+ * @param {*} attributeValue The model attribute value to be converted to the view attribute element.
+ * @param {module:engine/conversion/downcastdispatcher~DowncastConversionApi} conversionApi The conversion interface.
+ * @param {Object} data Additional information about the change (same as for
+ * {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher#event:attribute `attribute`} event).
+ * @param {module:engine/model/item~Item|module:engine/model/documentselection~DocumentSelection} data.item Changed item
+ * or converted selection.
+ * @param {module:engine/model/range~Range} data.range Range spanning over changed item or selection range.
+ * @param {String} data.attributeKey Attribute key.
+ * @param {*} data.attributeOldValue Attribute value before the change. This is `null` when selection attribute is converted.
+ * @param {*} data.attributeNewValue New attribute value.
+ * @returns {module:engine/view/attributeelement~AttributeElement} The view attribute element.
+ *
+ * @see module:engine/conversion/downcasthelpers~DowncastHelpers#attributeToElement
+ * @see module:engine/conversion/downcasthelpers~wrap
+ */
+
+/**
+ * A function that takes the model attribute value and
+ * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API}
+ * as parameters.
+ *
+ * @callback module:engine/conversion/downcasthelpers~AttributeCreatorFunction
+ * @param {*} attributeValue The model attribute value to be converted to the view attribute element.
+ * @param {module:engine/conversion/downcastdispatcher~DowncastConversionApi} conversionApi The conversion interface.
+ * @param {Object} data Additional information about the change (same as for
+ * {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher#event:attribute `attribute`} event).
+ * @param {module:engine/model/item~Item|module:engine/model/documentselection~DocumentSelection} data.item Changed item
+ * or converted selection.
+ * @param {module:engine/model/range~Range} data.range Range spanning over changed item or selection range.
+ * @param {String} data.attributeKey Attribute key.
+ * @param {*} data.attributeOldValue Attribute value before the change. This is `null` when selection attribute is converted.
+ * @param {*} data.attributeNewValue New attribute value.
+ * @returns {Object|null} A `{ key, value }` object. If `key` is `'class'`, `value` can be a `String` or an
+ * array of `String`s. If `key` is `'style'`, `value` is an object with key-value pairs. In other cases, `value` is a `String`.
+ *
+ * @see module:engine/conversion/downcasthelpers~DowncastHelpers#attributeToAttribute
+ */
+
 /**
  * A function that is expected to consume all the consumables that were used by the element creator.
  *

package/src/conversion/mapper.js

@@ -121,9 +121,9 @@ export default class Mapper {
 				 *
 				 * Make sure that the model element is correctly converted to the view.
 				 *
-				 * @error mapping-view-position-parent-not-found
+				 * @error mapping-model-position-view-parent-not-found
 				 */
-				throw new CKEditorError( 'mapping-view-position-parent-not-found', this, { modelPosition: data.modelPosition } );
+				throw new CKEditorError( 'mapping-model-position-view-parent-not-found', this, { modelPosition: data.modelPosition } );
 			}
 
 			data.viewPosition = this.findPositionIn( viewContainer, data.modelPosition.offset );

package/src/conversion/upcastdispatcher.js

@@ -151,6 +151,16 @@ export default class UpcastDispatcher {
 		 */
 		this._modelCursor = null;
 
+		/**
+		 * The list of elements that were created during the splitting but should not get removed on conversion end even if they are empty.
+		 *
+		 * The list is cleared after the conversion process.
+		 *
+		 * @private
+		 * @type {Set.<module:engine/model/element~Element>}
+		 */
+		this._emptyElementsToKeep = new Set();
+
 		/**
 		 * An interface passed by the dispatcher to the event callbacks.
 		 *
@@ -167,6 +177,7 @@ export default class UpcastDispatcher {
 		// Advanced API - use only if custom position handling is needed.
 		this.conversionApi.splitToAllowedParent = this._splitToAllowedParent.bind( this );
 		this.conversionApi.getSplitParts = this._getSplitParts.bind( this );
+		this.conversionApi.keepEmptyElement = this._keepEmptyElement.bind( this );
 	}
 
 	/**
@@ -226,6 +237,7 @@ export default class UpcastDispatcher {
 		// Clear split elements & parents lists.
 		this._splitParts.clear();
 		this._cursorParents.clear();
+		this._emptyElementsToKeep.clear();
 
 		// Clear conversion API.
 		this.conversionApi.writer = null;
@@ -451,6 +463,15 @@ export default class UpcastDispatcher {
 		return parts;
 	}
 
+	/**
+	 * Mark an element that were created during the splitting to not get removed on conversion end even if it is empty.
+	 *
+	 * @private
+	 */
+	_keepEmptyElement( element ) {
+		this._emptyElementsToKeep.add( element );
+	}
+
 	/**
 	 * Checks if there are any empty elements created while splitting and removes them.
 	 *
@@ -463,7 +484,7 @@ export default class UpcastDispatcher {
 		let anyRemoved = false;
 
 		for ( const element of this._splitParts.keys() ) {
-			if ( element.isEmpty ) {
+			if ( element.isEmpty && !this._emptyElementsToKeep.has( element ) ) {
 				this.conversionApi.writer.remove( element );
 				this._splitParts.delete( element );
 
@@ -757,6 +778,15 @@ function createContextTree( contextDefinition, writer ) {
  * @returns {Array.<module:engine/model/element~Element>}
  */
 
+/**
+ * Mark an element that was created during splitting to not get removed on conversion end even if it is empty.
+ *
+ * **Note:** This is an advanced method. For most cases you will not need to keep the split empty element.
+ *
+ * @method #keepEmptyElement
+ * @param {module:engine/model/element~Element} element
+ */
+
 /**
  * Stores information about what parts of the processed view item are still waiting to be handled. After a piece of view item
  * was converted, an appropriate consumable value should be

package/src/conversion/upcasthelpers.js

@@ -465,6 +465,11 @@ export function convertText() {
 				return;
 			}
 
+			// Do not auto-paragraph whitespaces.
+			if ( data.viewItem.data.trim().length == 0 ) {
+				return;
+			}
+
 			position = wrapInParagraph( position, writer );
 		}
 
@@ -867,6 +872,13 @@ function prepareToAttributeConverter( config, shallow ) {
 	const matcher = new Matcher( config.view );
 
 	return ( evt, data, conversionApi ) => {
+		// Converting an attribute of an element that has not been converted to anything does not make sense
+		// because there will be nowhere to set that attribute on. At this stage, the element should've already
+		// been converted (https://github.com/ckeditor/ckeditor5/issues/11000).
+		if ( !data.modelRange && shallow ) {
+			return;
+		}
+
 		const match = matcher.match( data.viewItem );
 
 		// If there is no match, this callback should not do anything.
@@ -877,7 +889,8 @@ function prepareToAttributeConverter( config, shallow ) {
 		if ( onlyViewNameIsDefined( config.view, data.viewItem ) ) {
 			match.match.name = true;
 		} else {
-			// Do not test or consume `name` consumable.
+			// Do not test `name` consumable because it could get consumed already while upcasting some other attribute
+			// on the same element (for example <span class="big" style="color: red">foo</span>).
 			delete match.match.name;
 		}
 
@@ -908,6 +921,15 @@ function prepareToAttributeConverter( config, shallow ) {
 		// It may happen that a converter will try to set an attribute that is not allowed in the given context.
 		// In such a situation we cannot consume the attribute. See: https://github.com/ckeditor/ckeditor5/pull/9249#issuecomment-815658459.
 		if ( attributeWasSet ) {
+			// Verify if the element itself wasn't consumed yet. It could be consumed already while upcasting some other attribute
+			// on the same element (for example <span class="big" style="color: red">foo</span>).
+			// We need to consume it so other features (especially GHS) won't try to convert it.
+			// Note that it's not tested by the other element-to-attribute converters whether an element was consumed before
+			// (in case of converters that the element itself is just a context and not the primary information to convert).
+			if ( conversionApi.consumable.test( data.viewItem, { name: true } ) ) {
+				match.match.name = true;
+			}
+
 			conversionApi.consumable.consume( data.viewItem, match.match );
 		}
 	};

package/src/index.js

@@ -28,11 +28,22 @@ export { default as LivePosition } from './model/liveposition';
 export { default as Model } from './model/model';
 export { default as TreeWalker } from './model/treewalker';
 export { default as Element } from './model/element';
+export { default as Position } from './model/position';
+export { default as DocumentFragment } from './model/documentfragment';
 export { default as History } from './model/history';
+export { default as Text } from './model/text';
 
 export { default as DomConverter } from './view/domconverter';
 export { default as Renderer } from './view/renderer';
 export { default as ViewDocument } from './view/document';
+export { default as ViewText } from './view/text';
+export { default as ViewElement } from './view/element';
+export { default as ViewContainerElement } from './view/containerelement';
+export { default as ViewAttributeElement } from './view/attributeelement';
+export { default as ViewEmptyElement } from './view/emptyelement';
+export { default as ViewRawElement } from './view/rawelement';
+export { default as ViewUIElement } from './view/uielement';
+export { default as ViewDocumentFragment } from './view/documentfragment';
 
 export { getFillerOffset } from './view/containerelement';
 export { default as Observer } from './view/observer/observer';

package/src/model/differ.js

@@ -336,23 +336,27 @@ export default class Differ {
 	 * @returns {Boolean}
 	 */
 	hasDataChanges() {
+		if ( this._changesInElement.size > 0 ) {
+			return true;
+		}
+
 		for ( const { newMarkerData, oldMarkerData } of this._changedMarkers.values() ) {
 			if ( newMarkerData.affectsData !== oldMarkerData.affectsData ) {
 				return true;
 			}
 
 			if ( newMarkerData.affectsData ) {
-				// Skip markers, which ranges have not changed.
-				if ( newMarkerData.range && oldMarkerData.range && newMarkerData.range.isEqual( oldMarkerData.range ) ) {
-					return false;
-				}
+				const markerAdded = newMarkerData.range && !oldMarkerData.range;
+				const markerRemoved = !newMarkerData.range && oldMarkerData.range;
+				const markerChanged = newMarkerData.range && oldMarkerData.range && !newMarkerData.range.isEqual( oldMarkerData.range );
 
-				return true;
+				if ( markerAdded || markerRemoved || markerChanged ) {
+					return true;
+				}
 			}
 		}
 
-		// If markers do not affect the data, check whether there are some changes in elements.
-		return this._changesInElement.size > 0;
+		return false;
 	}
 
 	/**
@@ -419,12 +423,12 @@ export default class Differ {
 			for ( const action of actions ) {
 				if ( action === 'i' ) {
 					// Generate diff item for this element and insert it into the diff set.
-					diffSet.push( this._getInsertDiff( element, i, elementChildren[ i ].name ) );
+					diffSet.push( this._getInsertDiff( element, i, elementChildren[ i ] ) );
 
 					i++;
 				} else if ( action === 'r' ) {
 					// Generate diff item for this element and insert it into the diff set.
-					diffSet.push( this._getRemoveDiff( element, i, snapshotChildren[ j ].name ) );
+					diffSet.push( this._getRemoveDiff( element, i, snapshotChildren[ j ] ) );
 
 					j++;
 				} else if ( action === 'a' ) {
@@ -925,14 +929,15 @@ export default class Differ {
 	 * @private
 	 * @param {module:engine/model/element~Element} parent The element in which the change happened.
 	 * @param {Number} offset The offset at which change happened.
-	 * @param {String} name The name of the removed element or `'$text'` for a character.
+	 * @param {Object} elementSnapshot The snapshot of the removed element a character.
 	 * @returns {Object} The diff item.
 	 */
-	_getInsertDiff( parent, offset, name ) {
+	_getInsertDiff( parent, offset, elementSnapshot ) {
 		return {
 			type: 'insert',
 			position: Position._createAt( parent, offset ),
-			name,
+			name: elementSnapshot.name,
+			attributes: new Map( elementSnapshot.attributes ),
 			length: 1,
 			changeCount: this._changeCount++
 		};
@@ -944,14 +949,15 @@ export default class Differ {
 	 * @private
 	 * @param {module:engine/model/element~Element} parent The element in which change happened.
 	 * @param {Number} offset The offset at which change happened.
-	 * @param {String} name The name of the removed element or `'$text'` for a character.
+	 * @param {Object} elementSnapshot The snapshot of the removed element a character.
 	 * @returns {Object} The diff item.
 	 */
-	_getRemoveDiff( parent, offset, name ) {
+	_getRemoveDiff( parent, offset, elementSnapshot ) {
 		return {
 			type: 'remove',
 			position: Position._createAt( parent, offset ),
-			name,
+			name: elementSnapshot.name,
+			attributes: new Map( elementSnapshot.attributes ),
 			length: 1,
 			changeCount: this._changeCount++
 		};
@@ -1229,6 +1235,12 @@ function _changesInGraveyardFilter( entry ) {
  * @member {String} module:engine/model/differ~DiffItemInsert#name
  */
 
+/**
+ * Map of attributes that were set on the item while it was inserted.
+ *
+ * @member {Map.<String,*>} module:engine/model/differ~DiffItemInsert#attributes
+ */
+
 /**
  * The position where the node was inserted.
  *
@@ -1260,6 +1272,12 @@ function _changesInGraveyardFilter( entry ) {
  * @member {String} module:engine/model/differ~DiffItemRemove#name
  */
 
+/**
+ * Map of attributes that were set on the item while it was removed.
+ *
+ * @member {Map.<String,*>} module:engine/model/differ~DiffItemRemove#attributes
+ */
+
 /**
  * The position where the node was removed.
  *

package/src/model/document.js

@@ -52,24 +52,13 @@ export default class Document {
 		 */
 		this.model = model;
 
-		/**
-		 * The document version. It starts from `0` and every operation increases the version number. It is used to ensure that
-		 * operations are applied on a proper document version.
-		 *
-		 * If the {@link module:engine/model/operation/operation~Operation#baseVersion base version} does not match the document version,
-		 * a {@link module:utils/ckeditorerror~CKEditorError model-document-applyoperation-wrong-version} error is thrown.
-		 *
-		 * @type {Number}
-		 */
-		this.version = 0;
-
 		/**
 		 * The document's history.
 		 *
 		 * @readonly
 		 * @type {module:engine/model/history~History}
 		 */
-		this.history = new History( this );
+		this.history = new History();
 
 		/**
 		 * The selection in this document.
@@ -115,21 +104,6 @@ export default class Document {
 		// Graveyard tree root. Document always have a graveyard root, which stores removed nodes.
 		this.createRoot( '$root', graveyardName );
 
-		// First, if the operation is a document operation check if it's base version is correct.
-		this.listenTo( model, 'applyOperation', ( evt, args ) => {
-			const operation = args[ 0 ];
-
-			if ( operation.isDocumentOperation && operation.baseVersion !== this.version ) {
-				/**
-				 * Only operations with matching versions can be applied.
-				 *
-				 * @error model-document-applyoperation-wrong-version
-				 * @param {module:engine/model/operation/operation~Operation} operation
-				 */
-				throw new CKEditorError( 'model-document-applyoperation-wrong-version', this, { operation } );
-			}
-		}, { priority: 'highest' } );
-
 		// Then, still before an operation is applied on model, buffer the change in differ.
 		this.listenTo( model, 'applyOperation', ( evt, args ) => {
 			const operation = args[ 0 ];
@@ -144,7 +118,6 @@ export default class Document {
 			const operation = args[ 0 ];
 
 			if ( operation.isDocumentOperation ) {
-				this.version++;
 				this.history.addOperation( operation );
 			}
 		}, { priority: 'low' } );
@@ -179,6 +152,25 @@ export default class Document {
 		} );
 	}
 
+	/**
+	 * The document version. Every applied operation increases the version number. It is used to
+	 * ensure that operations are applied on a proper document version.
+	 *
+	 * This property is equal to {@link module:engine/model/history~History#version `model.Document#history#version`}.
+	 *
+	 * If the {@link module:engine/model/operation/operation~Operation#baseVersion base version} does not match the document version,
+	 * a {@link module:utils/ckeditorerror~CKEditorError model-document-applyoperation-wrong-version} error is thrown.
+	 *
+	 * @type {Number}
+	 */
+	get version() {
+		return this.history.version;
+	}
+
+	set version( version ) {
+		this.history.version = version;
+	}
+
 	/**
 	 * The graveyard tree root. A document always has a graveyard root that stores removed nodes.
 	 *