@ckeditor/ckeditor5-engine 34.2.0 → 35.1.0

package/src/model/markercollection.js

@@ -2,16 +2,14 @@
  * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
+/* eslint-disable new-cap */
 /**
  * @module engine/model/markercollection
  */
-
+import TypeCheckable from './typecheckable';
 import LiveRange from './liverange';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import EmitterMixin, { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
 import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import mix from '@ckeditor/ckeditor5-utils/src/mix';
-
 /**
  * The collection of all {@link module:engine/model/markercollection~Marker markers} attached to the document.
  * It lets you {@link module:engine/model/markercollection~MarkerCollection#get get} markers or track them using
@@ -26,269 +24,218 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
  *
  * @see module:engine/model/markercollection~Marker
  */
-export default class MarkerCollection {
-	/**
-	 * Creates a markers collection.
-	 */
-	constructor() {
-		/**
-		 * Stores {@link ~Marker markers} added to the collection.
-		 *
-		 * @private
-		 * @member {Map} #_markers
-		 */
-		this._markers = new Map();
-	}
-
-	/**
-	 * Iterable interface.
-	 *
-	 * Iterates over all {@link ~Marker markers} added to the collection.
-	 *
-	 * @returns {Iterable}
-	 */
-	[ Symbol.iterator ]() {
-		return this._markers.values();
-	}
-
-	/**
-	 * Checks if given {@link ~Marker marker} or marker name is in the collection.
-	 *
-	 * @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( markerOrName ) {
-		const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
-		return this._markers.has( markerName );
-	}
-
-	/**
-	 * Returns {@link ~Marker marker} with given `markerName`.
-	 *
-	 * @param {String} markerName Name of marker to get.
-	 * @returns {module:engine/model/markercollection~Marker|null} Marker with given name or `null` if such marker was
-	 * not added to the collection.
-	 */
-	get( markerName ) {
-		return this._markers.get( markerName ) || null;
-	}
-
-	/**
-	 * Creates and adds a {@link ~Marker marker} to the `MarkerCollection` with given name on given
-	 * {@link module:engine/model/range~Range range}.
-	 *
-	 * If `MarkerCollection` already had a marker with given name (or {@link ~Marker marker} was passed), the marker in
-	 * collection is updated and {@link module:engine/model/markercollection~MarkerCollection#event:update} event is fired
-	 * but only if there was a change (marker range or {@link module:engine/model/markercollection~Marker#managedUsingOperations}
-	 * flag has changed.
-	 *
-	 * @protected
-	 * @fires module:engine/model/markercollection~MarkerCollection#event:update
-	 * @param {String|module:engine/model/markercollection~Marker} markerOrName Name of marker to set or marker instance to update.
-	 * @param {module:engine/model/range~Range} range Marker range.
-	 * @param {Boolean} [managedUsingOperations=false] Specifies whether the marker is managed using operations.
-	 * @param {Boolean} [affectsData=false] Specifies whether the marker affects the data produced by the data pipeline
-	 * (is persisted in the editor's data).
-	 * @returns {module:engine/model/markercollection~Marker} `Marker` instance which was added or updated.
-	 */
-	_set( markerOrName, range, managedUsingOperations = false, affectsData = false ) {
-		const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
-
-		if ( markerName.includes( ',' ) ) {
-			/**
-			 * Marker name cannot contain the "," character.
-			 *
-			 * @error markercollection-incorrect-marker-name
-			 */
-			throw new CKEditorError( 'markercollection-incorrect-marker-name', this );
-		}
-
-		const oldMarker = this._markers.get( markerName );
-
-		if ( oldMarker ) {
-			const oldMarkerData = oldMarker.getData();
-
-			const oldRange = oldMarker.getRange();
-			let hasChanged = false;
-
-			if ( !oldRange.isEqual( range ) ) {
-				oldMarker._attachLiveRange( LiveRange.fromRange( range ) );
-				hasChanged = true;
-			}
-
-			if ( managedUsingOperations != oldMarker.managedUsingOperations ) {
-				oldMarker._managedUsingOperations = managedUsingOperations;
-				hasChanged = true;
-			}
-
-			if ( typeof affectsData === 'boolean' && affectsData != oldMarker.affectsData ) {
-				oldMarker._affectsData = affectsData;
-				hasChanged = true;
-			}
-
-			if ( hasChanged ) {
-				this.fire( 'update:' + markerName, oldMarker, oldRange, range, oldMarkerData );
-			}
-
-			return oldMarker;
-		}
-
-		const liveRange = LiveRange.fromRange( range );
-		const marker = new Marker( markerName, liveRange, managedUsingOperations, affectsData );
-
-		this._markers.set( markerName, marker );
-		this.fire( 'update:' + markerName, marker, null, range, { ...marker.getData(), range: null } );
-
-		return marker;
-	}
-
-	/**
-	 * Removes given {@link ~Marker marker} or a marker with given name from the `MarkerCollection`.
-	 *
-	 * @protected
-	 * @fires module:engine/model/markercollection~MarkerCollection#event:update
-	 * @param {String} markerOrName Marker or name of a marker to remove.
-	 * @returns {Boolean} `true` if marker was found and removed, `false` otherwise.
-	 */
-	_remove( markerOrName ) {
-		const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
-		const oldMarker = this._markers.get( markerName );
-
-		if ( oldMarker ) {
-			this._markers.delete( markerName );
-			this.fire( 'update:' + markerName, oldMarker, oldMarker.getRange(), null, oldMarker.getData() );
-
-			this._destroyMarker( oldMarker );
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Fires an {@link module:engine/model/markercollection~MarkerCollection#event:update} event for the given {@link ~Marker marker}
-	 * but does not change the marker. Useful to force {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher downcast
-	 * conversion} for the marker.
-	 *
-	 * @protected
-	 * @fires module:engine/model/markercollection~MarkerCollection#event:update
-	 * @param {String} markerOrName Marker or name of a marker to refresh.
-	 */
-	_refresh( markerOrName ) {
-		const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
-		const marker = this._markers.get( markerName );
-
-		if ( !marker ) {
-			/**
-			 * Marker with provided name does not exists.
-			 *
-			 * @error markercollection-refresh-marker-not-exists
-			 */
-			throw new CKEditorError( 'markercollection-refresh-marker-not-exists', this );
-		}
-
-		const range = marker.getRange();
-
-		this.fire( 'update:' + markerName, marker, range, range, marker.getData() );
-	}
-
-	/**
-	 * Returns iterator that iterates over all markers, which ranges contain given {@link module:engine/model/position~Position position}.
-	 *
-	 * @param {module:engine/model/position~Position} position
-	 * @returns {Iterable.<module:engine/model/markercollection~Marker>}
-	 */
-	* getMarkersAtPosition( position ) {
-		for ( const marker of this ) {
-			if ( marker.getRange().containsPosition( position ) ) {
-				yield marker;
-			}
-		}
-	}
-
-	/**
-	 * Returns iterator that iterates over all markers, which intersects with given {@link module:engine/model/range~Range range}.
-	 *
-	 * @param {module:engine/model/range~Range} range
-	 * @returns {Iterable.<module:engine/model/markercollection~Marker>}
-	 */
-	* getMarkersIntersectingRange( range ) {
-		for ( const marker of this ) {
-			if ( marker.getRange().getIntersection( range ) !== null ) {
-				yield marker;
-			}
-		}
-	}
-
-	/**
-	 * Destroys marker collection and all markers inside it.
-	 */
-	destroy() {
-		for ( const marker of this._markers.values() ) {
-			this._destroyMarker( marker );
-		}
-
-		this._markers = null;
-
-		this.stopListening();
-	}
-
-	/**
-	 * Iterates over all markers that starts with given `prefix`.
-	 *
-	 *		const markerFooA = markersCollection.set( 'foo:a', rangeFooA );
-	 *		const markerFooB = markersCollection.set( 'foo:b', rangeFooB );
-	 *		const markerBarA = markersCollection.set( 'bar:a', rangeBarA );
-	 *		const markerFooBarA = markersCollection.set( 'foobar:a', rangeFooBarA );
-	 *		Array.from( markersCollection.getMarkersGroup( 'foo' ) ); // [ markerFooA, markerFooB ]
-	 *		Array.from( markersCollection.getMarkersGroup( 'a' ) ); // []
-	 *
-	 * @param prefix
-	 * @returns {Iterable.<module:engine/model/markercollection~Marker>}
-	 */
-	* getMarkersGroup( prefix ) {
-		for ( const marker of this._markers.values() ) {
-			if ( marker.name.startsWith( prefix + ':' ) ) {
-				yield marker;
-			}
-		}
-	}
-
-	/**
-	 * Destroys the marker.
-	 *
-	 * @private
-	 * @param {module:engine/model/markercollection~Marker} marker Marker to destroy.
-	 */
-	_destroyMarker( marker ) {
-		marker.stopListening();
-		marker._detachLiveRange();
-	}
-
-	/**
-	 * Fired whenever marker is added, updated or removed from `MarkerCollection`.
-	 *
-	 * @event update
-	 * @param {module:engine/model/markercollection~Marker} marker Updated Marker.
-	 * @param {module:engine/model/range~Range|null} oldRange Marker range before the update. When is not defined it
-	 * means that marker is just added.
-	 * @param {module:engine/model/range~Range|null} newRange Marker range after update. When is not defined it
-	 * means that marker is just removed.
-	 * @param {module:engine/model/markercollection~MarkerData} oldMarkerData Data of the marker before the change.
-	 */
+export default class MarkerCollection extends Emitter {
+    /**
+     * Creates a markers collection.
+     */
+    constructor() {
+        super();
+        /**
+         * Stores {@link ~Marker markers} added to the collection.
+         *
+         * @private
+         * @member {Map} #_markers
+         */
+        this._markers = new Map();
+    }
+    /**
+     * Iterable interface.
+     *
+     * Iterates over all {@link ~Marker markers} added to the collection.
+     *
+     * @returns {Iterator}
+     */
+    [Symbol.iterator]() {
+        return this._markers.values();
+    }
+    /**
+     * Checks if given {@link ~Marker marker} or marker name is in the collection.
+     *
+     * @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(markerOrName) {
+        const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
+        return this._markers.has(markerName);
+    }
+    /**
+     * Returns {@link ~Marker marker} with given `markerName`.
+     *
+     * @param {String} markerName Name of marker to get.
+     * @returns {module:engine/model/markercollection~Marker|null} Marker with given name or `null` if such marker was
+     * not added to the collection.
+     */
+    get(markerName) {
+        return this._markers.get(markerName) || null;
+    }
+    /**
+     * Creates and adds a {@link ~Marker marker} to the `MarkerCollection` with given name on given
+     * {@link module:engine/model/range~Range range}.
+     *
+     * If `MarkerCollection` already had a marker with given name (or {@link ~Marker marker} was passed), the marker in
+     * collection is updated and {@link module:engine/model/markercollection~MarkerCollection#event:update} event is fired
+     * but only if there was a change (marker range or {@link module:engine/model/markercollection~Marker#managedUsingOperations}
+     * flag has changed.
+     *
+     * @internal
+     * @protected
+     * @fires module:engine/model/markercollection~MarkerCollection#event:update
+     * @param {String|module:engine/model/markercollection~Marker} markerOrName Name of marker to set or marker instance to update.
+     * @param {module:engine/model/range~Range} range Marker range.
+     * @param {Boolean} [managedUsingOperations=false] Specifies whether the marker is managed using operations.
+     * @param {Boolean} [affectsData=false] Specifies whether the marker affects the data produced by the data pipeline
+     * (is persisted in the editor's data).
+     * @returns {module:engine/model/markercollection~Marker} `Marker` instance which was added or updated.
+     */
+    _set(markerOrName, range, managedUsingOperations = false, affectsData = false) {
+        const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
+        if (markerName.includes(',')) {
+            /**
+             * Marker name cannot contain the "," character.
+             *
+             * @error markercollection-incorrect-marker-name
+             */
+            throw new CKEditorError('markercollection-incorrect-marker-name', this);
+        }
+        const oldMarker = this._markers.get(markerName);
+        if (oldMarker) {
+            const oldMarkerData = oldMarker.getData();
+            const oldRange = oldMarker.getRange();
+            let hasChanged = false;
+            if (!oldRange.isEqual(range)) {
+                oldMarker._attachLiveRange(LiveRange.fromRange(range));
+                hasChanged = true;
+            }
+            if (managedUsingOperations != oldMarker.managedUsingOperations) {
+                oldMarker._managedUsingOperations = managedUsingOperations;
+                hasChanged = true;
+            }
+            if (typeof affectsData === 'boolean' && affectsData != oldMarker.affectsData) {
+                oldMarker._affectsData = affectsData;
+                hasChanged = true;
+            }
+            if (hasChanged) {
+                this.fire(`update:${markerName}`, oldMarker, oldRange, range, oldMarkerData);
+            }
+            return oldMarker;
+        }
+        const liveRange = LiveRange.fromRange(range);
+        const marker = new Marker(markerName, liveRange, managedUsingOperations, affectsData);
+        this._markers.set(markerName, marker);
+        this.fire(`update:${markerName}`, marker, null, range, { ...marker.getData(), range: null });
+        return marker;
+    }
+    /**
+     * Removes given {@link ~Marker marker} or a marker with given name from the `MarkerCollection`.
+     *
+     * @internal
+     * @protected
+     * @fires module:engine/model/markercollection~MarkerCollection#event:update
+     * @param {String|module:engine/model/markercollection~Marker} markerOrName Marker or name of a marker to remove.
+     * @returns {Boolean} `true` if marker was found and removed, `false` otherwise.
+     */
+    _remove(markerOrName) {
+        const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
+        const oldMarker = this._markers.get(markerName);
+        if (oldMarker) {
+            this._markers.delete(markerName);
+            this.fire(`update:${markerName}`, oldMarker, oldMarker.getRange(), null, oldMarker.getData());
+            this._destroyMarker(oldMarker);
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Fires an {@link module:engine/model/markercollection~MarkerCollection#event:update} event for the given {@link ~Marker marker}
+     * but does not change the marker. Useful to force {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher downcast
+     * conversion} for the marker.
+     *
+     * @internal
+     * @protected
+     * @fires module:engine/model/markercollection~MarkerCollection#event:update
+     * @param {String|module:engine/model/markercollection~Marker} markerOrName Marker or name of a marker to refresh.
+     */
+    _refresh(markerOrName) {
+        const markerName = markerOrName instanceof Marker ? markerOrName.name : markerOrName;
+        const marker = this._markers.get(markerName);
+        if (!marker) {
+            /**
+             * Marker with provided name does not exists.
+             *
+             * @error markercollection-refresh-marker-not-exists
+             */
+            throw new CKEditorError('markercollection-refresh-marker-not-exists', this);
+        }
+        const range = marker.getRange();
+        this.fire(`update:${markerName}`, marker, range, range, marker.getData());
+    }
+    /**
+     * Returns iterator that iterates over all markers, which ranges contain given {@link module:engine/model/position~Position position}.
+     *
+     * @param {module:engine/model/position~Position} position
+     * @returns {Iterable.<module:engine/model/markercollection~Marker>}
+     */
+    *getMarkersAtPosition(position) {
+        for (const marker of this) {
+            if (marker.getRange().containsPosition(position)) {
+                yield marker;
+            }
+        }
+    }
+    /**
+     * Returns iterator that iterates over all markers, which intersects with given {@link module:engine/model/range~Range range}.
+     *
+     * @param {module:engine/model/range~Range} range
+     * @returns {Iterable.<module:engine/model/markercollection~Marker>}
+     */
+    *getMarkersIntersectingRange(range) {
+        for (const marker of this) {
+            if (marker.getRange().getIntersection(range) !== null) {
+                yield marker;
+            }
+        }
+    }
+    /**
+     * Destroys marker collection and all markers inside it.
+     */
+    destroy() {
+        for (const marker of this._markers.values()) {
+            this._destroyMarker(marker);
+        }
+        this._markers = null;
+        this.stopListening();
+    }
+    /**
+     * Iterates over all markers that starts with given `prefix`.
+     *
+     *		const markerFooA = markersCollection.set( 'foo:a', rangeFooA );
+     *		const markerFooB = markersCollection.set( 'foo:b', rangeFooB );
+     *		const markerBarA = markersCollection.set( 'bar:a', rangeBarA );
+     *		const markerFooBarA = markersCollection.set( 'foobar:a', rangeFooBarA );
+     *		Array.from( markersCollection.getMarkersGroup( 'foo' ) ); // [ markerFooA, markerFooB ]
+     *		Array.from( markersCollection.getMarkersGroup( 'a' ) ); // []
+     *
+     * @param prefix
+     * @returns {Iterable.<module:engine/model/markercollection~Marker>}
+     */
+    *getMarkersGroup(prefix) {
+        for (const marker of this._markers.values()) {
+            if (marker.name.startsWith(prefix + ':')) {
+                yield marker;
+            }
+        }
+    }
+    /**
+     * Destroys the marker.
+     *
+     * @private
+     * @param {module:engine/model/markercollection~Marker} marker Marker to destroy.
+     */
+    _destroyMarker(marker) {
+        marker.stopListening();
+        marker._detachLiveRange();
+    }
 }
-
-mix( MarkerCollection, EmitterMixin );
-
-/**
- * @typedef {Object} module:engine/model/markercollection~MarkerData
- *
- * @property {module:engine/model/range~Range|null} range Marker range. `null` if the marker was removed.
- * @property {Boolean} affectsData A property defining if the marker affects data.
- * @property {Boolean} managedUsingOperations A property defining if the marker is managed using operations.
- */
-
 /**
  * `Marker` is a continuous parts of model (like a range), is named and represent some kind of information about marked
  * part of model document. In contrary to {@link module:engine/model/node~Node nodes}, which are building blocks of
@@ -356,220 +303,172 @@ mix( MarkerCollection, EmitterMixin );
  *
  * `Marker` instances are created and destroyed only by {@link ~MarkerCollection MarkerCollection}.
  */
-class Marker {
-	/**
-	 * Creates a marker instance.
-	 *
-	 * @param {String} name Marker name.
-	 * @param {module:engine/model/liverange~LiveRange} liveRange Range marked by the marker.
-	 * @param {Boolean} managedUsingOperations Specifies whether the marker is managed using operations.
-	 * @param {Boolean} affectsData Specifies whether the marker affects the data produced by the data pipeline
-	 * (is persisted in the editor's data).
-	 */
-	constructor( name, liveRange, managedUsingOperations, affectsData ) {
-		/**
-		 * Marker's name.
-		 *
-		 * @readonly
-		 * @type {String}
-		 */
-		this.name = name;
-
-		/**
-		 * Range marked by the marker.
-		 *
-		 * @protected
-		 * @member {module:engine/model/liverange~LiveRange}
-		 */
-		this._liveRange = this._attachLiveRange( liveRange );
-
-		/**
-		 * Flag indicates if the marker is managed using operations or not.
-		 *
-		 * @private
-		 * @member {Boolean}
-		 */
-		this._managedUsingOperations = managedUsingOperations;
-
-		/**
-		 * Specifies whether the marker affects the data produced by the data pipeline
-		 * (is persisted in the editor's data).
-		 *
-		 * @private
-		 * @member {Boolean}
-		 */
-		this._affectsData = affectsData;
-	}
-
-	/**
-	 * A value indicating if the marker is managed using operations.
-	 * See {@link ~Marker marker class description} to learn more about marker types.
-	 * See {@link module:engine/model/writer~Writer#addMarker}.
-	 *
-	 * @returns {Boolean}
-	 */
-	get managedUsingOperations() {
-		if ( !this._liveRange ) {
-			throw new CKEditorError( 'marker-destroyed', this );
-		}
-
-		return this._managedUsingOperations;
-	}
-
-	/**
-	 * A value indicating if the marker changes the data.
-	 *
-	 * @returns {Boolean}
-	 */
-	get affectsData() {
-		if ( !this._liveRange ) {
-			throw new CKEditorError( 'marker-destroyed', this );
-		}
-
-		return this._affectsData;
-	}
-
-	/**
-	 * Returns the marker data (properties defining the marker).
-	 *
-	 * @returns {module:engine/model/markercollection~MarkerData}
-	 */
-	getData() {
-		return {
-			range: this.getRange(),
-			affectsData: this.affectsData,
-			managedUsingOperations: this.managedUsingOperations
-		};
-	}
-
-	/**
-	 * Returns current marker start position.
-	 *
-	 * @returns {module:engine/model/position~Position}
-	 */
-	getStart() {
-		if ( !this._liveRange ) {
-			throw new CKEditorError( 'marker-destroyed', this );
-		}
-
-		return this._liveRange.start.clone();
-	}
-
-	/**
-	 * Returns current marker end position.
-	 *
-	 * @returns {module:engine/model/position~Position}
-	 */
-	getEnd() {
-		if ( !this._liveRange ) {
-			throw new CKEditorError( 'marker-destroyed', this );
-		}
-
-		return this._liveRange.end.clone();
-	}
-
-	/**
-	 * Returns a range that represents the current state of the marker.
-	 *
-	 * Keep in mind that returned value is a {@link module:engine/model/range~Range Range}, not a
-	 * {@link module:engine/model/liverange~LiveRange LiveRange}. This means that it is up-to-date and relevant only
-	 * until next model document change. Do not store values returned by this method. Instead, store {@link ~Marker#name}
-	 * and get `Marker` instance from {@link module:engine/model/markercollection~MarkerCollection MarkerCollection} every
-	 * time there is a need to read marker properties. This will guarantee that the marker has not been removed and
-	 * that it's data is up-to-date.
-	 *
-	 * @returns {module:engine/model/range~Range}
-	 */
-	getRange() {
-		if ( !this._liveRange ) {
-			throw new CKEditorError( 'marker-destroyed', this );
-		}
-
-		return this._liveRange.toRange();
-	}
-
-	/**
-	 * Checks whether this object is of the given.
-	 *
-	 *		marker.is( 'marker' ); // -> true
-	 *		marker.is( 'model:marker' ); // -> true
-	 *
-	 *		marker.is( 'view:element' ); // -> false
-	 *		marker.is( 'documentSelection' ); // -> false
-	 *
-	 * {@link module:engine/model/node~Node#is Check the entire list of model objects} which implement the `is()` method.
-	 *
-	 * @param {String} type
-	 * @returns {Boolean}
-	 */
-	is( type ) {
-		return type === 'marker' || type === 'model:marker';
-	}
-
-	/**
-	 * Binds new live range to the marker and detach the old one if is attached.
-	 *
-	 * @protected
-	 * @param {module:engine/model/liverange~LiveRange} liveRange Live range to attach
-	 * @returns {module:engine/model/liverange~LiveRange} Attached live range.
-	 */
-	_attachLiveRange( liveRange ) {
-		if ( this._liveRange ) {
-			this._detachLiveRange();
-		}
-
-		// Delegating does not work with namespaces. Alternatively, we could delegate all events (using `*`).
-		liveRange.delegate( 'change:range' ).to( this );
-		liveRange.delegate( 'change:content' ).to( this );
-
-		this._liveRange = liveRange;
-
-		return liveRange;
-	}
-
-	/**
-	 * Unbinds and destroys currently attached live range.
-	 *
-	 * @protected
-	 */
-	_detachLiveRange() {
-		this._liveRange.stopDelegating( 'change:range', this );
-		this._liveRange.stopDelegating( 'change:content', this );
-		this._liveRange.detach();
-		this._liveRange = null;
-	}
-
-	/**
-	 * Fired whenever {@link ~Marker#_liveRange marker range} is changed due to changes on {@link module:engine/model/document~Document}.
-	 * This is a delegated {@link module:engine/model/liverange~LiveRange#event:change:range LiveRange change:range event}.
-	 *
-	 * When marker is removed from {@link module:engine/model/markercollection~MarkerCollection MarkerCollection},
-	 * all event listeners listening to it should be removed. It is best to do it on
-	 * {@link module:engine/model/markercollection~MarkerCollection#event:update MarkerCollection update event}.
-	 *
-	 * @see module:engine/model/liverange~LiveRange#event:change:range
-	 * @event change:range
-	 * @param {module:engine/model/range~Range} oldRange
-	 * @param {Object} data
-	 */
-
-	/**
-	 * Fired whenever change on {@link module:engine/model/document~Document} is done inside {@link ~Marker#_liveRange marker range}.
-	 * This is a delegated {@link module:engine/model/liverange~LiveRange#event:change:content LiveRange change:content event}.
-	 *
-	 * When marker is removed from {@link module:engine/model/markercollection~MarkerCollection MarkerCollection},
-	 * all event listeners listening to it should be removed. It is best to do it on
-	 * {@link module:engine/model/markercollection~MarkerCollection#event:update MarkerCollection update event}.
-	 *
-	 * @see module:engine/model/liverange~LiveRange#event:change:content
-	 * @event change:content
-	 * @param {module:engine/model/range~Range} oldRange
-	 * @param {Object} data
-	 */
+class Marker extends EmitterMixin(TypeCheckable) {
+    /**
+     * Creates a marker instance.
+     *
+     * @param {String} name Marker name.
+     * @param {module:engine/model/liverange~LiveRange} liveRange Range marked by the marker.
+     * @param {Boolean} managedUsingOperations Specifies whether the marker is managed using operations.
+     * @param {Boolean} affectsData Specifies whether the marker affects the data produced by the data pipeline
+     * (is persisted in the editor's data).
+     */
+    constructor(name, liveRange, managedUsingOperations, affectsData) {
+        super();
+        /**
+         * Marker's name.
+         *
+         * @readonly
+         * @type {String}
+         */
+        this.name = name;
+        /**
+         * Range marked by the marker.
+         *
+         * @protected
+         * @member {module:engine/model/liverange~LiveRange}
+         */
+        this._liveRange = this._attachLiveRange(liveRange);
+        /**
+         * Flag indicates if the marker is managed using operations or not.
+         *
+         * @private
+         * @member {Boolean}
+         */
+        this._managedUsingOperations = managedUsingOperations;
+        /**
+         * Specifies whether the marker affects the data produced by the data pipeline
+         * (is persisted in the editor's data).
+         *
+         * @private
+         * @member {Boolean}
+         */
+        this._affectsData = affectsData;
+    }
+    /**
+     * A value indicating if the marker is managed using operations.
+     * See {@link ~Marker marker class description} to learn more about marker types.
+     * See {@link module:engine/model/writer~Writer#addMarker}.
+     *
+     * @returns {Boolean}
+     */
+    get managedUsingOperations() {
+        if (!this._liveRange) {
+            throw new CKEditorError('marker-destroyed', this);
+        }
+        return this._managedUsingOperations;
+    }
+    /**
+     * A value indicating if the marker changes the data.
+     *
+     * @returns {Boolean}
+     */
+    get affectsData() {
+        if (!this._liveRange) {
+            throw new CKEditorError('marker-destroyed', this);
+        }
+        return this._affectsData;
+    }
+    /**
+     * Returns the marker data (properties defining the marker).
+     *
+     * @returns {module:engine/model/markercollection~MarkerData}
+     */
+    getData() {
+        return {
+            range: this.getRange(),
+            affectsData: this.affectsData,
+            managedUsingOperations: this.managedUsingOperations
+        };
+    }
+    /**
+     * Returns current marker start position.
+     *
+     * @returns {module:engine/model/position~Position}
+     */
+    getStart() {
+        if (!this._liveRange) {
+            throw new CKEditorError('marker-destroyed', this);
+        }
+        return this._liveRange.start.clone();
+    }
+    /**
+     * Returns current marker end position.
+     *
+     * @returns {module:engine/model/position~Position}
+     */
+    getEnd() {
+        if (!this._liveRange) {
+            throw new CKEditorError('marker-destroyed', this);
+        }
+        return this._liveRange.end.clone();
+    }
+    /**
+     * Returns a range that represents the current state of the marker.
+     *
+     * Keep in mind that returned value is a {@link module:engine/model/range~Range Range}, not a
+     * {@link module:engine/model/liverange~LiveRange LiveRange}. This means that it is up-to-date and relevant only
+     * until next model document change. Do not store values returned by this method. Instead, store {@link ~Marker#name}
+     * and get `Marker` instance from {@link module:engine/model/markercollection~MarkerCollection MarkerCollection} every
+     * time there is a need to read marker properties. This will guarantee that the marker has not been removed and
+     * that it's data is up-to-date.
+     *
+     * @returns {module:engine/model/range~Range}
+     */
+    getRange() {
+        if (!this._liveRange) {
+            throw new CKEditorError('marker-destroyed', this);
+        }
+        return this._liveRange.toRange();
+    }
+    /**
+     * Binds new live range to the marker and detach the old one if is attached.
+     *
+     * @internal
+     * @protected
+     * @param {module:engine/model/liverange~LiveRange} liveRange Live range to attach
+     * @returns {module:engine/model/liverange~LiveRange} Attached live range.
+     */
+    _attachLiveRange(liveRange) {
+        if (this._liveRange) {
+            this._detachLiveRange();
+        }
+        // Delegating does not work with namespaces. Alternatively, we could delegate all events (using `*`).
+        liveRange.delegate('change:range').to(this);
+        liveRange.delegate('change:content').to(this);
+        this._liveRange = liveRange;
+        return liveRange;
+    }
+    /**
+     * Unbinds and destroys currently attached live range.
+     *
+     * @internal
+     * @protected
+     */
+    _detachLiveRange() {
+        this._liveRange.stopDelegating('change:range', this);
+        this._liveRange.stopDelegating('change:content', this);
+        this._liveRange.detach();
+        this._liveRange = null;
+    }
 }
-
-mix( Marker, EmitterMixin );
-
+/**
+ * Checks whether this object is of the given.
+ *
+ *		marker.is( 'marker' ); // -> true
+ *		marker.is( 'model:marker' ); // -> true
+ *
+ *		marker.is( 'view:element' ); // -> false
+ *		marker.is( 'documentSelection' ); // -> false
+ *
+ * {@link module:engine/model/node~Node#is Check the entire list of model objects} which implement the `is()` method.
+ *
+ * @param {String} type
+ * @returns {Boolean}
+ */
+Marker.prototype.is = function (type) {
+    return type === 'marker' || type === 'model:marker';
+};
 /**
  * Cannot use a {@link module:engine/model/markercollection~MarkerCollection#destroy destroyed marker} instance.
  *