Remove globalObject option

Previous refactorings mean that this option was never actually used.

Also change export style to define-then-export.

Part of #280.

Author: asamuzaK

lib/normalize.js

@@ -181,17 +181,16 @@ const getPositionValue = (positionValues, position) => {
  *
  * @param {string} property - The specific background longhand property being updated.
  * @param {Map} properties - The map of all properties.
- * @param {Object} opt - Parsing options including global object and configurations.
  * @returns {string} The constructed background shorthand string.
  */
-const replaceBackgroundShorthand = (property, properties, opt) => {
+const replaceBackgroundShorthand = (property, properties) => {
   const { value: propertyValue } = properties.get(property);
-  const parsedValue = background.shorthandFor.get(property).parse(propertyValue, opt);
+  const parsedValue = background.shorthandFor.get(property).parse(propertyValue);
   const values = splitValue(parsedValue, {
     delimiter: ","
   });
   const { value: shorthandValue } = properties.get(background.property);
-  const bgValues = background.parse(shorthandValue, opt);
+  const bgValues = background.parse(shorthandValue);
   const bgLength = bgValues.length;
   if (property === backgroundColor.property) {
     bgValues[bgLength - 1][property] = parsedValue[0];
@@ -224,15 +223,10 @@ const replaceBackgroundShorthand = (property, properties, opt) => {
  * @param {string} property - The property to check.
  * @param {string} value - The value to compare.
  * @param {string} shorthandValue - The shorthand string to parse and compare against.
- * @param {Object} [opt={}] - Parsing options.
  * @returns {boolean} True if the value matches the shorthand's value.
  */
-const matchesBorderShorthandValue = (property, value, shorthandValue, opt = {}) => {
-  const { globalObject, options } = opt;
-  const obj = border.parse(shorthandValue, {
-    globalObject,
-    options
-  });
+const matchesBorderShorthandValue = (property, value, shorthandValue) => {
+  const obj = border.parse(shorthandValue);
   if (Object.hasOwn(obj, property)) {
     return value === obj[property];
   }
@@ -244,20 +238,14 @@ const matchesBorderShorthandValue = (property, value, shorthandValue, opt = {})
  *
  * @param {string} value - The new value to insert.
  * @param {string} shorthandValue - The existing shorthand string.
- * @param {Object} [opt={}] - Parsing options.
  * @returns {string} The updated border shorthand string.
  */
-const replaceBorderShorthandValue = (value, shorthandValue, opt = {}) => {
-  const { globalObject, options } = opt;
+const replaceBorderShorthandValue = (value, shorthandValue) => {
   const borderFirstInitialKey = border.initialValues.keys().next().value;
   const borderFirstInitialValue = border.initialValues.get(borderFirstInitialKey);
-  const parseOpt = {
-    globalObject,
-    options
-  };
-  const valueObj = border.parse(value, parseOpt);
+  const valueObj = border.parse(value);
   const shorthandObj = shorthandValue
-    ? border.parse(shorthandValue, parseOpt)
+    ? border.parse(shorthandValue)
     : {
         [borderFirstInitialKey]: borderFirstInitialValue
       };
@@ -499,7 +487,6 @@ const replacePositionValue = (value, positionValues, position) => {
  * @param {string} params.priority - The property priority.
  * @param {Map} params.properties - The map of properties.
  * @param {Object} params.parts - The split property name parts.
- * @param {Object} params.opt - Parsing options.
  * @param {Map} params.borderItems - The map to store processed border items.
  */
 const prepareBorderStringValue = ({
@@ -508,15 +495,9 @@ const prepareBorderStringValue = ({
   priority,
   properties,
   parts,
-  opt,
   borderItems
 }) => {
   const { prop1, prop2, prop3 } = parts;
-  const { globalObject, options } = opt;
-  const parseOpt = {
-    globalObject,
-    options
-  };
   const shorthandItem = getPropertyItem(border.property, properties);
   const imageItem = getPropertyItem(BORDER_IMAGE, properties);
   // Handle longhand properties.
@@ -547,7 +528,7 @@ const prepareBorderStringValue = ({
     } else {
       if (
         shorthandItem.value &&
-        !matchesBorderShorthandValue(lineProperty, propertyValue, shorthandItem.value, parseOpt)
+        !matchesBorderShorthandValue(lineProperty, propertyValue, shorthandItem.value)
       ) {
         shorthandItem.value = "";
       }
@@ -556,7 +537,7 @@ const prepareBorderStringValue = ({
       }
       if (
         positionItem.value &&
-        !matchesBorderShorthandValue(lineProperty, propertyValue, positionItem.value, parseOpt)
+        !matchesBorderShorthandValue(lineProperty, propertyValue, positionItem.value)
       ) {
         positionItem.value = "";
       }
@@ -600,26 +581,17 @@ const prepareBorderStringValue = ({
     } else {
       if (
         shorthandItem.value &&
-        !matchesBorderShorthandValue(property, propertyValue, shorthandItem.value, parseOpt)
+        !matchesBorderShorthandValue(property, propertyValue, shorthandItem.value)
       ) {
         shorthandItem.value = "";
       }
-      if (
-        lineWidthItem.value &&
-        isValidPropertyValue(lineWidthProperty, propertyValue, globalObject)
-      ) {
+      if (lineWidthItem.value && isValidPropertyValue(lineWidthProperty, propertyValue)) {
         lineWidthItem.value = propertyValue;
       }
-      if (
-        lineStyleItem.value &&
-        isValidPropertyValue(lineStyleProperty, propertyValue, globalObject)
-      ) {
+      if (lineStyleItem.value && isValidPropertyValue(lineStyleProperty, propertyValue)) {
         lineStyleItem.value = propertyValue;
       }
-      if (
-        lineColorItem.value &&
-        isValidPropertyValue(lineColorProperty, propertyValue, globalObject)
-      ) {
+      if (lineColorItem.value && isValidPropertyValue(lineColorProperty, propertyValue)) {
         lineColorItem.value = propertyValue;
       }
     }
@@ -656,11 +628,7 @@ const prepareBorderStringValue = ({
       const longhandProperty = `${prop1}-${position}-${prop2}`;
       const longhandItem = getPropertyItem(longhandProperty, properties);
       if (propertyValue) {
-        positionItem.value = replaceBorderShorthandValue(
-          propertyValue,
-          positionItem.value,
-          parseOpt
-        );
+        positionItem.value = replaceBorderShorthandValue(propertyValue, positionItem.value);
       } else {
         positionItem.value = "";
       }
@@ -710,16 +678,10 @@ const prepareBorderStringValue = ({
  * @param {string} params.priority - The property priority.
  * @param {Map} params.properties - The map of properties.
  * @param {Object} params.parts - The split property name parts.
- * @param {Object} params.opt - Parsing options.
  * @param {Map} params.borderItems - The map to store processed border items.
  */
-const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, borderItems }) => {
+const prepareBorderArrayValue = ({ value, priority, properties, parts, borderItems }) => {
   const { prop1, prop2 } = parts;
-  const { globalObject, options } = opt;
-  const parseOpt = {
-    globalObject,
-    options
-  };
   if (!value.length || !borderLines.has(prop2)) {
     return;
   }
@@ -733,11 +695,7 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
       if (hasVarFunc(shorthandItem.value)) {
         shorthandItem.value = "";
       } else if (propertyValue) {
-        shorthandItem.value = replaceBorderShorthandValue(
-          propertyValue,
-          shorthandItem.value,
-          parseOpt
-        );
+        shorthandItem.value = replaceBorderShorthandValue(propertyValue, shorthandItem.value);
       }
     }
   } else {
@@ -783,8 +741,7 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
     if (positionItem.value && positionValues[position]) {
       positionItem.value = replaceBorderShorthandValue(
         positionValues[position],
-        positionItem.value,
-        parseOpt
+        positionItem.value
       );
     }
     const longhandProperty = `${positionProperty}-${prop2}`;
@@ -808,7 +765,6 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
  * @param {string} params.priority - The property priority.
  * @param {Map} params.properties - The map of properties.
  * @param {Object} params.parts - The split property name parts.
- * @param {Object} params.opt - Parsing options.
  * @param {Map} params.borderItems - The map to store processed border items.
  */
 const prepareBorderObjectValue = ({
@@ -817,15 +773,9 @@ const prepareBorderObjectValue = ({
   priority,
   properties,
   parts,
-  opt,
   borderItems
 }) => {
   const { prop1, prop2 } = parts;
-  const { globalObject, options } = opt;
-  const parseOpt = {
-    globalObject,
-    options
-  };
   const imageItem = getPropertyItem(BORDER_IMAGE, properties);
   // Handle position shorthands.
   if (prop2) {
@@ -843,7 +793,7 @@ const prepareBorderObjectValue = ({
     const positionItem = getPropertyItem(positionProperty, properties);
     if (shorthandItem.value) {
       for (const positionValue of Object.values(value)) {
-        if (!matchesBorderShorthandValue(property, positionValue, shorthandItem.value, parseOpt)) {
+        if (!matchesBorderShorthandValue(property, positionValue, shorthandItem.value)) {
           shorthandItem.value = "";
           break;
         }
@@ -951,10 +901,9 @@ const prepareBorderObjectValue = ({
  * @param {string|Array|Object} value - The value of the property.
  * @param {string} priority - The priority of the property (e.g., "important").
  * @param {Map} properties - The map of all properties.
- * @param {Object} [opt={}] - Parsing options.
  * @returns {Map|undefined} A map of expanded or updated border properties.
  */
-const prepareBorderProperties = (property, value, priority, properties, opt = {}) => {
+const prepareBorderProperties = (property, value, priority, properties) => {
   if (typeof property !== "string" || value === null) {
     return;
   }
@@ -996,7 +945,6 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
       priority,
       properties,
       parts,
-      opt,
       borderItems
     });
   } else if (Array.isArray(value)) {
@@ -1005,7 +953,6 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
       priority,
       properties,
       parts,
-      opt,
       borderItems
     });
   } else if (value && typeof value === "object") {
@@ -1015,7 +962,6 @@ const prepareBorderProperties = (property, value, priority, properties, opt = {}
       priority,
       properties,
       parts,
-      opt,
       borderItems
     });
   }
@@ -1309,16 +1255,15 @@ const updateLonghandProperties = (property, item, longhandProperties) => {
  * Processes border properties from the borders map, expanding and normalizing them.
  *
  * @param {Map} borders - The map containing accumulated border properties.
- * @param {Object} parseOpt - Options for parsing values.
  * @returns {Map} A map of fully processed and normalized border properties.
  */
-const processBorderProperties = (borders, parseOpt) => {
+const processBorderProperties = (borders) => {
   const longhandProperties = new Map();
   for (const [property, item] of borders) {
     if (shorthandProperties.has(property)) {
       const { value, priority } = item;
       if (property === border.property) {
-        const lineItems = border.parse(value, parseOpt);
+        const lineItems = border.parse(value);
         for (const [key, initialValue] of border.initialValues) {
           if (!Object.hasOwn(lineItems, key)) {
             lineItems[key] = initialValue;
@@ -1348,7 +1293,7 @@ const processBorderProperties = (borders, parseOpt) => {
         }
       } else {
         const shorthandItem = shorthandProperties.get(property);
-        const parsedItem = shorthandItem.parse(value, parseOpt);
+        const parsedItem = shorthandItem.parse(value);
         if (Array.isArray(parsedItem)) {
           let namePart, linePart;
           const hyphenIndex = property.indexOf("-");
@@ -1395,15 +1340,9 @@ const processBorderProperties = (borders, parseOpt) => {
  * Normalize and prepare CSS properties, handling shorthands and longhands.
  *
  * @param {Map} properties - The initial map of properties.
- * @param {Object} [opt={}] - Parsing options.
  * @returns {Map} The normalized map of properties.
  */
-const prepareProperties = (properties, opt = {}) => {
-  const { globalObject, options } = opt;
-  const parseOpt = {
-    globalObject,
-    options
-  };
+const prepareProperties = (properties) => {
   const parsedProperties = new Map();
   const shorthands = new Map();
   const borders = new Map();
@@ -1434,7 +1373,7 @@ const prepareProperties = (properties, opt = {}) => {
       parsedProperties.set(property, item);
     } else if (shorthandProperties.has(property)) {
       const shorthandItem = shorthandProperties.get(property);
-      const parsedValues = shorthandItem.parse(value, parseOpt);
+      const parsedValues = shorthandItem.parse(value);
       let omitShorthandProperty = false;
       if (Array.isArray(parsedValues)) {
         const [parsedValue] = parsedValues;
@@ -1485,11 +1424,7 @@ const prepareProperties = (properties, opt = {}) => {
           background.property
         );
         if ((!shorthandPriority || priority) && !hasVarFunc(shorthandValue)) {
-          const replacedShorthandValue = replaceBackgroundShorthand(
-            property,
-            parsedProperties,
-            parseOpt
-          );
+          const replacedShorthandValue = replaceBackgroundShorthand(property, parsedProperties);
           properties.delete(background.property);
           properties.set(
             background.property,
@@ -1506,7 +1441,7 @@ const prepareProperties = (properties, opt = {}) => {
     }
   }
   if (borders.size) {
-    const borderItems = processBorderProperties(borders, parseOpt);
+    const borderItems = processBorderProperties(borders);
     for (const [property, item] of borderItems) {
       parsedProperties.set(property, item);
     }