Replace more constants with property names

This is a follow-up to e337088.

Author: asamuzaK

lib/normalize.js

@@ -3,6 +3,8 @@
 const propertyDefinitions = require("./generated/propertyDefinitions");
 const { hasVarFunc, isGlobalKeyword, isValidPropertyValue, splitValue } = require("./parsers");
 const background = require("./properties/background");
+const backgroundColor = require("./properties/backgroundColor");
+const backgroundSize = require("./properties/backgroundSize");
 const border = require("./properties/border");
 const borderWidth = require("./properties/borderWidth");
 const borderStyle = require("./properties/borderStyle");
@@ -17,18 +19,7 @@ const margin = require("./properties/margin");
 const padding = require("./properties/padding");
 
 /* constants */
-const BACKGROUND = "background";
-const BACKGROUND_COLOR = "background-color";
-const BACKGROUND_SIZE = "background-size";
-const BORDER = "border";
-const BORDER_BOTTOM = "border-bottom";
-const BORDER_COLOR = "border-color";
 const BORDER_IMAGE = "border-image";
-const BORDER_LEFT = "border-left";
-const BORDER_RIGHT = "border-right";
-const BORDER_STYLE = "border-style";
-const BORDER_TOP = "border-top";
-const BORDER_WIDTH = "border-width";
 const TOP = "top";
 const RIGHT = "right";
 const BOTTOM = "bottom";
@@ -46,9 +37,9 @@ const TRBL_INDICES = {
 
 /* shorthands */
 const shorthandProperties = new Map([
-  [BACKGROUND, background],
+  [background.property, background],
   [
-    BORDER,
+    border.property,
     {
       definition: border.definition,
       parse: border.parse,
@@ -59,13 +50,13 @@ const shorthandProperties = new Map([
       ])
     }
   ],
-  [BORDER_WIDTH, borderWidth],
-  [BORDER_STYLE, borderStyle],
-  [BORDER_COLOR, borderColor],
-  [BORDER_TOP, borderTop],
-  [BORDER_RIGHT, borderRight],
-  [BORDER_BOTTOM, borderBottom],
-  [BORDER_LEFT, borderLeft],
+  [borderWidth.property, borderWidth],
+  [borderStyle.property, borderStyle],
+  [borderColor.property, borderColor],
+  [borderTop.property, borderTop],
+  [borderRight.property, borderRight],
+  [borderBottom.property, borderBottom],
+  [borderLeft.property, borderLeft],
   ["flex", flex],
   ["font", font],
   ["margin", margin],
@@ -74,7 +65,7 @@ const shorthandProperties = new Map([
 
 /* borders */
 const borderProperties = new Set([
-  BORDER,
+  border.property,
   BORDER_IMAGE,
   ...border.shorthandFor.keys(),
   ...border.positionShorthandFor.keys(),
@@ -199,10 +190,10 @@ const replaceBackgroundShorthand = (property, properties, opt) => {
   const values = splitValue(parsedValue, {
     delimiter: ","
   });
-  const { value: shorthandValue } = properties.get(BACKGROUND);
+  const { value: shorthandValue } = properties.get(background.property);
   const bgValues = background.parse(shorthandValue, opt);
   const bgLength = bgValues.length;
-  if (property === BACKGROUND_COLOR) {
+  if (property === backgroundColor.property) {
     bgValues[bgLength - 1][property] = parsedValue[0];
   } else {
     for (let i = 0; i < bgLength; i++) {
@@ -216,7 +207,7 @@ const replaceBackgroundShorthand = (property, properties, opt) => {
       if (!value || value === background.initialValues.get(longhand)) {
         continue;
       }
-      if (longhand === BACKGROUND_SIZE) {
+      if (longhand === backgroundSize.property) {
         bg.push(`/ ${value}`);
       } else {
         bg.push(value);
@@ -526,7 +517,7 @@ const prepareBorderStringValue = ({
     globalObject,
     options
   };
-  const shorthandItem = getPropertyItem(BORDER, properties);
+  const shorthandItem = getPropertyItem(border.property, properties);
   const imageItem = getPropertyItem(BORDER_IMAGE, properties);
   // Handle longhand properties.
   if (prop3) {
@@ -570,7 +561,7 @@ const prepareBorderStringValue = ({
         positionItem.value = "";
       }
     }
-    borderItems.set(BORDER, shorthandItem);
+    borderItems.set(border.property, shorthandItem);
     borderItems.set(BORDER_IMAGE, imageItem);
     borderItems.set(lineProperty, lineItem);
     borderItems.set(positionProperty, positionItem);
@@ -639,7 +630,7 @@ const prepareBorderStringValue = ({
       longhandItem.priority = priority;
       borderItems.set(longhandProperty, longhandItem);
     }
-    borderItems.set(BORDER, shorthandItem);
+    borderItems.set(border.property, shorthandItem);
     borderItems.set(BORDER_IMAGE, imageItem);
     borderItems.set(lineWidthProperty, lineWidthItem);
     borderItems.set(lineStyleProperty, lineStyleItem);
@@ -678,7 +669,7 @@ const prepareBorderStringValue = ({
       borderItems.set(positionProperty, positionItem);
       borderItems.set(longhandProperty, longhandItem);
     }
-    borderItems.set(BORDER, shorthandItem);
+    borderItems.set(border.property, shorthandItem);
     borderItems.set(BORDER_IMAGE, imageItem);
     borderItems.set(lineProperty, lineItem);
     // Handle border shorthand.
@@ -732,7 +723,7 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
   if (!value.length || !borderLines.has(prop2)) {
     return;
   }
-  const shorthandItem = getPropertyItem(BORDER, properties);
+  const shorthandItem = getPropertyItem(border.property, properties);
   const imageItem = getPropertyItem(BORDER_IMAGE, properties);
   const lineProperty = `${prop1}-${prop2}`;
   const lineItem = getPropertyItem(lineProperty, properties);
@@ -803,7 +794,7 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
     borderItems.set(positionProperty, positionItem);
     borderItems.set(longhandProperty, longhandItem);
   }
-  borderItems.set(BORDER, shorthandItem);
+  borderItems.set(border.property, shorthandItem);
   borderItems.set(BORDER_IMAGE, imageItem);
   borderItems.set(lineProperty, lineItem);
 };
@@ -841,7 +832,7 @@ const prepareBorderObjectValue = ({
     if (!borderPositions.has(prop2)) {
       return;
     }
-    const shorthandItem = getPropertyItem(BORDER, properties);
+    const shorthandItem = getPropertyItem(border.property, properties);
     const lineWidthProperty = `${prop1}-width`;
     const lineWidthItem = getPropertyItem(lineWidthProperty, properties);
     const lineStyleProperty = `${prop1}-style`;
@@ -889,7 +880,7 @@ const prepareBorderObjectValue = ({
       longhandItem.priority = priority;
       borderItems.set(longhandProperty, longhandItem);
     }
-    borderItems.set(BORDER, shorthandItem);
+    borderItems.set(border.property, shorthandItem);
     borderItems.set(BORDER_IMAGE, imageItem);
     borderItems.set(lineWidthProperty, lineWidthItem);
     borderItems.set(lineStyleProperty, lineStyleItem);
@@ -967,17 +958,17 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
   if (typeof property !== "string" || value === null) {
     return;
   }
-  if (!property.startsWith(BORDER)) {
+  if (!property.startsWith(border.property)) {
     return;
   }
   let prop2, prop3;
-  if (property.length > BORDER.length) {
+  if (property.length > border.property.length) {
     // Check if next char is '-'
-    if (property.charCodeAt(BORDER.length) !== 45) {
+    if (property.charCodeAt(border.property.length) !== 45) {
       return;
     }
     // property is like "border-..."
-    const remainder = property.substring(BORDER.length + 1);
+    const remainder = property.substring(border.property.length + 1);
     const hyphenIndex = remainder.indexOf("-");
     if (hyphenIndex !== -1) {
       prop2 = remainder.substring(0, hyphenIndex);
@@ -993,7 +984,7 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
     return;
   }
   const parts = {
-    prop1: BORDER,
+    prop1: border.property,
     prop2,
     prop3
   };
@@ -1028,22 +1019,22 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
       borderItems
     });
   }
-  if (!borderItems.has(BORDER)) {
+  if (!borderItems.has(border.property)) {
     return;
   }
-  const borderProps = new Map([[BORDER, borderItems.get(BORDER)]]);
+  const borderProps = new Map([[border.property, borderItems.get(border.property)]]);
   for (const line of borderLines) {
-    const lineProperty = `${BORDER}-${line}`;
+    const lineProperty = `${border.property}-${line}`;
     const lineItem = borderItems.get(lineProperty) ?? getPropertyItem(lineProperty, properties);
     borderProps.set(lineProperty, lineItem);
   }
   for (const position of borderPositions) {
-    const positionProperty = `${BORDER}-${position}`;
+    const positionProperty = `${border.property}-${position}`;
     const positionItem =
       borderItems.get(positionProperty) ?? getPropertyItem(positionProperty, properties);
     borderProps.set(positionProperty, positionItem);
     for (const line of borderLines) {
-      const longhandProperty = `${BORDER}-${position}-${line}`;
+      const longhandProperty = `${border.property}-${position}-${line}`;
       const longhandItem =
         borderItems.get(longhandProperty) ?? getPropertyItem(longhandProperty, properties);
       borderProps.set(longhandProperty, longhandItem);
@@ -1108,31 +1099,31 @@ const generateBorderShorthand = (items, property, priority = "") => {
 
 const borderCollectionConfig = {
   [WIDTH]: {
-    shorthand: BORDER_WIDTH,
+    shorthand: borderWidth.property,
     generator: generateBorderLineShorthand
   },
   [STYLE]: {
-    shorthand: BORDER_STYLE,
+    shorthand: borderStyle.property,
     generator: generateBorderLineShorthand
   },
   [COLOR]: {
-    shorthand: BORDER_COLOR,
+    shorthand: borderColor.property,
     generator: generateBorderLineShorthand
   },
   [TOP]: {
-    shorthand: BORDER_TOP,
+    shorthand: borderTop.property,
     generator: generateBorderPositionShorthand
   },
   [RIGHT]: {
-    shorthand: BORDER_RIGHT,
+    shorthand: borderRight.property,
     generator: generateBorderPositionShorthand
   },
   [BOTTOM]: {
-    shorthand: BORDER_BOTTOM,
+    shorthand: borderBottom.property,
     generator: generateBorderPositionShorthand
   },
   [LEFT]: {
-    shorthand: BORDER_LEFT,
+    shorthand: borderLeft.property,
     generator: generateBorderPositionShorthand
   }
 };
@@ -1217,15 +1208,15 @@ const prepareBorderShorthands = (properties) => {
   const mixedPriorities = shorthandItems.length && shorthandPriorityItems.length;
   const imageItem = createPropertyItem(BORDER_IMAGE, NONE);
   if (shorthandItems.length === 4) {
-    const [property, item] = generateBorderShorthand(shorthandItems, BORDER) ?? [];
+    const [property, item] = generateBorderShorthand(shorthandItems, border.property) ?? [];
     if (property && item) {
       properties.set(property, item);
       properties.delete(BORDER_IMAGE);
       properties.set(BORDER_IMAGE, imageItem);
     }
   } else if (shorthandPriorityItems.length === 4) {
     const [property, item] =
-      generateBorderShorthand(shorthandPriorityItems, BORDER, "important") ?? [];
+      generateBorderShorthand(shorthandPriorityItems, border.property, "important") ?? [];
     if (property && item) {
       properties.set(property, item);
       properties.delete(BORDER_IMAGE);
@@ -1326,7 +1317,7 @@ const processBorderProperties = (borders, parseOpt) => {
   for (const [property, item] of borders) {
     if (shorthandProperties.has(property)) {
       const { value, priority } = item;
-      if (property === BORDER) {
+      if (property === border.property) {
         const lineItems = border.parse(value, parseOpt);
         for (const [key, initialValue] of border.initialValues) {
           if (!Object.hasOwn(lineItems, key)) {
@@ -1482,25 +1473,27 @@ const prepareProperties = (properties, opt = {}) => {
         }
       }
       if (!omitShorthandProperty) {
-        if (property === BACKGROUND) {
+        if (property === background.property) {
           hasPrecedingBackground = true;
         }
         parsedProperties.set(property, createPropertyItem(property, value, priority));
       }
     } else {
       parsedProperties.set(property, createPropertyItem(property, value, priority));
       if (hasPrecedingBackground) {
-        const { value: shorthandValue, priority: shorthandPriority } = properties.get(BACKGROUND);
+        const { value: shorthandValue, priority: shorthandPriority } = properties.get(
+          background.property
+        );
         if ((!shorthandPriority || priority) && !hasVarFunc(shorthandValue)) {
           const replacedShorthandValue = replaceBackgroundShorthand(
             property,
             parsedProperties,
             parseOpt
           );
-          properties.delete(BACKGROUND);
+          properties.delete(background.property);
           properties.set(
-            BACKGROUND,
-            createPropertyItem(BACKGROUND, replacedShorthandValue, shorthandPriority)
+            background.property,
+            createPropertyItem(background.property, replacedShorthandValue, shorthandPriority)
           );
         }
       }
@@ -1528,35 +1521,35 @@ const prepareProperties = (properties, opt = {}) => {
  * @returns {Map} The normalized properties map.
  */
 const normalizeProperties = (properties) => {
-  if (properties.has(BORDER)) {
+  if (properties.has(border.property)) {
     for (const line of borderLines) {
-      properties.delete(`${BORDER}-${line}`);
+      properties.delete(`${border.property}-${line}`);
     }
     for (const position of borderPositions) {
-      properties.delete(`${BORDER}-${position}`);
+      properties.delete(`${border.property}-${position}`);
       for (const line of borderLines) {
-        properties.delete(`${BORDER}-${position}-${line}`);
+        properties.delete(`${border.property}-${position}-${line}`);
       }
     }
-    properties.delete(`${BORDER}-image`);
+    properties.delete(`${border.property}-image`);
   }
   for (const line of borderLines) {
-    const lineProperty = `${BORDER}-${line}`;
+    const lineProperty = `${border.property}-${line}`;
     if (properties.has(lineProperty)) {
       for (const position of borderPositions) {
-        const positionProperty = `${BORDER}-${position}`;
-        const longhandProperty = `${BORDER}-${position}-${line}`;
+        const positionProperty = `${border.property}-${position}`;
+        const longhandProperty = `${border.property}-${position}-${line}`;
         properties.delete(positionProperty);
         properties.delete(longhandProperty);
       }
     }
   }
   for (const position of borderPositions) {
-    const positionProperty = `${BORDER}-${position}`;
+    const positionProperty = `${border.property}-${position}`;
     if (properties.has(positionProperty)) {
       const longhandProperties = [];
       for (const line of borderLines) {
-        const longhandProperty = `${BORDER}-${position}-${line}`;
+        const longhandProperty = `${border.property}-${position}-${line}`;
         longhandProperties.push(longhandProperty);
       }
       if (longhandProperties.length === 3) {