@ckeditor/ckeditor5-engine 45.2.1-alpha.9 → 46.0.0-alpha.0

package/src/conversion/modelconsumable.d.ts

@@ -5,19 +5,19 @@
 /**
  * @module engine/conversion/modelconsumable
  */
-import TextProxy from '../model/textproxy.js';
-import type Item from '../model/item.js';
-import type Selection from '../model/selection.js';
-import type DocumentSelection from '../model/documentselection.js';
-import type Range from '../model/range.js';
+import { ModelTextProxy } from '../model/textproxy.js';
+import { type ModelItem } from '../model/item.js';
+import { type ModelSelection } from '../model/selection.js';
+import { type ModelDocumentSelection } from '../model/documentselection.js';
+import { type ModelRange } from '../model/range.js';
 /**
- * Manages a list of consumable values for the {@link module:engine/model/item~Item model items}.
+ * Manages a list of consumable values for the {@link module:engine/model/item~ModelItem model items}.
  *
  * Consumables are various aspects of the model. A model item can be broken down into separate, single properties that might be
  * taken into consideration when converting that item.
  *
  * `ModelConsumable` is used by {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher} while analyzing the changed
- * parts of {@link module:engine/model/document~Document the document}. The added / changed / removed model items are broken down
+ * parts of {@link module:engine/model/document~ModelDocument the document}. The added / changed / removed model items are broken down
  * into singular properties (the item itself and its attributes). All those parts are saved in `ModelConsumable`. Then,
  * during conversion, when the given part of a model item is converted (i.e. the view element has been inserted into the view,
  * but without attributes), the consumable value is removed from `ModelConsumable`.
@@ -90,18 +90,18 @@ import type Range from '../model/range.js';
  * } );
  * ```
  */
-export default class ModelConsumable {
+export declare class ModelConsumable {
     /**
      * Contains list of consumable values.
      */
     private _consumable;
     /**
-     * For each {@link module:engine/model/textproxy~TextProxy} added to `ModelConsumable`, this registry holds a parent
-     * of that `TextProxy` and the start and end indices of that `TextProxy`. This allows identification of the `TextProxy`
-     * instances that point to the same part of the model but are different instances. Each distinct `TextProxy`
+     * For each {@link module:engine/model/textproxy~ModelTextProxy} added to `ModelConsumable`, this registry holds a parent
+     * of that `ModelTextProxy` and the start and end indices of that `ModelTextProxy`. This allows identification of the `ModelTextProxy`
+     * instances that point to the same part of the model but are different instances. Each distinct `ModelTextProxy`
      * is given a unique `Symbol` which is then registered as consumable. This process is transparent for the `ModelConsumable`
-     * API user because whenever `TextProxy` is added, tested, consumed or reverted, the internal mechanisms of
-     * `ModelConsumable` translate `TextProxy` to that unique `Symbol`.
+     * API user because whenever `ModelTextProxy` is added, tested, consumed or reverted, the internal mechanisms of
+     * `ModelConsumable` translate `ModelTextProxy` to that unique `Symbol`.
      */
     private _textProxyRegistry;
     /**
@@ -119,7 +119,7 @@ export default class ModelConsumable {
      * @param type Consumable type. Will be normalized to a proper form, that is either `<word>` or `<part>:<part>`.
      * Second colon and everything after will be cut. Passing event name is a safe and good practice.
      */
-    add(item: Item | Selection | DocumentSelection | Range, type: string): void;
+    add(item: ModelItem | ModelSelection | ModelDocumentSelection | ModelRange, type: string): void;
     /**
      * Removes a given consumable value from a given model item.
      *
@@ -136,7 +136,7 @@ export default class ModelConsumable {
      * Second colon and everything after will be cut. Passing event name is a safe and good practice.
      * @returns `true` if consumable value was available and was consumed, `false` otherwise.
      */
-    consume(item: Item | Selection | DocumentSelection | Range, type: string): boolean;
+    consume(item: ModelItem | ModelSelection | ModelDocumentSelection | ModelRange, type: string): boolean;
     /**
      * Tests whether there is a consumable value of a given type connected with a given model item.
      *
@@ -154,7 +154,7 @@ export default class ModelConsumable {
      * @returns `null` if such consumable was never added, `false` if the consumable values was
      * already consumed or `true` if it was added and not consumed yet.
      */
-    test(item: Item | Selection | DocumentSelection | Range, type: string): boolean | null;
+    test(item: ModelItem | ModelSelection | ModelDocumentSelection | ModelRange, type: string): boolean | null;
     /**
      * Reverts consuming of a consumable value.
      *
@@ -171,7 +171,7 @@ export default class ModelConsumable {
      * @returns `true` if consumable has been reversed, `false` otherwise. `null` if the consumable has
      * never been added.
      */
-    revert(item: Item | Selection | DocumentSelection | Range, type: string): boolean | null;
+    revert(item: ModelItem | ModelSelection | ModelDocumentSelection | ModelRange, type: string): boolean | null;
     /**
      * Verifies if all events from the specified group were consumed.
      *
@@ -179,23 +179,23 @@ export default class ModelConsumable {
      */
     verifyAllConsumed(eventGroup: string): void;
     /**
-     * Gets a unique symbol for the passed {@link module:engine/model/textproxy~TextProxy} instance. All `TextProxy` instances that
-     * have same parent, same start index and same end index will get the same symbol.
+     * Gets a unique symbol for the passed {@link module:engine/model/textproxy~ModelTextProxy} instance.
+     * All `ModelTextProxy` instances that have same parent, same start index and same end index will get the same symbol.
      *
-     * Used internally to correctly consume `TextProxy` instances.
+     * Used internally to correctly consume `ModelTextProxy` instances.
      *
      * @internal
-     * @param textProxy `TextProxy` instance to get a symbol for.
-     * @returns Symbol representing all equal instances of `TextProxy`.
+     * @param textProxy `ModelTextProxy` instance to get a symbol for.
+     * @returns Symbol representing all equal instances of `ModelTextProxy`.
      */
-    _getSymbolForTextProxy(textProxy: TextProxy): symbol;
+    _getSymbolForTextProxy(textProxy: ModelTextProxy): symbol;
     /**
-     * Adds a symbol for the given {@link module:engine/model/textproxy~TextProxy} instance.
+     * Adds a symbol for the given {@link module:engine/model/textproxy~ModelTextProxy} instance.
      *
-     * Used internally to correctly consume `TextProxy` instances.
+     * Used internally to correctly consume `ModelTextProxy` instances.
      *
      * @param textProxy Text proxy instance.
-     * @returns Symbol generated for given `TextProxy`.
+     * @returns Symbol generated for given `ModelTextProxy`.
      */
     private _addSymbolForTextProxy;
 }

package/src/conversion/modelconsumable.js

@@ -5,16 +5,16 @@
 /**
  * @module engine/conversion/modelconsumable
  */
-import TextProxy from '../model/textproxy.js';
+import { ModelTextProxy } from '../model/textproxy.js';
 import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
- * Manages a list of consumable values for the {@link module:engine/model/item~Item model items}.
+ * Manages a list of consumable values for the {@link module:engine/model/item~ModelItem model items}.
  *
  * Consumables are various aspects of the model. A model item can be broken down into separate, single properties that might be
  * taken into consideration when converting that item.
  *
  * `ModelConsumable` is used by {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher} while analyzing the changed
- * parts of {@link module:engine/model/document~Document the document}. The added / changed / removed model items are broken down
+ * parts of {@link module:engine/model/document~ModelDocument the document}. The added / changed / removed model items are broken down
  * into singular properties (the item itself and its attributes). All those parts are saved in `ModelConsumable`. Then,
  * during conversion, when the given part of a model item is converted (i.e. the view element has been inserted into the view,
  * but without attributes), the consumable value is removed from `ModelConsumable`.
@@ -87,18 +87,18 @@ import { CKEditorError } from '@ckeditor/ckeditor5-utils';
  * } );
  * ```
  */
-export default class ModelConsumable {
+export class ModelConsumable {
     /**
      * Contains list of consumable values.
      */
     _consumable = new Map();
     /**
-     * For each {@link module:engine/model/textproxy~TextProxy} added to `ModelConsumable`, this registry holds a parent
-     * of that `TextProxy` and the start and end indices of that `TextProxy`. This allows identification of the `TextProxy`
-     * instances that point to the same part of the model but are different instances. Each distinct `TextProxy`
+     * For each {@link module:engine/model/textproxy~ModelTextProxy} added to `ModelConsumable`, this registry holds a parent
+     * of that `ModelTextProxy` and the start and end indices of that `ModelTextProxy`. This allows identification of the `ModelTextProxy`
+     * instances that point to the same part of the model but are different instances. Each distinct `ModelTextProxy`
      * is given a unique `Symbol` which is then registered as consumable. This process is transparent for the `ModelConsumable`
-     * API user because whenever `TextProxy` is added, tested, consumed or reverted, the internal mechanisms of
-     * `ModelConsumable` translate `TextProxy` to that unique `Symbol`.
+     * API user because whenever `ModelTextProxy` is added, tested, consumed or reverted, the internal mechanisms of
+     * `ModelConsumable` translate `ModelTextProxy` to that unique `Symbol`.
      */
     _textProxyRegistry = new Map();
     /**
@@ -118,7 +118,7 @@ export default class ModelConsumable {
      */
     add(item, type) {
         type = _normalizeConsumableType(type);
-        if (item instanceof TextProxy) {
+        if (item instanceof ModelTextProxy) {
             item = this._getSymbolForTextProxy(item);
         }
         if (!this._consumable.has(item)) {
@@ -144,7 +144,7 @@ export default class ModelConsumable {
      */
     consume(item, type) {
         type = _normalizeConsumableType(type);
-        if (item instanceof TextProxy) {
+        if (item instanceof ModelTextProxy) {
             item = this._getSymbolForTextProxy(item);
         }
         if (this.test(item, type)) {
@@ -174,7 +174,7 @@ export default class ModelConsumable {
      */
     test(item, type) {
         type = _normalizeConsumableType(type);
-        if (item instanceof TextProxy) {
+        if (item instanceof ModelTextProxy) {
             item = this._getSymbolForTextProxy(item);
         }
         const itemConsumables = this._consumable.get(item);
@@ -205,7 +205,7 @@ export default class ModelConsumable {
      */
     revert(item, type) {
         type = _normalizeConsumableType(type);
-        if (item instanceof TextProxy) {
+        if (item instanceof ModelTextProxy) {
             item = this._getSymbolForTextProxy(item);
         }
         const test = this.test(item, type);
@@ -238,7 +238,7 @@ export default class ModelConsumable {
         }
         if (items.length) {
             /**
-             * Some of the {@link module:engine/model/item~Item model items} were not consumed while downcasting the model to view.
+             * Some of the {@link module:engine/model/item~ModelItem model items} were not consumed while downcasting the model to view.
              *
              * This might be the effect of:
              *
@@ -251,20 +251,20 @@ export default class ModelConsumable {
              * attributes and child nodes.
              *
              * @error conversion-model-consumable-not-consumed
-             * @param {Array.<module:engine/model/item~Item>} items Items that were not consumed.
+             * @param {Array.<module:engine/model/item~ModelItem>} items Items that were not consumed.
              */
             throw new CKEditorError('conversion-model-consumable-not-consumed', null, { items });
         }
     }
     /**
-     * Gets a unique symbol for the passed {@link module:engine/model/textproxy~TextProxy} instance. All `TextProxy` instances that
-     * have same parent, same start index and same end index will get the same symbol.
+     * Gets a unique symbol for the passed {@link module:engine/model/textproxy~ModelTextProxy} instance.
+     * All `ModelTextProxy` instances that have same parent, same start index and same end index will get the same symbol.
      *
-     * Used internally to correctly consume `TextProxy` instances.
+     * Used internally to correctly consume `ModelTextProxy` instances.
      *
      * @internal
-     * @param textProxy `TextProxy` instance to get a symbol for.
-     * @returns Symbol representing all equal instances of `TextProxy`.
+     * @param textProxy `ModelTextProxy` instance to get a symbol for.
+     * @returns Symbol representing all equal instances of `ModelTextProxy`.
      */
     _getSymbolForTextProxy(textProxy) {
         let symbol = null;
@@ -281,12 +281,12 @@ export default class ModelConsumable {
         return symbol;
     }
     /**
-     * Adds a symbol for the given {@link module:engine/model/textproxy~TextProxy} instance.
+     * Adds a symbol for the given {@link module:engine/model/textproxy~ModelTextProxy} instance.
      *
-     * Used internally to correctly consume `TextProxy` instances.
+     * Used internally to correctly consume `ModelTextProxy` instances.
      *
      * @param textProxy Text proxy instance.
-     * @returns Symbol generated for given `TextProxy`.
+     * @returns Symbol generated for given `ModelTextProxy`.
      */
     _addSymbolForTextProxy(textProxy) {
         const start = textProxy.startOffset;

package/src/conversion/upcastdispatcher.d.ts

@@ -5,40 +5,40 @@
 /**
  * @module engine/conversion/upcastdispatcher
  */
-import ViewConsumable from './viewconsumable.js';
-import ModelRange from '../model/range.js';
-import ModelPosition from '../model/position.js';
-import type ModelElement from '../model/element.js';
-import type ModelNode from '../model/node.js';
-import type ViewElement from '../view/element.js';
-import type ViewText from '../view/text.js';
-import type ViewDocumentFragment from '../view/documentfragment.js';
-import type ModelDocumentFragment from '../model/documentfragment.js';
-import type { default as Schema, SchemaContextDefinition } from '../model/schema.js';
-import type ModelWriter from '../model/writer.js';
-import type ViewItem from '../view/item.js';
+import { ViewConsumable } from './viewconsumable.js';
+import { ModelRange } from '../model/range.js';
+import { ModelPosition } from '../model/position.js';
+import { type ModelElement } from '../model/element.js';
+import { type ModelNode } from '../model/node.js';
+import { type ViewElement } from '../view/element.js';
+import { type ViewText } from '../view/text.js';
+import { type ViewDocumentFragment } from '../view/documentfragment.js';
+import { type ModelDocumentFragment } from '../model/documentfragment.js';
+import type { ModelSchema, ModelSchemaContextDefinition } from '../model/schema.js';
+import { type ModelWriter } from '../model/writer.js';
+import { type ViewItem } from '../view/item.js';
 declare const UpcastDispatcher_base: {
     new (): import("@ckeditor/ckeditor5-utils").Emitter;
     prototype: import("@ckeditor/ckeditor5-utils").Emitter;
 };
 /**
  * Upcast dispatcher is a central point of the view-to-model conversion, which is a process of
- * converting a given {@link module:engine/view/documentfragment~DocumentFragment view document fragment} or
- * {@link module:engine/view/element~Element view element} into a correct model structure.
+ * converting a given {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment} or
+ * {@link module:engine/view/element~ViewElement view element} into a correct model structure.
  *
- * During the conversion process, the dispatcher fires events for all {@link module:engine/view/node~Node view nodes}
+ * During the conversion process, the dispatcher fires events for all {@link module:engine/view/node~ViewNode view nodes}
  * from the converted view document fragment.
  * Special callbacks called "converters" should listen to these events in order to convert the view nodes.
  *
  * The second parameter of the callback is the `data` object with the following properties:
  *
- * * `data.viewItem` contains a {@link module:engine/view/node~Node view node} or a
- * {@link module:engine/view/documentfragment~DocumentFragment view document fragment}
+ * * `data.viewItem` contains a {@link module:engine/view/node~ViewNode view node} or a
+ * {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment}
  * that is converted at the moment and might be handled by the callback.
  * * `data.modelRange` is used to point to the result
  * of the current conversion (e.g. the element that is being inserted)
- * and is always a {@link module:engine/model/range~Range} when the conversion succeeds.
- * * `data.modelCursor` is a {@link module:engine/model/position~Position position} on which the converter should insert
+ * and is always a {@link module:engine/model/range~ModelRange} when the conversion succeeds.
+ * * `data.modelCursor` is a {@link module:engine/model/position~ModelPosition position} on which the converter should insert
  * the newly created items.
  *
  * The third parameter of the callback is an instance of {@link module:engine/conversion/upcastdispatcher~UpcastConversionApi}
@@ -117,7 +117,7 @@ declare const UpcastDispatcher_base: {
  * @fires text
  * @fires documentFragment
  */
-export default class UpcastDispatcher extends /* #__PURE__ */ UpcastDispatcher_base {
+export declare class UpcastDispatcher extends /* #__PURE__ */ UpcastDispatcher_base {
     /**
      * An interface passed by the dispatcher to the event callbacks.
      */
@@ -165,9 +165,9 @@ export default class UpcastDispatcher extends /* #__PURE__ */ UpcastDispatcher_b
      * @param context Elements will be converted according to this context.
      * @returns Model data that is the result of the conversion process
      * wrapped in `DocumentFragment`. Converted marker elements will be set as the document fragment's
-     * {@link module:engine/model/documentfragment~DocumentFragment#markers static markers map}.
+     * {@link module:engine/model/documentfragment~ModelDocumentFragment#markers static markers map}.
      */
-    convert(viewElement: ViewElement | ViewDocumentFragment, writer: ModelWriter, context?: SchemaContextDefinition): ModelDocumentFragment;
+    convert(viewElement: ViewElement | ViewDocumentFragment, writer: ModelWriter, context?: ModelSchemaContextDefinition): ModelDocumentFragment;
     /**
      * @see module:engine/conversion/upcastdispatcher~UpcastConversionApi#convertItem
      */
@@ -247,7 +247,7 @@ export interface UpcastConversionData<TItem extends ViewItem | ViewDocumentFragm
     modelRange: ModelRange | null;
 }
 /**
- * Fired when an {@link module:engine/view/element~Element} is converted.
+ * Fired when an {@link module:engine/view/element~ViewElement} is converted.
  *
  * `element` is a namespace event for a class of events. Names of actually called events follow the pattern of
  * `element:<elementName>` where `elementName` is the name of the converted element. This way listeners may listen to
@@ -261,14 +261,14 @@ export interface UpcastConversionData<TItem extends ViewItem | ViewDocumentFragm
  */
 export type UpcastElementEvent = UpcastEvent<'element', ViewElement>;
 /**
- * Fired when a {@link module:engine/view/text~Text} is converted.
+ * Fired when a {@link module:engine/view/text~ViewText} is converted.
  *
  * @eventName ~UpcastDispatcher#text
  * @see ~UpcastDispatcher#event:element
  */
 export type UpcastTextEvent = UpcastEvent<'text', ViewText>;
 /**
- * Fired when a {@link module:engine/view/documentfragment~DocumentFragment} is converted.
+ * Fired when a {@link module:engine/view/documentfragment~ViewDocumentFragment} is converted.
  *
  * @eventName ~UpcastDispatcher#documentFragment
  * @see ~UpcastDispatcher#event:element
@@ -288,9 +288,9 @@ export interface UpcastConversionApi {
     /**
      * The model's schema instance.
      */
-    schema: Schema;
+    schema: ModelSchema;
     /**
-     * The {@link module:engine/model/writer~Writer} instance used to manipulate the data during conversion.
+     * The {@link module:engine/model/writer~ModelWriter} instance used to manipulate the data during conversion.
      */
     writer: ModelWriter;
     /**
@@ -307,7 +307,7 @@ export interface UpcastConversionApi {
      *
      * Every fired event is passed (as the first parameter) an object with the `modelRange` property. Every event may set and/or
      * modify that property. When all callbacks are done, the final value of the `modelRange` property is returned by this method.
-     * The `modelRange` must be a {@link module:engine/model/range~Range model range} or `null` (as set by default).
+     * The `modelRange` must be a {@link module:engine/model/range~ModelRange model range} or `null` (as set by default).
      *
      * @fires module:engine/conversion/upcastdispatcher~UpcastDispatcher#event:element
      * @fires module:engine/conversion/upcastdispatcher~UpcastDispatcher#event:text
@@ -342,7 +342,8 @@ export interface UpcastConversionApi {
         modelCursor: ModelPosition;
     };
     /**
-     * Safely inserts an element to the document, checking the {@link module:engine/model/schema~Schema schema} to find an allowed parent
+     * Safely inserts an element to the document, checking the
+     * {@link module:engine/model/schema~ModelSchema schema} to find an allowed parent
      * for an element that you are going to insert, starting from the given position. If the current parent does not allow to insert
      * the element but one of the ancestors does, then splits the nodes to allowed parent.
      *
@@ -403,9 +404,9 @@ export interface UpcastConversionApi {
      */
     updateConversionResult(modelElement: ModelElement, data: UpcastConversionData): void;
     /**
-     * Checks the {@link module:engine/model/schema~Schema schema} to find an allowed parent for an element that is going to be inserted
-     * starting from the given position. If the current parent does not allow inserting an element but one of the ancestors does, the method
-     * splits nodes to allowed parent.
+     * Checks the {@link module:engine/model/schema~ModelSchema schema} to find an allowed parent for an element
+     * that is going to be inserted starting from the given position. If the current parent does not allow
+     * inserting an element but one of the ancestors does, the method splits nodes to allowed parent.
      *
      * If the schema allows inserting the node in the given position, nothing is split and an object with that position is returned.
      *

package/src/conversion/upcastdispatcher.js

@@ -5,30 +5,30 @@
 /**
  * @module engine/conversion/upcastdispatcher
  */
-import ViewConsumable from './viewconsumable.js';
-import ModelRange from '../model/range.js';
-import ModelPosition from '../model/position.js';
-import { SchemaContext } from '../model/schema.js'; // eslint-disable-line no-duplicate-imports
+import { ViewConsumable } from './viewconsumable.js';
+import { ModelRange } from '../model/range.js';
+import { ModelPosition } from '../model/position.js';
+import { ModelSchemaContext } from '../model/schema.js'; // eslint-disable-line no-duplicate-imports
 import { isParagraphable, wrapInParagraph } from '../model/utils/autoparagraphing.js';
 import { CKEditorError, EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * Upcast dispatcher is a central point of the view-to-model conversion, which is a process of
- * converting a given {@link module:engine/view/documentfragment~DocumentFragment view document fragment} or
- * {@link module:engine/view/element~Element view element} into a correct model structure.
+ * converting a given {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment} or
+ * {@link module:engine/view/element~ViewElement view element} into a correct model structure.
  *
- * During the conversion process, the dispatcher fires events for all {@link module:engine/view/node~Node view nodes}
+ * During the conversion process, the dispatcher fires events for all {@link module:engine/view/node~ViewNode view nodes}
  * from the converted view document fragment.
  * Special callbacks called "converters" should listen to these events in order to convert the view nodes.
  *
  * The second parameter of the callback is the `data` object with the following properties:
  *
- * * `data.viewItem` contains a {@link module:engine/view/node~Node view node} or a
- * {@link module:engine/view/documentfragment~DocumentFragment view document fragment}
+ * * `data.viewItem` contains a {@link module:engine/view/node~ViewNode view node} or a
+ * {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment}
  * that is converted at the moment and might be handled by the callback.
  * * `data.modelRange` is used to point to the result
  * of the current conversion (e.g. the element that is being inserted)
- * and is always a {@link module:engine/model/range~Range} when the conversion succeeds.
- * * `data.modelCursor` is a {@link module:engine/model/position~Position position} on which the converter should insert
+ * and is always a {@link module:engine/model/range~ModelRange} when the conversion succeeds.
+ * * `data.modelCursor` is a {@link module:engine/model/position~ModelPosition position} on which the converter should insert
  * the newly created items.
  *
  * The third parameter of the callback is an instance of {@link module:engine/conversion/upcastdispatcher~UpcastConversionApi}
@@ -107,7 +107,7 @@ import { CKEditorError, EmitterMixin } from '@ckeditor/ckeditor5-utils';
  * @fires text
  * @fires documentFragment
  */
-export default class UpcastDispatcher extends /* #__PURE__ */ EmitterMixin() {
+export class UpcastDispatcher extends /* #__PURE__ */ EmitterMixin() {
     /**
      * An interface passed by the dispatcher to the event callbacks.
      */
@@ -171,7 +171,7 @@ export default class UpcastDispatcher extends /* #__PURE__ */ EmitterMixin() {
      * @param context Elements will be converted according to this context.
      * @returns Model data that is the result of the conversion process
      * wrapped in `DocumentFragment`. Converted marker elements will be set as the document fragment's
-     * {@link module:engine/model/documentfragment~DocumentFragment#markers static markers map}.
+     * {@link module:engine/model/documentfragment~ModelDocumentFragment#markers static markers map}.
      */
     convert(viewElement, writer, context = ['$root']) {
         this.fire('viewCleanup', viewElement);
@@ -231,7 +231,7 @@ export default class UpcastDispatcher extends /* #__PURE__ */ EmitterMixin() {
             /**
              * Incorrect conversion result was dropped.
              *
-             * {@link module:engine/model/range~Range Model range} should be a conversion result.
+             * {@link module:engine/model/range~ModelRange Model range} should be a conversion result.
              *
              * @error view-conversion-dispatcher-incorrect-result
              */
@@ -416,7 +416,7 @@ export default class UpcastDispatcher extends /* #__PURE__ */ EmitterMixin() {
 }
 /**
  * Traverses given model item and searches elements which marks marker range. Found element is removed from
- * DocumentFragment but path of this element is stored in a Map which is then returned.
+ * ModelDocumentFragment but path of this element is stored in a Map which is then returned.
  *
  * @param modelItem Fragment of model.
  * @returns List of static markers.
@@ -426,14 +426,14 @@ function extractMarkersFromModelFragment(modelItem, writer) {
     const markers = new Map();
     // Create ModelTreeWalker.
     const range = ModelRange._createIn(modelItem).getItems();
-    // Walk through DocumentFragment and collect marker elements.
+    // Walk through ModelDocumentFragment and collect marker elements.
     for (const item of range) {
         // Check if current element is a marker.
         if (item.is('element', '$marker')) {
             markerElements.add(item);
         }
     }
-    // Walk through collected marker elements store its path and remove its from the DocumentFragment.
+    // Walk through collected marker elements store its path and remove its from the ModelDocumentFragment.
     for (const markerElement of markerElements) {
         const markerName = markerElement.getAttribute('data-name');
         const currentPosition = writer.createPositionBefore(markerElement);
@@ -445,7 +445,7 @@ function extractMarkersFromModelFragment(modelItem, writer) {
         else {
             markers.get(markerName).end = currentPosition.clone();
         }
-        // Remove marker element from DocumentFragment.
+        // Remove marker element from ModelDocumentFragment.
         writer.remove(markerElement);
     }
     return markers;
@@ -455,7 +455,7 @@ function extractMarkersFromModelFragment(modelItem, writer) {
  */
 function createContextTree(contextDefinition, writer) {
     let position;
-    for (const item of new SchemaContext(contextDefinition)) {
+    for (const item of new ModelSchemaContext(contextDefinition)) {
         const attributes = {};
         for (const key of item.getAttributeKeys()) {
             attributes[key] = item.getAttribute(key);