@ckeditor/ckeditor5-engine 35.3.2 → 35.4.0

package/package.json

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

package/src/controller/datacontroller.js

@@ -5,9 +5,7 @@
 /**
  * @module engine/controller/datacontroller
  */
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { CKEditorError, EmitterMixin, ObservableMixin } from '@ckeditor/ckeditor5-utils';
 import Mapper from '../conversion/mapper';
 import DowncastDispatcher from '../conversion/downcastdispatcher';
 import { insertAttributesAndChildren, insertText } from '../conversion/downcasthelpers';
@@ -36,7 +34,7 @@ import HtmlDataProcessor from '../dataprocessor/htmldataprocessor';
  *
  * @mixes module:utils/emittermixin~EmitterMixin
  */
-export default class DataController extends Emitter {
+export default class DataController extends EmitterMixin() {
     /**
      * Creates a data controller instance.
      *
@@ -127,9 +125,9 @@ export default class DataController extends Emitter {
         this.upcastDispatcher.on('text', convertText(), { priority: 'lowest' });
         this.upcastDispatcher.on('element', convertToModelFragment(), { priority: 'lowest' });
         this.upcastDispatcher.on('documentFragment', convertToModelFragment(), { priority: 'lowest' });
-        Observable.prototype.decorate.call(this, 'init');
-        Observable.prototype.decorate.call(this, 'set');
-        Observable.prototype.decorate.call(this, 'get');
+        ObservableMixin().prototype.decorate.call(this, 'init');
+        ObservableMixin().prototype.decorate.call(this, 'set');
+        ObservableMixin().prototype.decorate.call(this, 'get');
         // Fire the `ready` event when the initialization has completed. Such low-level listener offers the possibility
         // to plug into the initialization pipeline without interrupting the initialization flow.
         this.on('init', () => {

package/src/controller/editingcontroller.js

@@ -5,13 +5,12 @@
 /**
  * @module engine/controller/editingcontroller
  */
+import { CKEditorError, ObservableMixin } from '@ckeditor/ckeditor5-utils';
 import RootEditableElement from '../view/rooteditableelement';
 import View from '../view/view';
 import Mapper from '../conversion/mapper';
 import DowncastDispatcher from '../conversion/downcastdispatcher';
 import { clearAttributes, convertCollapsedSelection, convertRangeSelection, insertAttributesAndChildren, insertText, remove } from '../conversion/downcasthelpers';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import { convertSelectionChange } from '../conversion/upcasthelpers';
 // @if CK_DEBUG_ENGINE // const { dumpTrees, initDocumentDumping } = require( '../dev-utils/utils' );
 /**
@@ -21,7 +20,7 @@ import { convertSelectionChange } from '../conversion/upcasthelpers';
  *
  * @mixes module:utils/observablemixin~ObservableMixin
  */
-export default class EditingController extends Observable {
+export default class EditingController extends ObservableMixin() {
     /**
      * Creates an editing controller instance.
      *

package/src/conversion/conversion.js

@@ -5,10 +5,9 @@
 /**
  * @module engine/conversion/conversion
  */
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, toArray } from '@ckeditor/ckeditor5-utils';
 import UpcastHelpers from './upcasthelpers';
 import DowncastHelpers from './downcasthelpers';
-import toArray from '@ckeditor/ckeditor5-utils/src/toarray';
 /**
  * A utility class that helps add converters to upcast and downcast dispatchers.
  *

package/src/conversion/downcastdispatcher.js

@@ -7,7 +7,7 @@
  */
 import Consumable from './modelconsumable';
 import Range from '../model/range';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * The downcast dispatcher is a central point of downcasting (conversion from the model to the view), which is a process of reacting
  * to changes in the model and firing a set of events. The callbacks listening to these events are called converters. The
@@ -97,7 +97,7 @@ import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
  *			conversionApi.writer.insert( viewPosition, viewElement );
  *		} );
  */
-export default class DowncastDispatcher extends Emitter {
+export default class DowncastDispatcher extends EmitterMixin() {
     /**
      * Creates a downcast dispatcher instance.
      *

package/src/conversion/downcasthelpers.js

@@ -15,8 +15,7 @@ import ModelPosition from '../model/position';
 import ViewAttributeElement from '../view/attributeelement';
 import ConversionHelpers from './conversionhelpers';
 import { cloneDeep } from 'lodash-es';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import toArray from '@ckeditor/ckeditor5-utils/src/toarray';
+import { CKEditorError, toArray } from '@ckeditor/ckeditor5-utils';
 /**
  * Downcast conversion helper functions.
  *

package/src/conversion/mapper.js

@@ -10,8 +10,7 @@ import ModelRange from '../model/range';
 import ViewPosition from '../view/position';
 import ViewRange from '../view/range';
 import ViewText from '../view/text';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * Maps elements, positions and markers between the {@link module:engine/view/document~Document view} and
  * the {@link module:engine/model/model model}.
@@ -32,7 +31,7 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
  * stop the event.
  * @mixes module:utils/emittermixin~EmitterMixin
  */
-export default class Mapper extends Emitter {
+export default class Mapper extends EmitterMixin() {
     /**
      * Creates an instance of the mapper.
      */

package/src/conversion/modelconsumable.js

@@ -6,7 +6,7 @@
  * @module engine/conversion/modelconsumable
  */
 import TextProxy from '../model/textproxy';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Manages a list of consumable values for the {@link module:engine/model/item~Item model items}.
  *

package/src/conversion/upcastdispatcher.js

@@ -10,8 +10,7 @@ import ModelRange from '../model/range';
 import ModelPosition from '../model/position';
 import { SchemaContext } from '../model/schema'; // eslint-disable-line no-duplicate-imports
 import { isParagraphable, wrapInParagraph } from '../model/utils/autoparagraphing';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
+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
@@ -107,7 +106,7 @@ import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
  * @fires text
  * @fires documentFragment
  */
-export default class UpcastDispatcher extends Emitter {
+export default class UpcastDispatcher extends EmitterMixin() {
     /**
      * Creates an upcast dispatcher that operates using the passed API.
      *

package/src/conversion/upcasthelpers.js

@@ -4,9 +4,9 @@
  */
 import Matcher from '../view/matcher';
 import ConversionHelpers from './conversionhelpers';
-import { cloneDeep } from 'lodash-es';
-import priorities from '@ckeditor/ckeditor5-utils/src/priorities';
 import { isParagraphable, wrapInParagraph } from '../model/utils/autoparagraphing';
+import { priorities } from '@ckeditor/ckeditor5-utils';
+import { cloneDeep } from 'lodash-es';
 /**
  * Contains the {@link module:engine/view/view view} to {@link module:engine/model/model model} converters for
  * {@link module:engine/conversion/upcastdispatcher~UpcastDispatcher}.

package/src/conversion/viewconsumable.js

@@ -5,8 +5,8 @@
 /**
  * @module engine/conversion/viewconsumable
  */
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 import { isArray } from 'lodash-es';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 /**
  * 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}.

package/src/dataprocessor/htmldataprocessor.js

@@ -21,6 +21,7 @@ export default class HtmlDataProcessor {
      * @param {module:engine/view/document~Document} document The view document instance.
      */
     constructor(document) {
+        this.skipComments = true;
         /**
          * A DOM parser instance used to parse an HTML string to an HTML document.
          *
@@ -63,7 +64,7 @@ export default class HtmlDataProcessor {
         // Convert input HTML data to DOM DocumentFragment.
         const domFragment = this._toDom(data);
         // Convert DOM DocumentFragment to view DocumentFragment.
-        return this.domConverter.domToView(domFragment);
+        return this.domConverter.domToView(domFragment, { skipComments: this.skipComments });
     }
     /**
      * Registers a {@link module:engine/view/matcher~MatcherPattern} for view elements whose content should be treated as raw data

package/src/dataprocessor/xmldataprocessor.js

@@ -25,6 +25,7 @@ export default class XmlDataProcessor {
      * @param {Array.<String>} [options.namespaces=[]] A list of namespaces allowed to use in the XML input.
      */
     constructor(document, options = {}) {
+        this.skipComments = true;
         /**
          * A list of namespaces allowed to use in the XML input.
          *
@@ -78,7 +79,10 @@ export default class XmlDataProcessor {
         // Convert input XML data to DOM DocumentFragment.
         const domFragment = this._toDom(data);
         // Convert DOM DocumentFragment to view DocumentFragment.
-        return this.domConverter.domToView(domFragment, { keepOriginalCase: true });
+        return this.domConverter.domToView(domFragment, {
+            keepOriginalCase: true,
+            skipComments: this.skipComments
+        });
     }
     /**
      * Registers a {@link module:engine/view/matcher~MatcherPattern} for view elements whose content should be treated as raw data

package/src/dev-utils/model.js

@@ -21,11 +21,11 @@ import ViewRootEditableElement from '../view/rooteditableelement';
 import { parse as viewParse, stringify as viewStringify } from '../../src/dev-utils/view';
 import Mapper from '../conversion/mapper';
 import { convertCollapsedSelection, convertRangeSelection, insertAttributesAndChildren, insertElement, insertText, insertUIElement, wrap } from '../conversion/downcasthelpers';
-import { isPlainObject } from 'lodash-es';
-import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
 import { StylesProcessor } from '../view/stylesmap';
 import DowncastDispatcher from '../conversion/downcastdispatcher';
 import UpcastDispatcher from '../conversion/upcastdispatcher';
+import { toMap } from '@ckeditor/ckeditor5-utils';
+import { isPlainObject } from 'lodash-es';
 /**
  * Writes the content of a model {@link module:engine/model/document~Document document} to an HTML-like string.
  *

package/src/index.js

@@ -6,15 +6,18 @@
  * @module engine
  */
 export * from './view/placeholder';
+// Controller.
 export { default as EditingController } from './controller/editingcontroller';
 export { default as DataController } from './controller/datacontroller';
+// Conversion.
 export { default as Conversion } from './conversion/conversion';
+// DataProcessor.
 export { default as HtmlDataProcessor } from './dataprocessor/htmldataprocessor';
 export { default as InsertOperation } from './model/operation/insertoperation';
 export { default as MarkerOperation } from './model/operation/markeroperation';
 export { default as OperationFactory } from './model/operation/operationfactory';
 export { transformSets } from './model/operation/transform';
-export { default as Selection } from './model/selection';
+// Model.
 export { default as DocumentSelection } from './model/documentselection';
 export { default as Range } from './model/range';
 export { default as LiveRange } from './model/liverange';
@@ -26,7 +29,9 @@ export { default as Position } from './model/position';
 export { default as DocumentFragment } from './model/documentfragment';
 export { default as History } from './model/history';
 export { default as Text } from './model/text';
-export { default as Schema } from './model/schema';
+export { findOptimalInsertionRange } from './model/utils/findoptimalinsertionrange';
+// View.
+export { default as DataTransfer } from './view/datatransfer';
 export { default as DomConverter } from './view/domconverter';
 export { default as Renderer } from './view/renderer';
 export { default as View } from './view/view';
@@ -34,12 +39,14 @@ export { default as ViewDocument } from './view/document';
 export { default as ViewText } from './view/text';
 export { default as ViewElement } from './view/element';
 export { default as ViewContainerElement } from './view/containerelement';
+export { default as ViewEditableElement } from './view/editableelement';
 export { default as ViewAttributeElement } from './view/attributeelement';
 export { default as ViewEmptyElement } from './view/emptyelement';
 export { default as ViewRawElement } from './view/rawelement';
 export { default as ViewUIElement } from './view/uielement';
 export { default as ViewDocumentFragment } from './view/documentfragment';
 export { getFillerOffset } from './view/containerelement';
+// View / Observer.
 export { default as Observer } from './view/observer/observer';
 export { default as ClickObserver } from './view/observer/clickobserver';
 export { default as DomEventObserver } from './view/observer/domeventobserver';
@@ -47,7 +54,9 @@ export { default as MouseObserver } from './view/observer/mouseobserver';
 export { default as DowncastWriter } from './view/downcastwriter';
 export { default as UpcastWriter } from './view/upcastwriter';
 export { default as Matcher } from './view/matcher';
+export { default as BubblingEventInfo } from './view/observer/bubblingeventinfo';
 export { default as DomEventData } from './view/observer/domeventdata';
+// View / Styles.
 export { StylesProcessor } from './view/stylesmap';
 export * from './view/styles/background';
 export * from './view/styles/border';

package/src/model/batch.js

@@ -5,7 +5,7 @@
 /**
  * @module engine/model/batch
  */
-import { logWarning } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { logWarning } from '@ckeditor/ckeditor5-utils';
 /**
  * A batch instance groups model changes ({@link module:engine/model/operation/operation~Operation operations}). All operations
  * grouped in a single batch can be reverted together, so you can also think about a batch as of a single undo step. If you want

package/src/model/document.js

@@ -9,10 +9,7 @@ import Differ from './differ';
 import DocumentSelection from './documentselection';
 import History from './history';
 import RootElement from './rootelement';
-import Collection from '@ckeditor/ckeditor5-utils/src/collection';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { isInsideSurrogatePair, isInsideCombinedSymbol } from '@ckeditor/ckeditor5-utils/src/unicode';
+import { CKEditorError, Collection, EmitterMixin, isInsideSurrogatePair, isInsideCombinedSymbol } from '@ckeditor/ckeditor5-utils';
 import { clone } from 'lodash-es';
 // @if CK_DEBUG_ENGINE // const { logDocument } = require( '../dev-utils/utils' );
 const graveyardName = '$graveyard';
@@ -32,7 +29,7 @@ const graveyardName = '$graveyard';
  *
  * @mixes module:utils/emittermixin~EmitterMixin
  */
-export default class Document extends Emitter {
+export default class Document extends EmitterMixin() {
     /**
      * Creates an empty document instance with no {@link #roots} (other than
      * the {@link #graveyard graveyard root}).

package/src/model/documentfragment.js

@@ -10,7 +10,7 @@ import Element from './element';
 import NodeList from './nodelist';
 import Text from './text';
 import TextProxy from './textproxy';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import { isIterable } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const { stringifyMap } = require( '../dev-utils/utils' );
 /**
  * DocumentFragment represents a part of model which does not have a common root but its top-level nodes

package/src/model/documentselection.js

@@ -2,7 +2,6 @@
  * @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/documentselection
  */
@@ -11,11 +10,7 @@ import LiveRange from './liverange';
 import Selection from './selection';
 import Text from './text';
 import TextProxy from './textproxy';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import Collection from '@ckeditor/ckeditor5-utils/src/collection';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
-import uid from '@ckeditor/ckeditor5-utils/src/uid';
+import { CKEditorError, Collection, EmitterMixin, toMap, uid } from '@ckeditor/ckeditor5-utils';
 const storePrefix = 'selection:';
 /**
  * `DocumentSelection` is a special selection which is used as the

package/src/model/element.js

@@ -9,7 +9,7 @@ import Node from './node';
 import NodeList from './nodelist';
 import Text from './text';
 import TextProxy from './textproxy';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import { isIterable } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const { stringifyMap, convertMapToStringifiedObject, convertMapToTags } = require( '../dev-utils/utils' );
 /**
  * Model element. Type of {@link module:engine/model/node~Node node} that has a {@link module:engine/model/element~Element#name name} and

package/src/model/liveposition.js

@@ -2,13 +2,11 @@
  * @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/liveposition
  */
 import Position from './position';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * `LivePosition` is a type of {@link module:engine/model/position~Position Position}
  * that updates itself as {@link module:engine/model/document~Document document}

package/src/model/liverange.js

@@ -2,12 +2,11 @@
  * @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/liverange
  */
 import Range from './range';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * `LiveRange` is a type of {@link module:engine/model/range~Range Range}
  * that updates itself as {@link module:engine/model/document~Document document}

package/src/model/markercollection.js

@@ -2,14 +2,12 @@
  * @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, { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * 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
@@ -24,7 +22,7 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
  *
  * @see module:engine/model/markercollection~Marker
  */
-export default class MarkerCollection extends Emitter {
+export default class MarkerCollection extends EmitterMixin() {
     /**
      * Creates a markers collection.
      */

package/src/model/model.js

@@ -21,8 +21,7 @@ import getSelectedContent from './utils/getselectedcontent';
 import insertContent from './utils/insertcontent';
 import insertObject from './utils/insertobject';
 import modifySelection from './utils/modifyselection';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
+import { CKEditorError, ObservableMixin } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const { dumpTrees } = require( '../dev-utils/utils' );
 // @if CK_DEBUG_ENGINE // const { OperationReplayer } = require( '../dev-utils/operationreplayer' ).default;
 /**
@@ -31,7 +30,7 @@ import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
  *
  * @mixes module:utils/observablemixin~ObservableMixin
  */
-export default class Model extends Observable {
+export default class Model extends ObservableMixin() {
     constructor() {
         super();
         /**

package/src/model/node.js

@@ -7,9 +7,7 @@
  * @module engine/model/node
  */
 import TypeCheckable from './typecheckable';
-import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import { CKEditorError, compareArrays, toMap } from '@ckeditor/ckeditor5-utils';
 // To check if component is loaded more than once.
 import '@ckeditor/ckeditor5-utils/src/version';
 /**

package/src/model/nodelist.js

@@ -6,8 +6,7 @@
  * @module engine/model/nodelist
  */
 import Node from './node';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import spliceArray from '@ckeditor/ckeditor5-utils/src/splicearray';
+import { CKEditorError, spliceArray } from '@ckeditor/ckeditor5-utils';
 /**
  * Provides an interface to operate on a list of {@link module:engine/model/node~Node nodes}. `NodeList` is used internally
  * in classes like {@link module:engine/model/element~Element Element}

package/src/model/operation/attributeoperation.js

@@ -8,7 +8,7 @@
 import Operation from './operation';
 import { _setAttribute } from './utils';
 import Range from '../range';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 import { isEqual } from 'lodash-es';
 /**
  * Operation to change nodes' attribute.

package/src/model/operation/detachoperation.js

@@ -8,7 +8,7 @@
 import Operation from './operation';
 import Range from '../range';
 import { _remove } from './utils';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const ModelRange = require( '../range' ).default;
 /**
  * Operation to permanently remove node from detached root.

package/src/model/operation/insertoperation.js

@@ -12,7 +12,7 @@ import MoveOperation from './moveoperation';
 import { _insert, _normalizeNodes } from './utils';
 import Text from '../text';
 import Element from '../element';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Operation to insert one or more nodes at given position in the model.
  *

package/src/model/operation/mergeoperation.js

@@ -10,7 +10,7 @@ import SplitOperation from './splitoperation';
 import Position from '../position';
 import Range from '../range';
 import { _move } from './utils';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Operation to merge two {@link module:engine/model/element~Element elements}.
  *

package/src/model/operation/moveoperation.js

@@ -8,9 +8,8 @@
 import Operation from './operation';
 import Position from '../position';
 import Range from '../range';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
 import { _move } from './utils';
+import { CKEditorError, compareArrays } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const ModelRange = require( '../range' ).default;
 /**
  * Operation to move a range of {@link module:engine/model/item~Item model items}

package/src/model/operation/renameoperation.js

@@ -7,8 +7,8 @@
  */
 import Operation from './operation';
 import Element from '../element';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import Position from '../position';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Operation to change element's name.
  *

package/src/model/operation/rootattributeoperation.js

@@ -6,7 +6,7 @@
  * @module engine/model/operation/rootattributeoperation
  */
 import Operation from './operation';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Operation to change root element's attribute. Using this class you can add, remove or change value of the attribute.
  *

package/src/model/operation/splitoperation.js

@@ -10,7 +10,7 @@ import MergeOperation from './mergeoperation';
 import Position from '../position';
 import Range from '../range';
 import { _insert, _move } from './utils';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Operation to split {@link module:engine/model/element~Element an element} at given
  * {@link module:engine/model/operation/splitoperation~SplitOperation#splitPosition split position} into two elements,

package/src/model/operation/transform.js

@@ -13,7 +13,7 @@ import SplitOperation from './splitoperation';
 import NoOperation from './nooperation';
 import Range from '../range';
 import Position from '../position';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import { compareArrays } from '@ckeditor/ckeditor5-utils';
 const transformations = new Map();
 /**
  * @module engine/model/operation/transform