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

package/src/conversion/upcasthelpers.d.ts

@@ -2,15 +2,15 @@
  * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
-import { type ClassPatterns, type MatcherPattern, type PropertyPatterns } from '../view/matcher.js';
-import ConversionHelpers from './conversionhelpers.js';
-import type { default as UpcastDispatcher, UpcastConversionApi, UpcastConversionData } from './upcastdispatcher.js';
-import type ModelElement from '../model/element.js';
+import { type MatchClassPatterns, type MatcherPattern, type MatchPropertyPatterns } from '../view/matcher.js';
+import { ConversionHelpers } from './conversionhelpers.js';
+import type { UpcastDispatcher, UpcastConversionApi, UpcastConversionData } from './upcastdispatcher.js';
+import { type ModelElement } from '../model/element.js';
 import type { ViewDocumentFragment, ViewElement, ViewText } from '../index.js';
-import type Mapper from './mapper.js';
-import type Model from '../model/model.js';
-import type ViewSelection from '../view/selection.js';
-import type ViewDocumentSelection from '../view/documentselection.js';
+import { type Mapper } from './mapper.js';
+import { type Model } from '../model/model.js';
+import { type ViewSelection } from '../view/selection.js';
+import { type ViewDocumentSelection } from '../view/documentselection.js';
 import { type EventInfo, type PriorityString } from '@ckeditor/ckeditor5-utils';
 /**
  * Contains the {@link module:engine/view/view view} to {@link module:engine/model/model model} converters for
@@ -25,7 +25,7 @@ import { type EventInfo, type PriorityString } from '@ckeditor/ckeditor5-utils';
  *
  * @extends module:engine/conversion/conversionhelpers~ConversionHelpers
  */
-export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
+export declare class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
     /**
      * View element to model element conversion helper.
      *
@@ -33,7 +33,7 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      * view `<p>Foo</p>` becomes `<paragraph>Foo</paragraph>` in the model.
      *
      * Keep in mind that the element will be inserted only if it is allowed
-     * by {@link module:engine/model/schema~Schema schema} configuration.
+     * by {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).elementToElement( {
@@ -81,14 +81,14 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      */
     elementToElement(config: {
         view: MatcherPattern;
-        model: string | ElementCreatorFunction;
+        model: string | UpcastElementCreatorFunction;
         converterPriority?: PriorityString;
     }): this;
     /**
      * View element to model attribute conversion helper.
      *
      * This conversion results in setting an attribute on a model node. For example, view `<strong>Foo</strong>` becomes
-     * `Foo` {@link module:engine/model/text~Text model text node} with `bold` attribute set to `true`.
+     * `Foo` {@link module:engine/model/text~ModelText model text node} with `bold` attribute set to `true`.
      *
      * This helper is meant to set a model attribute on all the elements that are inside the converted element:
      *
@@ -100,7 +100,8 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      * Even though `<strong>` is over `<p>` element, `bold="true"` was added to the text. See
      * {@link module:engine/conversion/upcasthelpers~UpcastHelpers#attributeToAttribute} for comparison.
      *
-     * Keep in mind that the attribute will be set only if it is allowed by {@link module:engine/model/schema~Schema schema} configuration.
+     * Keep in mind that the attribute will be set only if it is allowed by
+     * {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).elementToAttribute( {
@@ -201,7 +202,8 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      * Above is a sample of HTML code, that goes through autoparagraphing (first step) and then is converted (second step).
      * Even though `<strong>` is over `<p>` element, `bold="true"` was added to the text.
      *
-     * Keep in mind that the attribute will be set only if it is allowed by {@link module:engine/model/schema~Schema schema} configuration.
+     * Keep in mind that the attribute will be set only if it is allowed by
+     * {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).attributeToAttribute( {
@@ -308,14 +310,13 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
             name?: string;
         } | {
             name?: string | RegExp;
-            styles?: PropertyPatterns;
-            classes?: ClassPatterns;
-            attributes?: PropertyPatterns;
+            styles?: MatchPropertyPatterns;
+            classes?: MatchClassPatterns;
+            attributes?: MatchPropertyPatterns;
         };
         model: string | {
             key: string;
             value: unknown | ((viewElement: ViewElement, conversionApi: UpcastConversionApi, data: UpcastConversionData<ViewElement>) => unknown);
-            name?: string;
         };
         converterPriority?: PriorityString;
     }): this;
@@ -372,7 +373,7 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      */
     elementToMarker(config: {
         view: MatcherPattern;
-        model: string | MarkerFromElementCreatorFunction;
+        model: string | UpcastMarkerFromElementCreatorFunction;
         converterPriority?: PriorityString;
     }): this;
     /**
@@ -448,36 +449,42 @@ export default class UpcastHelpers extends ConversionHelpers<UpcastDispatcher> {
      */
     dataToMarker(config: {
         view: string;
-        model?: MarkerFromAttributeCreatorFunction;
+        model?: UpcastMarkerFromAttributeCreatorFunction;
         converterPriority?: PriorityString;
     }): this;
 }
 /**
- * Function factory, creates a converter that converts {@link module:engine/view/documentfragment~DocumentFragment view document fragment}
- * or all children of {@link module:engine/view/element~Element} into
- * {@link module:engine/model/documentfragment~DocumentFragment model document fragment}.
+ * Function factory, creates a converter that converts
+ * {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment}
+ * or all children of {@link module:engine/view/element~ViewElement} into
+ * {@link module:engine/model/documentfragment~ModelDocumentFragment model document fragment}.
  * This is the "entry-point" converter for upcast (view to model conversion). This converter starts the conversion of all children
- * of passed view document fragment. Those children {@link module:engine/view/node~Node view nodes} are then handled by other converters.
+ * of passed view document fragment. Those children {@link module:engine/view/node~ViewNode view nodes} are then
+ * handled by other converters.
  *
  * This also a "default", last resort converter for all view elements that has not been converted by other converters.
  * When a view element is being converted to the model but it does not have converter specified, that view element
- * will be converted to {@link module:engine/model/documentfragment~DocumentFragment model document fragment} and returned.
+ * will be converted to {@link module:engine/model/documentfragment~ModelDocumentFragment model document fragment} and returned.
+ *
+ * @returns Universal converter for view {@link module:engine/view/documentfragment~ViewDocumentFragment fragments} and
+ * {@link module:engine/view/element~ViewElement elements} that returns
+ * {@link module:engine/model/documentfragment~ModelDocumentFragment model fragment} with children of converted view item.
  *
- * @returns Universal converter for view {@link module:engine/view/documentfragment~DocumentFragment fragments} and
- * {@link module:engine/view/element~Element elements} that returns
- * {@link module:engine/model/documentfragment~DocumentFragment model fragment} with children of converted view item.
+ * @internal
  */
 export declare function convertToModelFragment(): (evt: EventInfo, data: UpcastConversionData<ViewElement | ViewDocumentFragment>, conversionApi: UpcastConversionApi) => void;
 /**
- * Function factory, creates a converter that converts {@link module:engine/view/text~Text} to {@link module:engine/model/text~Text}.
+ * Function factory, creates a converter that converts
+ * {@link module:engine/view/text~ViewText} to {@link module:engine/model/text~ModelText}.
  *
- * @returns {@link module:engine/view/text~Text View text} converter.
+ * @returns {@link module:engine/view/text~ViewText View text} converter.
+ * @internal
  */
 export declare function convertText(): (evt: EventInfo, data: UpcastConversionData<ViewText>, { schema, consumable, writer }: UpcastConversionApi) => void;
 /**
- * Function factory, creates a callback function which converts a {@link module:engine/view/selection~Selection
- * view selection} taken from the {@link module:engine/view/document~Document#event:selectionChange} event
- * and sets in on the {@link module:engine/model/document~Document#selection model}.
+ * Function factory, creates a callback function which converts a {@link module:engine/view/selection~ViewSelection
+ * view selection} taken from the {@link module:engine/view/document~ViewDocument#event:selectionChange} event
+ * and sets in on the {@link module:engine/model/document~ModelDocument#selection model}.
  *
  * **Note**: because there is no view selection change dispatcher nor any other advanced view selection to model
  * conversion mechanism, the callback should be set directly on view document.
@@ -488,12 +495,13 @@ export declare function convertText(): (evt: EventInfo, data: UpcastConversionDa
  *
  * @param model Data model.
  * @param mapper Conversion mapper.
- * @returns {@link module:engine/view/document~Document#event:selectionChange} callback function.
+ * @returns {@link module:engine/view/document~ViewDocument#event:selectionChange} callback function.
+ * @internal
  */
 export declare function convertSelectionChange(model: Model, mapper: Mapper): (evt: EventInfo, data: {
     newSelection: ViewSelection | ViewDocumentSelection;
 }) => void;
-export type ElementCreatorFunction = (viewElement: ViewElement, conversionApi: UpcastConversionApi) => ModelElement | null;
-export type AttributeCreatorFunction = (modelElement: ModelElement, conversionApi: UpcastConversionApi) => unknown;
-export type MarkerFromElementCreatorFunction = (viewElement: ViewElement, conversionApi: UpcastConversionApi) => string;
-export type MarkerFromAttributeCreatorFunction = (attributeValue: string, conversionApi: UpcastConversionApi) => string;
+export type UpcastElementCreatorFunction = (viewElement: ViewElement, conversionApi: UpcastConversionApi) => ModelElement | null;
+export type UpcastAttributeCreatorFunction = (modelElement: ModelElement, conversionApi: UpcastConversionApi) => unknown;
+export type UpcastMarkerFromElementCreatorFunction = (viewElement: ViewElement, conversionApi: UpcastConversionApi) => string;
+export type UpcastMarkerFromAttributeCreatorFunction = (attributeValue: string, conversionApi: UpcastConversionApi) => string;

package/src/conversion/upcasthelpers.js

@@ -2,8 +2,8 @@
  * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
-import Matcher from '../view/matcher.js';
-import ConversionHelpers from './conversionhelpers.js';
+import { Matcher } from '../view/matcher.js';
+import { ConversionHelpers } from './conversionhelpers.js';
 import { isParagraphable, wrapInParagraph } from '../model/utils/autoparagraphing.js';
 import { priorities } from '@ckeditor/ckeditor5-utils';
 import { cloneDeep } from 'es-toolkit/compat';
@@ -20,7 +20,7 @@ import { cloneDeep } from 'es-toolkit/compat';
  *
  * @extends module:engine/conversion/conversionhelpers~ConversionHelpers
  */
-export default class UpcastHelpers extends ConversionHelpers {
+export class UpcastHelpers extends ConversionHelpers {
     /**
      * View element to model element conversion helper.
      *
@@ -28,7 +28,7 @@ export default class UpcastHelpers extends ConversionHelpers {
      * view `<p>Foo</p>` becomes `<paragraph>Foo</paragraph>` in the model.
      *
      * Keep in mind that the element will be inserted only if it is allowed
-     * by {@link module:engine/model/schema~Schema schema} configuration.
+     * by {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).elementToElement( {
@@ -81,7 +81,7 @@ export default class UpcastHelpers extends ConversionHelpers {
      * View element to model attribute conversion helper.
      *
      * This conversion results in setting an attribute on a model node. For example, view `<strong>Foo</strong>` becomes
-     * `Foo` {@link module:engine/model/text~Text model text node} with `bold` attribute set to `true`.
+     * `Foo` {@link module:engine/model/text~ModelText model text node} with `bold` attribute set to `true`.
      *
      * This helper is meant to set a model attribute on all the elements that are inside the converted element:
      *
@@ -93,7 +93,8 @@ export default class UpcastHelpers extends ConversionHelpers {
      * Even though `<strong>` is over `<p>` element, `bold="true"` was added to the text. See
      * {@link module:engine/conversion/upcasthelpers~UpcastHelpers#attributeToAttribute} for comparison.
      *
-     * Keep in mind that the attribute will be set only if it is allowed by {@link module:engine/model/schema~Schema schema} configuration.
+     * Keep in mind that the attribute will be set only if it is allowed by
+     * {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).elementToAttribute( {
@@ -189,7 +190,8 @@ export default class UpcastHelpers extends ConversionHelpers {
      * Above is a sample of HTML code, that goes through autoparagraphing (first step) and then is converted (second step).
      * Even though `<strong>` is over `<p>` element, `bold="true"` was added to the text.
      *
-     * Keep in mind that the attribute will be set only if it is allowed by {@link module:engine/model/schema~Schema schema} configuration.
+     * Keep in mind that the attribute will be set only if it is allowed by
+     * {@link module:engine/model/schema~ModelSchema schema} configuration.
      *
      * ```ts
      * editor.conversion.for( 'upcast' ).attributeToAttribute( {
@@ -422,19 +424,23 @@ export default class UpcastHelpers extends ConversionHelpers {
     }
 }
 /**
- * Function factory, creates a converter that converts {@link module:engine/view/documentfragment~DocumentFragment view document fragment}
- * or all children of {@link module:engine/view/element~Element} into
- * {@link module:engine/model/documentfragment~DocumentFragment model document fragment}.
+ * Function factory, creates a converter that converts
+ * {@link module:engine/view/documentfragment~ViewDocumentFragment view document fragment}
+ * or all children of {@link module:engine/view/element~ViewElement} into
+ * {@link module:engine/model/documentfragment~ModelDocumentFragment model document fragment}.
  * This is the "entry-point" converter for upcast (view to model conversion). This converter starts the conversion of all children
- * of passed view document fragment. Those children {@link module:engine/view/node~Node view nodes} are then handled by other converters.
+ * of passed view document fragment. Those children {@link module:engine/view/node~ViewNode view nodes} are then
+ * handled by other converters.
  *
  * This also a "default", last resort converter for all view elements that has not been converted by other converters.
  * When a view element is being converted to the model but it does not have converter specified, that view element
- * will be converted to {@link module:engine/model/documentfragment~DocumentFragment model document fragment} and returned.
+ * will be converted to {@link module:engine/model/documentfragment~ModelDocumentFragment model document fragment} and returned.
  *
- * @returns Universal converter for view {@link module:engine/view/documentfragment~DocumentFragment fragments} and
- * {@link module:engine/view/element~Element elements} that returns
- * {@link module:engine/model/documentfragment~DocumentFragment model fragment} with children of converted view item.
+ * @returns Universal converter for view {@link module:engine/view/documentfragment~ViewDocumentFragment fragments} and
+ * {@link module:engine/view/element~ViewElement elements} that returns
+ * {@link module:engine/model/documentfragment~ModelDocumentFragment model fragment} with children of converted view item.
+ *
+ * @internal
  */
 export function convertToModelFragment() {
     return (evt, data, conversionApi) => {
@@ -447,9 +453,11 @@ export function convertToModelFragment() {
     };
 }
 /**
- * Function factory, creates a converter that converts {@link module:engine/view/text~Text} to {@link module:engine/model/text~Text}.
+ * Function factory, creates a converter that converts
+ * {@link module:engine/view/text~ViewText} to {@link module:engine/model/text~ModelText}.
  *
- * @returns {@link module:engine/view/text~Text View text} converter.
+ * @returns {@link module:engine/view/text~ViewText View text} converter.
+ * @internal
  */
 export function convertText() {
     return (evt, data, { schema, consumable, writer }) => {
@@ -476,9 +484,9 @@ export function convertText() {
     };
 }
 /**
- * Function factory, creates a callback function which converts a {@link module:engine/view/selection~Selection
- * view selection} taken from the {@link module:engine/view/document~Document#event:selectionChange} event
- * and sets in on the {@link module:engine/model/document~Document#selection model}.
+ * Function factory, creates a callback function which converts a {@link module:engine/view/selection~ViewSelection
+ * view selection} taken from the {@link module:engine/view/document~ViewDocument#event:selectionChange} event
+ * and sets in on the {@link module:engine/model/document~ModelDocument#selection model}.
  *
  * **Note**: because there is no view selection change dispatcher nor any other advanced view selection to model
  * conversion mechanism, the callback should be set directly on view document.
@@ -489,7 +497,8 @@ export function convertText() {
  *
  * @param model Data model.
  * @param mapper Conversion mapper.
- * @returns {@link module:engine/view/document~Document#event:selectionChange} callback function.
+ * @returns {@link module:engine/view/document~ViewDocument#event:selectionChange} callback function.
+ * @internal
  */
 export function convertSelectionChange(model, mapper) {
     return (evt, data) => {
@@ -844,7 +853,7 @@ function prepareToAttributeConverter(config, shallow) {
         const modelValue = typeof config.model.value == 'function' ?
             config.model.value(data.viewItem, conversionApi, data) : config.model.value;
         // Do not convert if attribute building function returned falsy value.
-        if (modelValue === null) {
+        if (modelValue === null || modelValue === undefined) {
             return;
         }
         // Since we are converting to attribute we need a range on which we will set the attribute.
@@ -884,8 +893,8 @@ function onlyViewNameIsDefined(viewConfig, viewItem) {
     return !configToTest.classes && !configToTest.attributes && !configToTest.styles;
 }
 /**
- * Helper function for to-model-attribute converter. Sets model attribute on given range. Checks {@link module:engine/model/schema~Schema}
- * to ensure proper model structure.
+ * Helper function for to-model-attribute converter. Sets model attribute on given range.
+ * Checks {@link module:engine/model/schema~ModelSchema} to ensure proper model structure.
  *
  * If any node on the given range has already defined an attribute with the same name, its value will not be updated.
  *

package/src/conversion/viewconsumable.d.ts

@@ -2,14 +2,15 @@
  * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
-import type { default as Element, NormalizedConsumables } from '../view/element.js';
-import type Node from '../view/node.js';
-import type Text from '../view/text.js';
-import type DocumentFragment from '../view/documentfragment.js';
+import type { ViewElement, ViewNormalizedConsumables } from '../view/element.js';
+import { type ViewNode } from '../view/node.js';
+import { type ViewText } from '../view/text.js';
+import { type ViewDocumentFragment } from '../view/documentfragment.js';
 import type { Match } from '../view/matcher.js';
 /**
- * Class used for handling consumption of view {@link module:engine/view/element~Element elements},
- * {@link module:engine/view/text~Text text nodes} and {@link module:engine/view/documentfragment~DocumentFragment document fragments}.
+ * Class used for handling consumption of view {@link module:engine/view/element~ViewElement elements},
+ * {@link module:engine/view/text~ViewText text nodes} and
+ * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragments}.
  * Element's name and its parts (attributes, classes and styles) can be consumed separately. Consuming an element's name
  * does not consume its attributes, classes and styles.
  * To add items for consumption use {@link module:engine/conversion/viewconsumable~ViewConsumable#add add method}.
@@ -32,17 +33,17 @@ import type { Match } from '../view/matcher.js';
  * viewConsumable.revert( docFragment ); // Revert already consumed document fragment.
  * ```
  */
-export default class ViewConsumable {
+export declare class ViewConsumable {
     /**
-     * Map of consumable elements. If {@link module:engine/view/element~Element element} is used as a key,
+     * Map of consumable elements. If {@link module:engine/view/element~ViewElement element} is used as a key,
      * {@link module:engine/conversion/viewconsumable~ViewElementConsumables ViewElementConsumables} instance is stored as value.
-     * For {@link module:engine/view/text~Text text nodes} and
-     * {@link module:engine/view/documentfragment~DocumentFragment document fragments} boolean value is stored as value.
+     * For {@link module:engine/view/text~ViewText text nodes} and
+     * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragments} boolean value is stored as value.
      */
     private _consumables;
     /**
-     * Adds view {@link module:engine/view/element~Element element}, {@link module:engine/view/text~Text text node} or
-     * {@link module:engine/view/documentfragment~DocumentFragment document fragment} as ready to be consumed.
+     * Adds view {@link module:engine/view/element~ViewElement element}, {@link module:engine/view/text~ViewText text node} or
+     * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragment} as ready to be consumed.
      *
      * ```ts
      * viewConsumable.add( p, { name: true } ); // Adds element's name to consume.
@@ -63,16 +64,16 @@ export default class ViewConsumable {
      * viewConsumable.add( p, { styles: 'color' } ); // This is properly handled style.
      * ```
      *
-     * @param consumables Used only if first parameter is {@link module:engine/view/element~Element view element} instance.
+     * @param consumables Used only if first parameter is {@link module:engine/view/element~ViewElement view element} instance.
      * @param consumables.name If set to true element's name will be included.
      * @param consumables.attributes Attribute name or array of attribute names.
      * @param consumables.classes Class name or array of class names.
      * @param consumables.styles Style name or array of style names.
      */
-    add(element: Text | Element | DocumentFragment, consumables?: Consumables | NormalizedConsumables): void;
+    add(element: ViewText | ViewElement | ViewDocumentFragment, consumables?: Consumables | ViewNormalizedConsumables): void;
     /**
-     * Tests if {@link module:engine/view/element~Element view element}, {@link module:engine/view/text~Text text node} or
-     * {@link module:engine/view/documentfragment~DocumentFragment document fragment} can be consumed.
+     * Tests if {@link module:engine/view/element~ViewElement view element}, {@link module:engine/view/text~ViewText text node} or
+     * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragment} can be consumed.
      * It returns `true` when all items included in method's call can be consumed. Returns `false` when
      * first already consumed item is found and `null` when first non-consumable item is found.
      *
@@ -94,7 +95,7 @@ export default class ViewConsumable {
      * viewConsumable.test( p, { attributes: 'style' } ); // Tests if all added styles can be consumed.
      * ```
      *
-     * @param consumables Used only if first parameter is {@link module:engine/view/element~Element view element} instance.
+     * @param consumables Used only if first parameter is {@link module:engine/view/element~ViewElement view element} instance.
      * @param consumables.name If set to true element's name will be included.
      * @param consumables.attributes Attribute name or array of attribute names.
      * @param consumables.classes Class name or array of class names.
@@ -102,10 +103,10 @@ export default class ViewConsumable {
      * @returns Returns `true` when all items included in method's call can be consumed. Returns `false`
      * when first already consumed item is found and `null` when first non-consumable item is found.
      */
-    test(element: Node | DocumentFragment, consumables?: Consumables | Match): boolean | null;
+    test(element: ViewNode | ViewDocumentFragment, consumables?: Consumables | Match): boolean | null;
     /**
-     * Consumes {@link module:engine/view/element~Element view element}, {@link module:engine/view/text~Text text node} or
-     * {@link module:engine/view/documentfragment~DocumentFragment document fragment}.
+     * Consumes {@link module:engine/view/element~ViewElement view element}, {@link module:engine/view/text~ViewText text node} or
+     * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragment}.
      * It returns `true` when all items included in method's call can be consumed, otherwise returns `false`.
      *
      * ```ts
@@ -126,7 +127,7 @@ export default class ViewConsumable {
      * viewConsumable.consume( p, { attributes: 'style' } ); // Consume only if all added styles can be consumed.
      * ```
      *
-     * @param consumables Used only if first parameter is {@link module:engine/view/element~Element view element} instance.
+     * @param consumables Used only if first parameter is {@link module:engine/view/element~ViewElement view element} instance.
      * @param consumables.name If set to true element's name will be included.
      * @param consumables.attributes Attribute name or array of attribute names.
      * @param consumables.classes Class name or array of class names.
@@ -134,10 +135,10 @@ export default class ViewConsumable {
      * @returns Returns `true` when all items included in method's call can be consumed,
      * otherwise returns `false`.
      */
-    consume(element: Node | DocumentFragment, consumables?: Consumables | Match): boolean;
+    consume(element: ViewNode | ViewDocumentFragment, consumables?: Consumables | Match): boolean;
     /**
-     * Reverts {@link module:engine/view/element~Element view element}, {@link module:engine/view/text~Text text node} or
-     * {@link module:engine/view/documentfragment~DocumentFragment document fragment} so they can be consumed once again.
+     * Reverts {@link module:engine/view/element~ViewElement view element}, {@link module:engine/view/text~ViewText text node} or
+     * {@link module:engine/view/documentfragment~ViewDocumentFragment document fragment} so they can be consumed once again.
      * Method does not revert items that were never previously added for consumption, even if they are included in
      * method's call.
      *
@@ -160,27 +161,27 @@ export default class ViewConsumable {
      * viewConsumable.revert( p, { attributes: 'style' } ); // Reverts all styles added for consumption.
      * ```
      *
-     * @param consumables Used only if first parameter is {@link module:engine/view/element~Element view element} instance.
+     * @param consumables Used only if first parameter is {@link module:engine/view/element~ViewElement view element} instance.
      * @param consumables.name If set to true element's name will be included.
      * @param consumables.attributes Attribute name or array of attribute names.
      * @param consumables.classes Class name or array of class names.
      * @param consumables.styles Style name or array of style names.
      */
-    revert(element: Node, consumables: Consumables | Match): void;
+    revert(element: ViewNode, consumables: Consumables | Match): void;
     /**
      * Creates {@link module:engine/conversion/viewconsumable~ViewConsumable ViewConsumable} instance from
-     * {@link module:engine/view/node~Node node} or {@link module:engine/view/documentfragment~DocumentFragment document fragment}.
+     * {@link module:engine/view/node~ViewNode node} or {@link module:engine/view/documentfragment~ViewDocumentFragment document fragment}.
      * Instance will contain all elements, child nodes, attributes, styles and classes added for consumption.
      *
      * @param from View node or document fragment from which `ViewConsumable` will be created.
      * @param instance If provided, given `ViewConsumable` instance will be used
      * to add all consumables. It will be returned instead of a new instance.
      */
-    static createFrom(from: Node | DocumentFragment, instance?: ViewConsumable): ViewConsumable;
+    static createFrom(from: ViewNode | ViewDocumentFragment, instance?: ViewConsumable): ViewConsumable;
 }
 /**
  * Object describing all features of a view element that could be consumed and converted individually.
- * This is a non-normalized form of {@link module:engine/view/element~NormalizedConsumables} generated from the view Element.
+ * This is a non-normalized form of {@link module:engine/view/element~ViewNormalizedConsumables} generated from the view Element.
  *
  * Example element:
  *
@@ -198,7 +199,7 @@ export default class ViewConsumable {
  * }
  * ```
  *
- * You could convert a `Consumable` into a {@link module:engine/view/element~NormalizedConsumables}
+ * You could convert a `Consumable` into a {@link module:engine/view/element~ViewNormalizedConsumables}
  * using the {@link module:engine/conversion/viewconsumable~normalizeConsumables} helper.
  */
 export interface Consumables {
@@ -222,10 +223,12 @@ export interface Consumables {
 }
 /**
  * This is a private helper-class for {@link module:engine/conversion/viewconsumable~ViewConsumable}.
- * It represents and manipulates consumable parts of a single {@link module:engine/view/element~Element}.
+ * It represents and manipulates consumable parts of a single {@link module:engine/view/element~ViewElement}.
+ *
+ * @internal
  */
 export declare class ViewElementConsumables {
-    readonly element: Element;
+    readonly element: ViewElement;
     /**
      * Flag indicating if name of the element can be consumed.
      */
@@ -242,9 +245,9 @@ export declare class ViewElementConsumables {
      *
      * @param from View element from which `ViewElementConsumables` is being created.
      */
-    constructor(from: Element);
+    constructor(from: ViewElement);
     /**
-     * Adds consumable parts of the {@link module:engine/view/element~Element view element}.
+     * Adds consumable parts of the {@link module:engine/view/element~ViewElement view element}.
      * Element's name itself can be marked to be consumed (when element's name is consumed its attributes, classes and
      * styles still could be consumed):
      *
@@ -259,18 +262,18 @@ export declare class ViewElementConsumables {
      * consumables.add( { attributes: [ [ 'title' ], [ 'name' ], [ 'class', 'foo' ], [ 'class', 'bar' ] ] } );
      * ```
      *
-     * Note: This method accepts only {@link module:engine/view/element~NormalizedConsumables}.
+     * Note: This method accepts only {@link module:engine/view/element~ViewNormalizedConsumables}.
      * You can use {@link module:engine/conversion/viewconsumable~normalizeConsumables} helper to convert from
-     * {@link module:engine/conversion/viewconsumable~Consumables} to `NormalizedConsumables`.
+     * {@link module:engine/conversion/viewconsumable~Consumables} to `ViewNormalizedConsumables`.
      *
      * Throws {@link module:utils/ckeditorerror~CKEditorError CKEditorError} `viewconsumable-invalid-attribute` when `class` or `style`
      * attribute is provided - it should be handled separately by providing `style` and `class` in consumables object.
      *
      * @param consumables Object describing which parts of the element can be consumed.
      */
-    add(consumables: NormalizedConsumables): void;
+    add(consumables: ViewNormalizedConsumables): void;
     /**
-     * Tests if parts of the {@link module:engine/view/element~Element view element} can be consumed.
+     * Tests if parts of the {@link module:engine/view/element~ViewElement view element} can be consumed.
      *
      * Element's name can be tested:
      *
@@ -289,9 +292,9 @@ export declare class ViewElementConsumables {
      * @returns `true` when all tested items can be consumed, `null` when even one of the items
      * was never marked for consumption and `false` when even one of the items was already consumed.
      */
-    test(consumables: NormalizedConsumables): boolean | null;
+    test(consumables: ViewNormalizedConsumables): boolean | null;
     /**
-     * Tests if parts of the {@link module:engine/view/element~Element view element} can be consumed and consumes them if available.
+     * Tests if parts of the {@link module:engine/view/element~ViewElement view element} can be consumed and consumes them if available.
      * It returns `true` when all items included in method's call can be consumed, otherwise returns `false`.
      *
      * Element's name can be consumed:
@@ -310,9 +313,9 @@ export declare class ViewElementConsumables {
      * @param consumables Object describing which parts of the element should be consumed.
      * @returns `true` when all tested items can be consumed and `false` when even one of the items could not be consumed.
      */
-    consume(consumables: NormalizedConsumables): boolean;
+    consume(consumables: ViewNormalizedConsumables): boolean;
     /**
-     * Revert already consumed parts of {@link module:engine/view/element~Element view Element}, so they can be consumed once again.
+     * Revert already consumed parts of {@link module:engine/view/element~ViewElement view Element}, so they can be consumed once again.
      * Element's name can be reverted:
      *
      * ```ts
@@ -328,10 +331,12 @@ export declare class ViewElementConsumables {
      *
      * @param consumables Object describing which parts of the element should be reverted.
      */
-    revert(consumables: NormalizedConsumables): void;
+    revert(consumables: ViewNormalizedConsumables): void;
 }
 /**
  * Normalizes a {@link module:engine/conversion/viewconsumable~Consumables} or {@link module:engine/view/matcher~Match}
- * to a {@link module:engine/view/element~NormalizedConsumables}.
+ * to a {@link module:engine/view/element~ViewNormalizedConsumables}.
+ *
+ * @internal
  */
-export declare function normalizeConsumables(consumables: Consumables | Match): NormalizedConsumables;
+export declare function normalizeConsumables(consumables: Consumables | Match): ViewNormalizedConsumables;