@ckeditor/ckeditor5-engine 34.2.0 → 35.1.0

package/src/view/styles/background.js

@@ -2,13 +2,7 @@
  * @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
  */
-
-/**
- * @module engine/view/styles/background
- */
-
 import { getShorthandValues, isAttachment, isColor, isPosition, isRepeat, isURL } from './utils';
-
 /**
  * Adds a background CSS styles processing rules.
  *
@@ -31,43 +25,48 @@ import { getShorthandValues, isAttachment, isColor, isPosition, isRepeat, isURL
  *
  * @param {module:engine/view/stylesmap~StylesProcessor} stylesProcessor
  */
-export function addBackgroundRules( stylesProcessor ) {
-	stylesProcessor.setNormalizer( 'background', normalizeBackground );
-	stylesProcessor.setNormalizer( 'background-color', value => ( { path: 'background.color', value } ) );
-	stylesProcessor.setReducer( 'background', value => {
-		const ret = [];
-
-		ret.push( [ 'background-color', value.color ] );
-
-		return ret;
-	} );
-
-	stylesProcessor.setStyleRelation( 'background', [ 'background-color' ] );
+export function addBackgroundRules(stylesProcessor) {
+    stylesProcessor.setNormalizer('background', getBackgroundNormalizer());
+    stylesProcessor.setNormalizer('background-color', getBackgroundColorNormalizer());
+    stylesProcessor.setReducer('background', getBackgroundReducer());
+    stylesProcessor.setStyleRelation('background', ['background-color']);
+}
+function getBackgroundNormalizer() {
+    return value => {
+        const background = {};
+        const parts = getShorthandValues(value);
+        for (const part of parts) {
+            if (isRepeat(part)) {
+                background.repeat = background.repeat || [];
+                background.repeat.push(part);
+            }
+            else if (isPosition(part)) {
+                background.position = background.position || [];
+                background.position.push(part);
+            }
+            else if (isAttachment(part)) {
+                background.attachment = part;
+            }
+            else if (isColor(part)) {
+                background.color = part;
+            }
+            else if (isURL(part)) {
+                background.image = part;
+            }
+        }
+        return {
+            path: 'background',
+            value: background
+        };
+    };
+}
+function getBackgroundColorNormalizer() {
+    return value => ({ path: 'background.color', value });
 }
-
-function normalizeBackground( value ) {
-	const background = {};
-
-	const parts = getShorthandValues( value );
-
-	for ( const part of parts ) {
-		if ( isRepeat( part ) ) {
-			background.repeat = background.repeat || [];
-			background.repeat.push( part );
-		} else if ( isPosition( part ) ) {
-			background.position = background.position || [];
-			background.position.push( part );
-		} else if ( isAttachment( part ) ) {
-			background.attachment = part;
-		} else if ( isColor( part ) ) {
-			background.color = part;
-		} else if ( isURL( part ) ) {
-			background.image = part;
-		}
-	}
-
-	return {
-		path: 'background',
-		value: background
-	};
+function getBackgroundReducer() {
+    return value => {
+        const ret = [];
+        ret.push(['background-color', value.color]);
+        return ret;
+    };
 }

package/src/view/styles/border.js

@@ -2,13 +2,7 @@
  * @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
  */
-
-/**
- * @module engine/view/styles/border
- */
-
 import { getShorthandValues, getBoxSidesValueReducer, getBoxSidesValues, isLength, isLineStyle } from './utils';
-
 /**
  * Adds a border CSS styles processing rules.
  *
@@ -41,200 +35,168 @@ import { getShorthandValues, getBoxSidesValueReducer, getBoxSidesValues, isLengt
  *
  * @param {module:engine/view/stylesmap~StylesProcessor} stylesProcessor
  */
-export function addBorderRules( stylesProcessor ) {
-	stylesProcessor.setNormalizer( 'border', borderNormalizer );
-
-	// Border-position shorthands.
-	stylesProcessor.setNormalizer( 'border-top', getBorderPositionNormalizer( 'top' ) );
-	stylesProcessor.setNormalizer( 'border-right', getBorderPositionNormalizer( 'right' ) );
-	stylesProcessor.setNormalizer( 'border-bottom', getBorderPositionNormalizer( 'bottom' ) );
-	stylesProcessor.setNormalizer( 'border-left', getBorderPositionNormalizer( 'left' ) );
-
-	// Border-property shorthands.
-	stylesProcessor.setNormalizer( 'border-color', getBorderPropertyNormalizer( 'color' ) );
-	stylesProcessor.setNormalizer( 'border-width', getBorderPropertyNormalizer( 'width' ) );
-	stylesProcessor.setNormalizer( 'border-style', getBorderPropertyNormalizer( 'style' ) );
-
-	// Border longhands.
-	stylesProcessor.setNormalizer( 'border-top-color', getBorderPropertyPositionNormalizer( 'color', 'top' ) );
-	stylesProcessor.setNormalizer( 'border-top-style', getBorderPropertyPositionNormalizer( 'style', 'top' ) );
-	stylesProcessor.setNormalizer( 'border-top-width', getBorderPropertyPositionNormalizer( 'width', 'top' ) );
-
-	stylesProcessor.setNormalizer( 'border-right-color', getBorderPropertyPositionNormalizer( 'color', 'right' ) );
-	stylesProcessor.setNormalizer( 'border-right-style', getBorderPropertyPositionNormalizer( 'style', 'right' ) );
-	stylesProcessor.setNormalizer( 'border-right-width', getBorderPropertyPositionNormalizer( 'width', 'right' ) );
-
-	stylesProcessor.setNormalizer( 'border-bottom-color', getBorderPropertyPositionNormalizer( 'color', 'bottom' ) );
-	stylesProcessor.setNormalizer( 'border-bottom-style', getBorderPropertyPositionNormalizer( 'style', 'bottom' ) );
-	stylesProcessor.setNormalizer( 'border-bottom-width', getBorderPropertyPositionNormalizer( 'width', 'bottom' ) );
-
-	stylesProcessor.setNormalizer( 'border-left-color', getBorderPropertyPositionNormalizer( 'color', 'left' ) );
-	stylesProcessor.setNormalizer( 'border-left-style', getBorderPropertyPositionNormalizer( 'style', 'left' ) );
-	stylesProcessor.setNormalizer( 'border-left-width', getBorderPropertyPositionNormalizer( 'width', 'left' ) );
-
-	stylesProcessor.setExtractor( 'border-top', getBorderPositionExtractor( 'top' ) );
-	stylesProcessor.setExtractor( 'border-right', getBorderPositionExtractor( 'right' ) );
-	stylesProcessor.setExtractor( 'border-bottom', getBorderPositionExtractor( 'bottom' ) );
-	stylesProcessor.setExtractor( 'border-left', getBorderPositionExtractor( 'left' ) );
-
-	stylesProcessor.setExtractor( 'border-top-color', 'border.color.top' );
-	stylesProcessor.setExtractor( 'border-right-color', 'border.color.right' );
-	stylesProcessor.setExtractor( 'border-bottom-color', 'border.color.bottom' );
-	stylesProcessor.setExtractor( 'border-left-color', 'border.color.left' );
-
-	stylesProcessor.setExtractor( 'border-top-width', 'border.width.top' );
-	stylesProcessor.setExtractor( 'border-right-width', 'border.width.right' );
-	stylesProcessor.setExtractor( 'border-bottom-width', 'border.width.bottom' );
-	stylesProcessor.setExtractor( 'border-left-width', 'border.width.left' );
-
-	stylesProcessor.setExtractor( 'border-top-style', 'border.style.top' );
-	stylesProcessor.setExtractor( 'border-right-style', 'border.style.right' );
-	stylesProcessor.setExtractor( 'border-bottom-style', 'border.style.bottom' );
-	stylesProcessor.setExtractor( 'border-left-style', 'border.style.left' );
-
-	stylesProcessor.setReducer( 'border-color', getBoxSidesValueReducer( 'border-color' ) );
-	stylesProcessor.setReducer( 'border-style', getBoxSidesValueReducer( 'border-style' ) );
-	stylesProcessor.setReducer( 'border-width', getBoxSidesValueReducer( 'border-width' ) );
-	stylesProcessor.setReducer( 'border-top', getBorderPositionReducer( 'top' ) );
-	stylesProcessor.setReducer( 'border-right', getBorderPositionReducer( 'right' ) );
-	stylesProcessor.setReducer( 'border-bottom', getBorderPositionReducer( 'bottom' ) );
-	stylesProcessor.setReducer( 'border-left', getBorderPositionReducer( 'left' ) );
-	stylesProcessor.setReducer( 'border', getBorderReducer() );
-
-	stylesProcessor.setStyleRelation( 'border', [
-		'border-color', 'border-style', 'border-width',
-		'border-top', 'border-right', 'border-bottom', 'border-left',
-		'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color',
-		'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style',
-		'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'
-	] );
-
-	stylesProcessor.setStyleRelation( 'border-color', [
-		'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color'
-	] );
-	stylesProcessor.setStyleRelation( 'border-style', [
-		'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style'
-	] );
-	stylesProcessor.setStyleRelation( 'border-width', [
-		'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'
-	] );
-
-	stylesProcessor.setStyleRelation( 'border-top', [ 'border-top-color', 'border-top-style', 'border-top-width' ] );
-	stylesProcessor.setStyleRelation( 'border-right', [ 'border-right-color', 'border-right-style', 'border-right-width' ] );
-	stylesProcessor.setStyleRelation( 'border-bottom', [ 'border-bottom-color', 'border-bottom-style', 'border-bottom-width' ] );
-	stylesProcessor.setStyleRelation( 'border-left', [ 'border-left-color', 'border-left-style', 'border-left-width' ] );
+export function addBorderRules(stylesProcessor) {
+    stylesProcessor.setNormalizer('border', getBorderNormalizer());
+    // Border-position shorthands.
+    stylesProcessor.setNormalizer('border-top', getBorderPositionNormalizer('top'));
+    stylesProcessor.setNormalizer('border-right', getBorderPositionNormalizer('right'));
+    stylesProcessor.setNormalizer('border-bottom', getBorderPositionNormalizer('bottom'));
+    stylesProcessor.setNormalizer('border-left', getBorderPositionNormalizer('left'));
+    // Border-property shorthands.
+    stylesProcessor.setNormalizer('border-color', getBorderPropertyNormalizer('color'));
+    stylesProcessor.setNormalizer('border-width', getBorderPropertyNormalizer('width'));
+    stylesProcessor.setNormalizer('border-style', getBorderPropertyNormalizer('style'));
+    // Border longhands.
+    stylesProcessor.setNormalizer('border-top-color', getBorderPropertyPositionNormalizer('color', 'top'));
+    stylesProcessor.setNormalizer('border-top-style', getBorderPropertyPositionNormalizer('style', 'top'));
+    stylesProcessor.setNormalizer('border-top-width', getBorderPropertyPositionNormalizer('width', 'top'));
+    stylesProcessor.setNormalizer('border-right-color', getBorderPropertyPositionNormalizer('color', 'right'));
+    stylesProcessor.setNormalizer('border-right-style', getBorderPropertyPositionNormalizer('style', 'right'));
+    stylesProcessor.setNormalizer('border-right-width', getBorderPropertyPositionNormalizer('width', 'right'));
+    stylesProcessor.setNormalizer('border-bottom-color', getBorderPropertyPositionNormalizer('color', 'bottom'));
+    stylesProcessor.setNormalizer('border-bottom-style', getBorderPropertyPositionNormalizer('style', 'bottom'));
+    stylesProcessor.setNormalizer('border-bottom-width', getBorderPropertyPositionNormalizer('width', 'bottom'));
+    stylesProcessor.setNormalizer('border-left-color', getBorderPropertyPositionNormalizer('color', 'left'));
+    stylesProcessor.setNormalizer('border-left-style', getBorderPropertyPositionNormalizer('style', 'left'));
+    stylesProcessor.setNormalizer('border-left-width', getBorderPropertyPositionNormalizer('width', 'left'));
+    stylesProcessor.setExtractor('border-top', getBorderPositionExtractor('top'));
+    stylesProcessor.setExtractor('border-right', getBorderPositionExtractor('right'));
+    stylesProcessor.setExtractor('border-bottom', getBorderPositionExtractor('bottom'));
+    stylesProcessor.setExtractor('border-left', getBorderPositionExtractor('left'));
+    stylesProcessor.setExtractor('border-top-color', 'border.color.top');
+    stylesProcessor.setExtractor('border-right-color', 'border.color.right');
+    stylesProcessor.setExtractor('border-bottom-color', 'border.color.bottom');
+    stylesProcessor.setExtractor('border-left-color', 'border.color.left');
+    stylesProcessor.setExtractor('border-top-width', 'border.width.top');
+    stylesProcessor.setExtractor('border-right-width', 'border.width.right');
+    stylesProcessor.setExtractor('border-bottom-width', 'border.width.bottom');
+    stylesProcessor.setExtractor('border-left-width', 'border.width.left');
+    stylesProcessor.setExtractor('border-top-style', 'border.style.top');
+    stylesProcessor.setExtractor('border-right-style', 'border.style.right');
+    stylesProcessor.setExtractor('border-bottom-style', 'border.style.bottom');
+    stylesProcessor.setExtractor('border-left-style', 'border.style.left');
+    stylesProcessor.setReducer('border-color', getBoxSidesValueReducer('border-color'));
+    stylesProcessor.setReducer('border-style', getBoxSidesValueReducer('border-style'));
+    stylesProcessor.setReducer('border-width', getBoxSidesValueReducer('border-width'));
+    stylesProcessor.setReducer('border-top', getBorderPositionReducer('top'));
+    stylesProcessor.setReducer('border-right', getBorderPositionReducer('right'));
+    stylesProcessor.setReducer('border-bottom', getBorderPositionReducer('bottom'));
+    stylesProcessor.setReducer('border-left', getBorderPositionReducer('left'));
+    stylesProcessor.setReducer('border', getBorderReducer());
+    stylesProcessor.setStyleRelation('border', [
+        'border-color', 'border-style', 'border-width',
+        'border-top', 'border-right', 'border-bottom', 'border-left',
+        'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color',
+        'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style',
+        'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'
+    ]);
+    stylesProcessor.setStyleRelation('border-color', [
+        'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color'
+    ]);
+    stylesProcessor.setStyleRelation('border-style', [
+        'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style'
+    ]);
+    stylesProcessor.setStyleRelation('border-width', [
+        'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'
+    ]);
+    stylesProcessor.setStyleRelation('border-top', ['border-top-color', 'border-top-style', 'border-top-width']);
+    stylesProcessor.setStyleRelation('border-right', ['border-right-color', 'border-right-style', 'border-right-width']);
+    stylesProcessor.setStyleRelation('border-bottom', ['border-bottom-color', 'border-bottom-style', 'border-bottom-width']);
+    stylesProcessor.setStyleRelation('border-left', ['border-left-color', 'border-left-style', 'border-left-width']);
 }
-
-function borderNormalizer( value ) {
-	const { color, style, width } = normalizeBorderShorthand( value );
-
-	return {
-		path: 'border',
-		value: {
-			color: getBoxSidesValues( color ),
-			style: getBoxSidesValues( style ),
-			width: getBoxSidesValues( width )
-		}
-	};
+function getBorderNormalizer() {
+    return value => {
+        const { color, style, width } = normalizeBorderShorthand(value);
+        return {
+            path: 'border',
+            value: {
+                color: getBoxSidesValues(color),
+                style: getBoxSidesValues(style),
+                width: getBoxSidesValues(width)
+            }
+        };
+    };
 }
-
-function getBorderPositionNormalizer( side ) {
-	return value => {
-		const { color, style, width } = normalizeBorderShorthand( value );
-
-		const border = {};
-
-		if ( color !== undefined ) {
-			border.color = { [ side ]: color };
-		}
-
-		if ( style !== undefined ) {
-			border.style = { [ side ]: style };
-		}
-
-		if ( width !== undefined ) {
-			border.width = { [ side ]: width };
-		}
-
-		return {
-			path: 'border',
-			value: border
-		};
-	};
+function getBorderPositionNormalizer(side) {
+    return value => {
+        const { color, style, width } = normalizeBorderShorthand(value);
+        const border = {};
+        if (color !== undefined) {
+            border.color = { [side]: color };
+        }
+        if (style !== undefined) {
+            border.style = { [side]: style };
+        }
+        if (width !== undefined) {
+            border.width = { [side]: width };
+        }
+        return {
+            path: 'border',
+            value: border
+        };
+    };
 }
-
-function getBorderPropertyNormalizer( propertyName ) {
-	return value => {
-		return {
-			path: 'border',
-			value: toBorderPropertyShorthand( value, propertyName )
-		};
-	};
+function getBorderPropertyNormalizer(propertyName) {
+    return value => {
+        return {
+            path: 'border',
+            value: toBorderPropertyShorthand(value, propertyName)
+        };
+    };
 }
-
-function toBorderPropertyShorthand( value, property ) {
-	return {
-		[ property ]: getBoxSidesValues( value )
-	};
+function toBorderPropertyShorthand(value, property) {
+    return {
+        [property]: getBoxSidesValues(value)
+    };
 }
-
-function getBorderPropertyPositionNormalizer( property, side ) {
-	return value => {
-		return {
-			path: 'border',
-			value: {
-				[ property ]: {
-					[ side ]: value
-				}
-			}
-		};
-	};
+function getBorderPropertyPositionNormalizer(property, side) {
+    return value => {
+        return {
+            path: 'border',
+            value: {
+                [property]: {
+                    [side]: value
+                }
+            }
+        };
+    };
 }
-
-function getBorderPositionExtractor( which ) {
-	return ( name, styles ) => {
-		if ( styles.border ) {
-			return extractBorderPosition( styles.border, which );
-		}
-	};
+function getBorderPositionExtractor(which) {
+    return (name, styles) => {
+        if (styles.border) {
+            return extractBorderPosition(styles.border, which);
+        }
+    };
 }
-
-function extractBorderPosition( border, which ) {
-	const value = {};
-
-	if ( border.width && border.width[ which ] ) {
-		value.width = border.width[ which ];
-	}
-
-	if ( border.style && border.style[ which ] ) {
-		value.style = border.style[ which ];
-	}
-
-	if ( border.color && border.color[ which ] ) {
-		value.color = border.color[ which ];
-	}
-
-	return value;
+function extractBorderPosition(border, which) {
+    const value = {};
+    if (border.width && border.width[which]) {
+        value.width = border.width[which];
+    }
+    if (border.style && border.style[which]) {
+        value.style = border.style[which];
+    }
+    if (border.color && border.color[which]) {
+        value.color = border.color[which];
+    }
+    return value;
 }
-
-function normalizeBorderShorthand( string ) {
-	const result = {};
-
-	const parts = getShorthandValues( string );
-
-	for ( const part of parts ) {
-		if ( isLength( part ) || /thin|medium|thick/.test( part ) ) {
-			result.width = part;
-		} else if ( isLineStyle( part ) ) {
-			result.style = part;
-		} else {
-			result.color = part;
-		}
-	}
-
-	return result;
+function normalizeBorderShorthand(string) {
+    const result = {};
+    const parts = getShorthandValues(string);
+    for (const part of parts) {
+        if (isLength(part) || /thin|medium|thick/.test(part)) {
+            result.width = part;
+        }
+        else if (isLineStyle(part)) {
+            result.style = part;
+        }
+        else {
+            result.color = part;
+        }
+    }
+    return result;
 }
-
 // The border reducer factory.
 //
 // It tries to produce the most optimal output for the specified styles.
@@ -262,62 +224,51 @@ function normalizeBorderShorthand( string ) {
 //
 // @returns {Function}
 function getBorderReducer() {
-	return value => {
-		const topStyles = extractBorderPosition( value, 'top' );
-		const rightStyles = extractBorderPosition( value, 'right' );
-		const bottomStyles = extractBorderPosition( value, 'bottom' );
-		const leftStyles = extractBorderPosition( value, 'left' );
-
-		const borderStyles = [ topStyles, rightStyles, bottomStyles, leftStyles ];
-
-		const borderStylesByType = {
-			width: getReducedStyleValueForType( borderStyles, 'width' ),
-			style: getReducedStyleValueForType( borderStyles, 'style' ),
-			color: getReducedStyleValueForType( borderStyles, 'color' )
-		};
-
-		// Try reducing to a single `border:` property.
-		const reducedBorderStyle = reduceBorderPosition( borderStylesByType, 'all' );
-
-		if ( reducedBorderStyle.length ) {
-			return reducedBorderStyle;
-		}
-
-		// Try reducing to `border-style:`, `border-width:`, `border-color:` properties.
-		const reducedStyleTypes = Object.entries( borderStylesByType ).reduce( ( reducedStyleTypes, [ type, value ] ) => {
-			if ( value ) {
-				reducedStyleTypes.push( [ `border-${ type }`, value ] );
-
-				// Remove it from the full set to not include it in the most specific properties later.
-				borderStyles.forEach( style => ( style[ type ] = null ) );
-			}
-
-			return reducedStyleTypes;
-		}, [] );
-
-		// The reduced properties (by type) and all that remains that could not be reduced.
-		return [
-			...reducedStyleTypes,
-			...reduceBorderPosition( topStyles, 'top' ),
-			...reduceBorderPosition( rightStyles, 'right' ),
-			...reduceBorderPosition( bottomStyles, 'bottom' ),
-			...reduceBorderPosition( leftStyles, 'left' )
-		];
-	};
-
-	// @param {Array.<Object>} styles The array of objects with `style`, `color`, `width` properties.
-	// @param {'width'|'style'|'color'} type
-	function getReducedStyleValueForType( styles, type ) {
-		return styles
-			.map( style => style[ type ] )
-			.reduce( ( result, style ) => result == style ? result : null );
-	}
+    return value => {
+        const topStyles = extractBorderPosition(value, 'top');
+        const rightStyles = extractBorderPosition(value, 'right');
+        const bottomStyles = extractBorderPosition(value, 'bottom');
+        const leftStyles = extractBorderPosition(value, 'left');
+        const borderStyles = [topStyles, rightStyles, bottomStyles, leftStyles];
+        const borderStylesByType = {
+            width: getReducedStyleValueForType(borderStyles, 'width'),
+            style: getReducedStyleValueForType(borderStyles, 'style'),
+            color: getReducedStyleValueForType(borderStyles, 'color')
+        };
+        // Try reducing to a single `border:` property.
+        const reducedBorderStyle = reduceBorderPosition(borderStylesByType, 'all');
+        if (reducedBorderStyle.length) {
+            return reducedBorderStyle;
+        }
+        // Try reducing to `border-style:`, `border-width:`, `border-color:` properties.
+        const reducedStyleTypes = Object.entries(borderStylesByType).reduce((reducedStyleTypes, [type, value]) => {
+            if (value) {
+                reducedStyleTypes.push([`border-${type}`, value]);
+                // Remove it from the full set to not include it in the most specific properties later.
+                borderStyles.forEach(style => delete style[type]);
+            }
+            return reducedStyleTypes;
+        }, []);
+        // The reduced properties (by type) and all that remains that could not be reduced.
+        return [
+            ...reducedStyleTypes,
+            ...reduceBorderPosition(topStyles, 'top'),
+            ...reduceBorderPosition(rightStyles, 'right'),
+            ...reduceBorderPosition(bottomStyles, 'bottom'),
+            ...reduceBorderPosition(leftStyles, 'left')
+        ];
+    };
+    // @param {Array.<Object>} styles The array of objects with `style`, `color`, `width` properties.
+    // @param {'width'|'style'|'color'} type
+    function getReducedStyleValueForType(styles, type) {
+        return styles
+            .map(style => style[type])
+            .reduce((result, style) => result == style ? result : null);
+    }
 }
-
-function getBorderPositionReducer( which ) {
-	return value => reduceBorderPosition( value, which );
+function getBorderPositionReducer(which) {
+    return value => reduceBorderPosition(value, which);
 }
-
 // Returns an array with reduced border styles depending on the specified values.
 //
 // If all border properties (width, style, color) are specified, the returned selector will be
@@ -328,35 +279,28 @@ function getBorderPositionReducer( which ) {
 // @param {Object|null} value Styles if defined.
 // @param {'top'|'right'|'bottom'|'left'|'all'} which The border position.
 // @returns {Array}
-function reduceBorderPosition( value, which ) {
-	const borderTypes = [];
-
-	if ( value && value.width ) {
-		borderTypes.push( 'width' );
-	}
-
-	if ( value && value.style ) {
-		borderTypes.push( 'style' );
-	}
-
-	if ( value && value.color ) {
-		borderTypes.push( 'color' );
-	}
-
-	if ( borderTypes.length == 3 ) {
-		const borderValue = borderTypes.map( item => value[ item ] ).join( ' ' );
-
-		return [
-			which == 'all' ? [ 'border', borderValue ] : [ `border-${ which }`, borderValue ]
-		];
-	}
-
-	// We are unable to reduce to a single `border:` property.
-	if ( which == 'all' ) {
-		return [];
-	}
-
-	return borderTypes.map( type => {
-		return [ `border-${ which }-${ type }`, value[ type ] ];
-	} );
+function reduceBorderPosition(value, which) {
+    const borderTypes = [];
+    if (value && (value.width)) {
+        borderTypes.push('width');
+    }
+    if (value && (value.style)) {
+        borderTypes.push('style');
+    }
+    if (value && (value.color)) {
+        borderTypes.push('color');
+    }
+    if (borderTypes.length == 3) {
+        const borderValue = borderTypes.map(item => value[item]).join(' ');
+        return [
+            which == 'all' ? ['border', borderValue] : [`border-${which}`, borderValue]
+        ];
+    }
+    // We are unable to reduce to a single `border:` property.
+    if (which == 'all') {
+        return [];
+    }
+    return borderTypes.map(type => {
+        return [`border-${which}-${type}`, value[type]];
+    });
 }