浏览代码

Changed: wrapped functions exported by delta/transform.js in a single object.

Szymon Cofalik 8 年之前
父节点
当前提交
ce682a46c1

+ 3 - 1
packages/ckeditor5-engine/src/model/delta/basic-transformations.js

@@ -7,7 +7,9 @@
  * @module engine/model/delta/basic-transformations
  */
 
-import { addTransformationCase, defaultTransform } from './transform';
+import deltaTransform from './transform';
+const addTransformationCase = deltaTransform.addTransformationCase;
+const defaultTransform = deltaTransform.defaultTransform;
 
 import Range from '../range';
 import Position from '../position';

+ 15 - 5
packages/ckeditor5-engine/src/model/delta/transform.js

@@ -14,6 +14,16 @@ import arrayUtils from '@ckeditor/ckeditor5-utils/src/lib/lodash/array';
 
 const specialCases = new Map();
 
+const deltaTransform = {
+	transform,
+	defaultTransform,
+	addTransformationCase,
+	getTransformationCase,
+	transformDeltaSets
+};
+
+export default deltaTransform;
+
 /**
  * Transforms given {@link module:engine/model/delta/delta~Delta delta} by another {@link module:engine/model/delta/delta~Delta delta} and
  * returns the result of that transformation as an array containing one or more {@link module:engine/model/delta/delta~Delta delta}
@@ -39,7 +49,7 @@ const specialCases = new Map();
  * automatically and overwrites this flag.
  * @returns {Array.<module:engine/model/delta/delta~Delta>} Result of the transformation.
  */
-export default function transform( a, b, isAMoreImportantThanB ) {
+function transform( a, b, isAMoreImportantThanB ) {
 	const transformAlgorithm = getTransformationCase( a, b ) || defaultTransform;
 
 	const transformed = transformAlgorithm( a, b, isAMoreImportantThanB );
@@ -73,7 +83,7 @@ function updateBaseVersion( baseVersion, deltas ) {
  * automatically and overwrites this flag.
  * @returns {Array.<module:engine/model/delta/delta~Delta>} Result of the transformation, that is an array with single delta instance.
  */
-export function defaultTransform( a, b, isAMoreImportantThanB ) {
+function defaultTransform( a, b, isAMoreImportantThanB ) {
 	// First, resolve the flag real value.
 	isAMoreImportantThanB = getPriority( a.constructor, b.constructor, isAMoreImportantThanB );
 
@@ -167,7 +177,7 @@ export function defaultTransform( a, b, isAMoreImportantThanB ) {
  * @param {Function} B Delta constructor which instance will be transformed by.
  * @param {Function} resolver A callback that will handle custom special case transformation for instances of given delta classes.
  */
-export function addTransformationCase( A, B, resolver ) {
+function addTransformationCase( A, B, resolver ) {
 	let casesA = specialCases.get( A );
 
 	if ( !casesA ) {
@@ -184,7 +194,7 @@ export function addTransformationCase( A, B, resolver ) {
  * @param {module:engine/model/delta/delta~Delta} a Delta to transform.
  * @param {module:engine/model/delta/delta~Delta} b Delta to be transformed by.
  */
-export function getTransformationCase( a, b ) {
+function getTransformationCase( a, b ) {
 	let casesA = specialCases.get( a.constructor );
 
 	// If there are no special cases registered for class which `a` is instance of, we will
@@ -231,7 +241,7 @@ function getPriority( A, B, isAMoreImportantThanB ) {
  * @returns {Array.<module:engine/model/delta/delta~Delta>} return.deltasA The first set of deltas transformed by the second set of deltas.
  * @returns {Array.<module:engine/model/delta/delta~Delta>} return.deltasB The second set of deltas transformed by the first set of deltas.
  */
-export function transformDeltaSets( deltasA, deltasB, isAMoreImportantThanB ) {
+function transformDeltaSets( deltasA, deltasB, isAMoreImportantThanB ) {
 	let transformedDeltasA = Array.from( deltasA );
 	let transformedDeltasB = Array.from( deltasB );
 

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/attributedelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Text from '../../../../src/model/text';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/delta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Position from '../../../../src/model/position';
 import MoveOperation from '../../../../src/model/operation/moveoperation';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/insertdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/markerdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/mergedelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/movedelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Position from '../../../../src/model/position';
 import Range from '../../../../src/model/range';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/removedelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';

+ 2 - 2
packages/ckeditor5-engine/tests/model/delta/transform/renamedelta.js

@@ -6,11 +6,11 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';
-import Range from '../../../../src/model/range';
 
 import RenameDelta from '../../../../src/model/delta/renamedelta';
 import RenameOperation from '../../../../src/model/operation/renameoperation';

+ 2 - 2
packages/ckeditor5-engine/tests/model/delta/transform/splitdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';
@@ -22,7 +23,6 @@ import InsertOperation from '../../../../src/model/operation/insertoperation';
 import AttributeOperation from '../../../../src/model/operation/attributeoperation';
 import ReinsertOperation from '../../../../src/model/operation/reinsertoperation';
 import MoveOperation from '../../../../src/model/operation/moveoperation';
-import RemoveOperation from '../../../../src/model/operation/removeoperation';
 import NoOperation from '../../../../src/model/operation/nooperation';
 import RenameOperation from '../../../../src/model/operation/renameoperation';
 

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/transform.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import { transformDeltaSets } from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transformDeltaSets = deltaTransform.transformDeltaSets;
 
 import Document from '../../../../src/model/document';
 import Element from '../../../../src/model/element';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/unwrapdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/weakinsertdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Text from '../../../../src/model/text';
 import Position from '../../../../src/model/position';

+ 2 - 1
packages/ckeditor5-engine/tests/model/delta/transform/wrapdelta.js

@@ -6,7 +6,8 @@
 import transformations from '../../../../src/model/delta/basic-transformations';
 /*jshint unused: false*/
 
-import transform from '../../../../src/model/delta/transform';
+import deltaTransform from '../../../../src/model/delta/transform';
+const transform = deltaTransform.transform;
 
 import Element from '../../../../src/model/element';
 import Position from '../../../../src/model/position';