Merge pull request #1493 from ckeditor/t/1477

Other: Make `toJSON()` to serialize nested objects. Closes #1477.

Author: Piotr Jasiun

src/dev-utils/enableenginedebug.js

@@ -427,7 +427,7 @@ function enableReplayerTools() {
 			this._appliedOperations = [];
 		}
 
-		this._appliedOperations.push( operation.toJSON() );
+		this._appliedOperations.push( operation );
 
 		return _modelApplyOperation.call( this, operation );
 	} );
@@ -455,7 +455,7 @@ function enableDocumentTools() {
 			this._operationLogs = [];
 		}
 
-		this._operationLogs.push( JSON.stringify( operation.toJSON() ) );
+		this._operationLogs.push( JSON.stringify( operation ) );
 
 		return _modelApplyOperation.call( this, operation );
 	} );

src/model/node.js

@@ -380,8 +380,14 @@ export default class Node {
 	toJSON() {
 		const json = {};
 
+		// Serializes attributes to the object.
+		// attributes = { a: 'foo', b: 1, c: true }.
 		if ( this._attrs.size ) {
-			json.attributes = [ ...this._attrs ];
+			json.attributes = Array.from( this._attrs ).reduce( ( result, attr ) => {
+				result[ attr[ 0 ] ] = attr[ 1 ];
+
+				return result;
+			}, {} );
 		}
 
 		return json;

src/model/operation/attributeoperation.js

@@ -107,6 +107,17 @@ export default class AttributeOperation extends Operation {
 		return new AttributeOperation( this.range, this.key, this.newValue, this.oldValue, this.baseVersion + 1 );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.range = this.range.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */

src/model/operation/detachoperation.js

@@ -53,6 +53,17 @@ export default class DetachOperation extends Operation {
 		return 'detach';
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.sourcePosition = this.sourcePosition.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */

src/model/operation/insertoperation.js

@@ -128,6 +128,18 @@ export default class InsertOperation extends Operation {
 		_insert( this.position, originalNodes );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.position = this.position.toJSON();
+		json.nodes = this.nodes.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */

src/model/operation/markeroperation.js

@@ -109,6 +109,14 @@ export default class MarkerOperation extends Operation {
 	toJSON() {
 		const json = super.toJSON();
 
+		if ( this.oldRange ) {
+			json.oldRange = this.oldRange.toJSON();
+		}
+
+		if ( this.newRange ) {
+			json.newRange = this.newRange.toJSON();
+		}
+
 		delete json._markers;
 
 		return json;

src/model/operation/mergeoperation.js

@@ -152,6 +152,19 @@ export default class MergeOperation extends Operation {
 		_move( Range.createOn( mergedElement ), this.graveyardPosition );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.sourcePosition = json.sourcePosition.toJSON();
+		json.targetPosition = json.targetPosition.toJSON();
+		json.graveyardPosition = json.graveyardPosition.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */

src/model/operation/moveoperation.js

@@ -175,6 +175,18 @@ export default class MoveOperation extends Operation {
 		_move( Range.createFromPositionAndShift( this.sourcePosition, this.howMany ), this.targetPosition );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.sourcePosition = this.sourcePosition.toJSON();
+		json.targetPosition = this.targetPosition.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */

src/model/operation/operation.js

@@ -7,8 +7,6 @@
  * @module engine/model/operation/operation
  */
 
-import { clone } from 'lodash-es';
-
 /**
  * Abstract base operation class.
  *
@@ -94,7 +92,9 @@ export default class Operation {
 	 * @returns {Object} Clone of this object with the operation property replaced with string.
 	 */
 	toJSON() {
-		const json = clone( this, true );
+		// This method creates only a shallow copy, all nested objects should be defined separately.
+		// See https://github.com/ckeditor/ckeditor5-engine/issues/1477.
+		const json = Object.assign( {}, this );
 
 		json.__className = this.constructor.className;
 

src/model/operation/renameoperation.js

@@ -116,6 +116,17 @@ export default class RenameOperation extends Operation {
 		element.name = this.newName;
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	toJSON() {
+		const json = super.toJSON();
+
+		json.position = this.position.toJSON();
+
+		return json;
+	}
+
 	/**
 	 * @inheritDoc
 	 */