@ckeditor/ckeditor5-engine 35.0.1 → 35.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -4
- package/package.json +30 -24
- package/src/controller/datacontroller.js +467 -561
- package/src/controller/editingcontroller.js +168 -204
- package/src/conversion/conversion.js +541 -565
- package/src/conversion/conversionhelpers.js +24 -28
- package/src/conversion/downcastdispatcher.js +457 -686
- package/src/conversion/downcasthelpers.js +1583 -1965
- package/src/conversion/mapper.js +518 -707
- package/src/conversion/modelconsumable.js +240 -283
- package/src/conversion/upcastdispatcher.js +372 -718
- package/src/conversion/upcasthelpers.js +707 -818
- package/src/conversion/viewconsumable.js +524 -581
- package/src/dataprocessor/basichtmlwriter.js +12 -16
- package/src/dataprocessor/dataprocessor.js +5 -0
- package/src/dataprocessor/htmldataprocessor.js +100 -116
- package/src/dataprocessor/htmlwriter.js +1 -18
- package/src/dataprocessor/xmldataprocessor.js +116 -137
- package/src/dev-utils/model.js +260 -352
- package/src/dev-utils/operationreplayer.js +106 -126
- package/src/dev-utils/utils.js +34 -51
- package/src/dev-utils/view.js +632 -753
- package/src/index.js +0 -11
- package/src/model/batch.js +111 -127
- package/src/model/differ.js +988 -1233
- package/src/model/document.js +340 -449
- package/src/model/documentfragment.js +327 -364
- package/src/model/documentselection.js +996 -1189
- package/src/model/element.js +306 -410
- package/src/model/history.js +224 -262
- package/src/model/item.js +5 -0
- package/src/model/liveposition.js +84 -145
- package/src/model/liverange.js +108 -185
- package/src/model/markercollection.js +379 -480
- package/src/model/model.js +883 -1034
- package/src/model/node.js +419 -463
- package/src/model/nodelist.js +175 -201
- package/src/model/operation/attributeoperation.js +153 -182
- package/src/model/operation/detachoperation.js +64 -83
- package/src/model/operation/insertoperation.js +135 -166
- package/src/model/operation/markeroperation.js +114 -140
- package/src/model/operation/mergeoperation.js +163 -191
- package/src/model/operation/moveoperation.js +157 -187
- package/src/model/operation/nooperation.js +28 -38
- package/src/model/operation/operation.js +106 -125
- package/src/model/operation/operationfactory.js +30 -34
- package/src/model/operation/renameoperation.js +109 -135
- package/src/model/operation/rootattributeoperation.js +155 -188
- package/src/model/operation/splitoperation.js +196 -232
- package/src/model/operation/transform.js +1833 -2204
- package/src/model/operation/utils.js +140 -204
- package/src/model/position.js +899 -1053
- package/src/model/range.js +910 -1028
- package/src/model/rootelement.js +77 -97
- package/src/model/schema.js +1189 -1835
- package/src/model/selection.js +745 -862
- package/src/model/text.js +90 -114
- package/src/model/textproxy.js +204 -240
- package/src/model/treewalker.js +316 -397
- package/src/model/typecheckable.js +16 -0
- package/src/model/utils/autoparagraphing.js +32 -44
- package/src/model/utils/deletecontent.js +334 -418
- package/src/model/utils/findoptimalinsertionrange.js +25 -36
- package/src/model/utils/getselectedcontent.js +96 -118
- package/src/model/utils/insertcontent.js +654 -773
- package/src/model/utils/insertobject.js +96 -119
- package/src/model/utils/modifyselection.js +120 -158
- package/src/model/utils/selection-post-fixer.js +153 -201
- package/src/model/writer.js +1305 -1474
- package/src/view/attributeelement.js +189 -225
- package/src/view/containerelement.js +75 -85
- package/src/view/document.js +172 -215
- package/src/view/documentfragment.js +200 -249
- package/src/view/documentselection.js +338 -367
- package/src/view/domconverter.js +1370 -1617
- package/src/view/downcastwriter.js +1747 -2076
- package/src/view/editableelement.js +81 -97
- package/src/view/element.js +739 -890
- package/src/view/elementdefinition.js +5 -0
- package/src/view/emptyelement.js +82 -92
- package/src/view/filler.js +35 -50
- package/src/view/item.js +5 -0
- package/src/view/matcher.js +260 -559
- package/src/view/node.js +274 -360
- package/src/view/observer/arrowkeysobserver.js +19 -28
- package/src/view/observer/bubblingemittermixin.js +120 -263
- package/src/view/observer/bubblingeventinfo.js +47 -55
- package/src/view/observer/clickobserver.js +7 -13
- package/src/view/observer/compositionobserver.js +14 -24
- package/src/view/observer/domeventdata.js +57 -67
- package/src/view/observer/domeventobserver.js +40 -64
- package/src/view/observer/fakeselectionobserver.js +81 -96
- package/src/view/observer/focusobserver.js +45 -61
- package/src/view/observer/inputobserver.js +7 -13
- package/src/view/observer/keyobserver.js +17 -27
- package/src/view/observer/mouseobserver.js +7 -14
- package/src/view/observer/mutationobserver.js +220 -315
- package/src/view/observer/observer.js +81 -102
- package/src/view/observer/selectionobserver.js +191 -246
- package/src/view/observer/tabobserver.js +23 -36
- package/src/view/placeholder.js +128 -173
- package/src/view/position.js +350 -401
- package/src/view/range.js +453 -513
- package/src/view/rawelement.js +85 -112
- package/src/view/renderer.js +874 -1018
- package/src/view/rooteditableelement.js +80 -90
- package/src/view/selection.js +608 -689
- package/src/view/styles/background.js +43 -44
- package/src/view/styles/border.js +220 -276
- package/src/view/styles/margin.js +8 -17
- package/src/view/styles/padding.js +8 -16
- package/src/view/styles/utils.js +127 -160
- package/src/view/stylesmap.js +728 -905
- package/src/view/text.js +102 -126
- package/src/view/textproxy.js +144 -170
- package/src/view/treewalker.js +383 -479
- package/src/view/typecheckable.js +19 -0
- package/src/view/uielement.js +166 -187
- package/src/view/upcastwriter.js +395 -449
- package/src/view/view.js +569 -664
- package/src/dataprocessor/dataprocessor.jsdoc +0 -64
- package/src/model/item.jsdoc +0 -14
- package/src/view/elementdefinition.jsdoc +0 -59
- package/src/view/item.jsdoc +0 -14
|
@@ -2,139 +2,119 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* @module engine/dev-utils/operationreplayer
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
/* global setTimeout */
|
|
11
|
-
|
|
12
9
|
import OperationFactory from '../model/operation/operationfactory';
|
|
13
|
-
|
|
14
10
|
/**
|
|
15
11
|
* Operation replayer is a development tool created for easy replaying of operations on the document from stringified operations.
|
|
16
12
|
*/
|
|
17
13
|
export default class OperationReplayer {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
model.enqueueChange( writer => {
|
|
125
|
-
const operationJson = this._operationsToReplay.shift();
|
|
126
|
-
|
|
127
|
-
if ( !operationJson ) {
|
|
128
|
-
return res( true );
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
const operation = OperationFactory.fromJSON( operationJson, model.document );
|
|
132
|
-
|
|
133
|
-
writer.batch.addOperation( operation );
|
|
134
|
-
model.applyOperation( operation );
|
|
135
|
-
|
|
136
|
-
res( false );
|
|
137
|
-
} );
|
|
138
|
-
} );
|
|
139
|
-
}
|
|
14
|
+
/**
|
|
15
|
+
* @param {module:engine/model/model~Model} model Data model.
|
|
16
|
+
* @param {String} logSeparator Separator between operations.
|
|
17
|
+
* @param {String} stringifiedOperations Operations to replay.
|
|
18
|
+
*/
|
|
19
|
+
constructor(model, logSeparator, stringifiedOperations) {
|
|
20
|
+
this._model = model;
|
|
21
|
+
this._logSeparator = logSeparator;
|
|
22
|
+
this.setStringifiedOperations(stringifiedOperations);
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Parses the given string containing stringified operations and sets parsed operations as operations to replay.
|
|
26
|
+
*
|
|
27
|
+
* @param {String} stringifiedOperations Stringified operations to replay.
|
|
28
|
+
*/
|
|
29
|
+
setStringifiedOperations(stringifiedOperations) {
|
|
30
|
+
if (stringifiedOperations === '') {
|
|
31
|
+
this._operationsToReplay = [];
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
this._operationsToReplay = stringifiedOperations
|
|
35
|
+
.split(this._logSeparator)
|
|
36
|
+
.map(stringifiedOperation => JSON.parse(stringifiedOperation));
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Returns operations to replay.
|
|
40
|
+
*
|
|
41
|
+
* @returns {Array.<module:engine/model/operation/operation~Operation>}
|
|
42
|
+
*/
|
|
43
|
+
getOperationsToReplay() {
|
|
44
|
+
return this._operationsToReplay;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Applies all operations with a delay between actions.
|
|
48
|
+
*
|
|
49
|
+
* @param {Number} timeInterval Time between applying operations.
|
|
50
|
+
* @returns {Promise}
|
|
51
|
+
*/
|
|
52
|
+
play(timeInterval = 1000) {
|
|
53
|
+
// eslint-disable-next-line @typescript-eslint/no-this-alias, consistent-this
|
|
54
|
+
const operationReplayer = this;
|
|
55
|
+
return new Promise((res, rej) => {
|
|
56
|
+
play();
|
|
57
|
+
function play() {
|
|
58
|
+
operationReplayer.applyNextOperation().then(isFinished => {
|
|
59
|
+
if (isFinished) {
|
|
60
|
+
return res();
|
|
61
|
+
}
|
|
62
|
+
setTimeout(play, timeInterval);
|
|
63
|
+
}).catch(err => {
|
|
64
|
+
rej(err);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Applies `numberOfOperations` operations, beginning after the last applied operation (or first, if no operations were applied).
|
|
71
|
+
*
|
|
72
|
+
* @param {Number} numberOfOperations The number of operations to apply.
|
|
73
|
+
* @returns {Promise}
|
|
74
|
+
*/
|
|
75
|
+
applyOperations(numberOfOperations) {
|
|
76
|
+
if (numberOfOperations <= 0) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
return this.applyNextOperation()
|
|
80
|
+
.then(isFinished => {
|
|
81
|
+
if (!isFinished) {
|
|
82
|
+
return this.applyOperations(numberOfOperations - 1);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Applies all operations to replay at once.
|
|
88
|
+
*
|
|
89
|
+
* @returns {Promise}
|
|
90
|
+
*/
|
|
91
|
+
applyAllOperations() {
|
|
92
|
+
return this.applyNextOperation()
|
|
93
|
+
.then(isFinished => {
|
|
94
|
+
if (!isFinished) {
|
|
95
|
+
return this.applyAllOperations();
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Applies the next operation to replay. Returns a promise with the `isFinished` parameter that is `true` if the last
|
|
101
|
+
* operation in the replayer has been applied, `false` otherwise.
|
|
102
|
+
*
|
|
103
|
+
* @returns {Promise.<Boolean>}
|
|
104
|
+
*/
|
|
105
|
+
applyNextOperation() {
|
|
106
|
+
const model = this._model;
|
|
107
|
+
return new Promise(res => {
|
|
108
|
+
model.enqueueChange(writer => {
|
|
109
|
+
const operationJson = this._operationsToReplay.shift();
|
|
110
|
+
if (!operationJson) {
|
|
111
|
+
return res(true);
|
|
112
|
+
}
|
|
113
|
+
const operation = OperationFactory.fromJSON(operationJson, model.document);
|
|
114
|
+
writer.batch.addOperation(operation);
|
|
115
|
+
model.applyOperation(operation);
|
|
116
|
+
res(false);
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
}
|
|
140
120
|
}
|
package/src/dev-utils/utils.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* Note: This package is used only internally for debugging purposes and should not be used
|
|
8
7
|
* in other environments. It uses a few special methods not existing in the default
|
|
@@ -10,9 +9,7 @@
|
|
|
10
9
|
*
|
|
11
10
|
* @module engine/dev-utils/utils
|
|
12
11
|
*/
|
|
13
|
-
|
|
14
12
|
/* globals console */
|
|
15
|
-
|
|
16
13
|
/**
|
|
17
14
|
* Helper function, converts a map to the 'key1="value1" key2="value1"' format.
|
|
18
15
|
*
|
|
@@ -20,16 +17,13 @@
|
|
|
20
17
|
* @param {Map} map Map to convert.
|
|
21
18
|
* @returns {String} Converted map.
|
|
22
19
|
*/
|
|
23
|
-
export function convertMapToTags(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
return string;
|
|
20
|
+
export function convertMapToTags(map) {
|
|
21
|
+
let string = '';
|
|
22
|
+
for (const entry of map) {
|
|
23
|
+
string += ` ${entry[0]}=${JSON.stringify(entry[1])}`;
|
|
24
|
+
}
|
|
25
|
+
return string;
|
|
31
26
|
}
|
|
32
|
-
|
|
33
27
|
/**
|
|
34
28
|
* Helper function, converts a map to the '{"key1":"value1","key2":"value2"}' format.
|
|
35
29
|
*
|
|
@@ -37,19 +31,15 @@ export function convertMapToTags( map ) {
|
|
|
37
31
|
* @param {Map} map Map to convert.
|
|
38
32
|
* @returns {String} Converted map.
|
|
39
33
|
*/
|
|
40
|
-
export function convertMapToStringifiedObject(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return JSON.stringify( obj );
|
|
34
|
+
export function convertMapToStringifiedObject(map) {
|
|
35
|
+
const obj = {};
|
|
36
|
+
for (const entry of map) {
|
|
37
|
+
obj[entry[0]] = entry[1];
|
|
38
|
+
}
|
|
39
|
+
return JSON.stringify(obj);
|
|
48
40
|
}
|
|
49
|
-
|
|
50
|
-
const treeDump = Symbol( '_treeDump' );
|
|
41
|
+
const treeDump = Symbol('_treeDump');
|
|
51
42
|
const maxTreeDumpLength = 20;
|
|
52
|
-
|
|
53
43
|
/**
|
|
54
44
|
* Helper function that stores the `document` state for a given `version`.
|
|
55
45
|
*
|
|
@@ -57,34 +47,27 @@ const maxTreeDumpLength = 20;
|
|
|
57
47
|
* @param {*} document
|
|
58
48
|
* @param {*} version
|
|
59
49
|
*/
|
|
60
|
-
export function dumpTrees(
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const overflow = document[ treeDump ].length - maxTreeDumpLength;
|
|
72
|
-
|
|
73
|
-
if ( overflow > 0 ) {
|
|
74
|
-
document[ treeDump ][ overflow - 1 ] = null;
|
|
75
|
-
}
|
|
50
|
+
export function dumpTrees(document, version) {
|
|
51
|
+
console.log(document, version);
|
|
52
|
+
let string = '';
|
|
53
|
+
for (const root of document.roots) {
|
|
54
|
+
string += root.printTree() + '\n';
|
|
55
|
+
}
|
|
56
|
+
document[treeDump][version] = string.substr(0, string.length - 1); // Remove the last "\n".
|
|
57
|
+
const overflow = document[treeDump].length - maxTreeDumpLength;
|
|
58
|
+
if (overflow > 0) {
|
|
59
|
+
document[treeDump][overflow - 1] = null;
|
|
60
|
+
}
|
|
76
61
|
}
|
|
77
|
-
|
|
78
62
|
/**
|
|
79
63
|
* Helper function that initializes document dumping.
|
|
80
64
|
*
|
|
81
65
|
* @private
|
|
82
66
|
* @param {*} document
|
|
83
67
|
*/
|
|
84
|
-
export function initDocumentDumping(
|
|
85
|
-
|
|
68
|
+
export function initDocumentDumping(document) {
|
|
69
|
+
document[treeDump] = [];
|
|
86
70
|
}
|
|
87
|
-
|
|
88
71
|
/**
|
|
89
72
|
* Helper function that logs document for the given version.
|
|
90
73
|
*
|
|
@@ -92,12 +75,12 @@ export function initDocumentDumping( document ) {
|
|
|
92
75
|
* @param {*} document
|
|
93
76
|
* @param {*} version
|
|
94
77
|
*/
|
|
95
|
-
export function logDocument(
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
78
|
+
export function logDocument(document, version) {
|
|
79
|
+
console.log('--------------------');
|
|
80
|
+
if (document[treeDump][version]) {
|
|
81
|
+
console.log(document[treeDump][version]);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
console.log('Tree log unavailable for given version: ' + version);
|
|
85
|
+
}
|
|
103
86
|
}
|