Minor refactoring

Author: cdoublev

lib/cssom/CSSStyleDeclaration-impl.js

@@ -158,7 +158,7 @@ class CSSStyleDeclarationImpl {
      * value as a whitespace.
      */
     getPropertyValue(name) {
-        name = getDeclarationName(name, this.parentRule ?? this._ownerNode)
+        name = getDeclarationName(this.parentRule ?? this._ownerNode, name)
         if (shorthands.has(name)) {
             const value = []
             let important = null
@@ -234,7 +234,7 @@ class CSSStyleDeclarationImpl {
         if (this._readOnly) {
             throw error(UPDATE_COMPUTED_STYLE_DECLARATION_ERROR)
         }
-        name = getDeclarationName(name, this.parentRule ?? this._ownerNode)
+        name = getDeclarationName(this.parentRule ?? this._ownerNode, name)
         if (!name) {
             return ''
         }
@@ -270,7 +270,7 @@ class CSSStyleDeclarationImpl {
         if (this._computed) {
             return ''
         }
-        name = getDeclarationName(name, this.parentRule ?? this._ownerNode)
+        name = getDeclarationName(this.parentRule ?? this._ownerNode, name)
         if (shorthands.has(name)) {
             if (shorthands.get(name).every(longhand => this.getPropertyPriority(longhand) === 'important')) {
                 return 'important'

lib/parse/grammar.js

@@ -1,7 +1,7 @@
 
 const { createPermutationIterator, getPermutationIndex } = require('./permutation.js')
 const { isBlock, isDelimiter, isList, isOmitted } = require('../utils/value.js')
-const { isBranch, isCSSType, isSequence } = require('../utils/definition.js')
+const { isBranch, isCSSType, isSequence } = require('../utils/node.js')
 const { list, omitted } = require('../values/value.js')
 const Stream = require('./stream.js')
 const actions = require('./actions.js')
@@ -140,7 +140,7 @@ function isInputAtEnd(value, node) {
  * @returns {boolean}
  */
 function isNonTerminal(value, node) {
-    return isBranch(node.definition)
+    return isBranch(node)
 }
 
 /**
@@ -204,10 +204,10 @@ function intercept(node, parser, error) {
  * @returns {SyntaxError|object|object[]|null|undefined}
  */
 function match(node, parser) {
-    const { context, definition, input } = node
-    if (isBranch(definition)) {
+    if (isBranch(node)) {
         return traverse(node, parser)
     }
+    const { context, definition, input } = node
     const { name, type } = definition
     switch (type) {
         case 'arbitrary':
@@ -340,9 +340,10 @@ function replace(node, parser) {
  * @param {object|object[]} value
  * @returns {object|object[]}
  */
-function tag({ definition }, parser, value) {
-    const { name } = definition
-    if (value !== omitted && isCSSType(definition) && name !== '<declaration>') {
+function tag(node, parser, value) {
+    const { definition: { name } } = node
+    if (value !== omitted && isCSSType(node) && name !== '<declaration>') {
+        // TODO: review `consumeDeclaration()`
         if (!isList(value)) {
             value = { ...value, types: [...value.types] }
         }
@@ -481,7 +482,7 @@ function traverse(node, parser) {
             continue
         }
 
-        if (isSequence(definition)) {
+        if (isSequence(node)) {
             let values
             if (type === '&&' || type === '||') {
                 values = value.map(definition =>

lib/parse/parser.js

@@ -225,11 +225,11 @@ function createCSSRule(name, prelude, value, definition, { root, rule }) {
 }
 
 /**
+ * @param {CSSRuleImpl|Element|object|string} context
  * @param {string} name
- * @param {CSSRuleImpl|Element|string} context
  * @returns {string}
  */
-function getDeclarationName(name, context) {
+function getDeclarationName(context, name) {
     context = createContext(context)
     const { rule: { definition: { name: ruleName, value } } } = context
     if (name.startsWith('--')) {
@@ -243,13 +243,13 @@ function getDeclarationName(name, context) {
 }
 
 /**
- * @param {string} name
  * @param {object} context
+ * @param {string} name
  * @returns {object|null}
  */
-function getDeclarationDefinition(name, context) {
-    name = getDeclarationName(name, context)
+function getDeclarationDefinition(context, name) {
     const { rule: { definition: { name: ruleName, value: { descriptors, properties } } } } = context
+    name = getDeclarationName(context, name)
     if (properties) {
         if (name.startsWith('--')) {
             const definition = properties?.['--*']
@@ -541,7 +541,7 @@ function consumeDeclaration(tokens, context, nested) {
     if (!name) {
         return null
     }
-    const definition = getDeclarationDefinition(name.value, context)
+    const definition = getDeclarationDefinition(context, name.value)
     if (!definition) {
         return null
     }
@@ -1130,7 +1130,7 @@ function parseCSSDeclaration(name, value, important, context) {
         return null
     }
 
-    const definition = getDeclarationDefinition(name, context)
+    const definition = getDeclarationDefinition(context, name)
     if (!definition) {
         return null
     }

lib/parse/postprocess.js

@@ -1,6 +1,6 @@
 
 const { angle, filter, keyword, list, map, number, omitted, string } = require('../values/value.js')
-const { findContext, findParent, findSibling } = require('../utils/context.js')
+const { findContext, findSibling, isDeclaredBy, isProducedBy } = require('../utils/context.js')
 const { addTypes, dimensionTypes, getCalculationType, matchNumericType, types: numericTypes } = require('./types.js')
 const { isCalculation, isColon, isList, isOmitted, isWhitespace } = require('../utils/value.js')
 const { isHexadecimal, isIdentifierCharacter, isWhitespace: isWhitespaceCharacter } = require('./tokenize.js')
@@ -167,7 +167,7 @@ function postParseAnimateableFeature(name, node) {
  * It aborts parsing when the timeline is a keyword used as <progress-source>.
  */
 function postParseAnimationTimeline(timeline, node) {
-    if (timeline.types.includes('<keyword>') && findParent(node, node => node.definition.name === '<progress-source>')) {
+    if (timeline.types.includes('<keyword>') && isProducedBy(node, '<progress-source>')) {
         return error(node)
     }
     return timeline
@@ -260,10 +260,7 @@ function postParseCalcValue(value) {
  * in @font-palette-values.
  */
 function postParseColor(color, node) {
-    if (
-        node.context.declaration?.definition.name === 'override-colors'
-        && !color.types.includes('<color-base>')
-    ) {
+    if (isDeclaredBy(node, 'override-colors') && !color.types.includes('<color-base>')) {
         return error(node)
     }
     return color
@@ -500,7 +497,7 @@ function postParseDimension(dimension, { definition: { max, min, name } }) {
  * It aborts parsing the name when it is invalid in the context.
  */
 function postParseFamilyName(name, node) {
-    const invalid = node.context.declaration?.definition.name === 'voice-family'
+    const invalid = isDeclaredBy(node, 'voice-family')
         ? reserved.voiceFamilyName
         : reserved.fontFamilyName
     if (name.types.includes('<string>') || 1 < name.length || !invalid.includes(name[0].value.toLowerCase())) {
@@ -1015,7 +1012,7 @@ function postParseMediaFeatureName(name, node) {
         if (descriptors[contextName][lowercase]) {
             return { ...name, value: lowercase }
         }
-    } else if (parent?.parent?.definition.name === '<mf-plain>'/* only for <mf-name> tests: */ || !parent) {
+    } else if (isProducedBy(node, '<mf-plain>') /* only for <mf-name> tests: */ || !node.parent) {
         if (target) {
             return { ...name, value: `${lowercase.includes('min-') ? 'min' : 'max'}-${target}` }
         }
@@ -1260,7 +1257,7 @@ function postParsePaintOrder(paint) {
  * is the offset-path property.
  */
 function postParsePath(path, node) {
-    if (node.context.declaration?.definition.name === 'offset-path') {
+    if (isDeclaredBy(node, 'offset-path')) {
         const { value: [,, ...tail] } = path
         return { ...path, value: list([omitted, omitted, ...tail]) }
     }
@@ -1573,7 +1570,7 @@ function postParseStyleFeature(feature, node, { createContext, getDeclarationDef
     const { types, value } = feature
     if (
         types[0] === '<ident-token>'
-            ? getDeclarationDefinition(value, createContext('@style'))
+            ? getDeclarationDefinition(createContext('@style'), value)
             : !value.value?.startsWith?.('revert')
     ) {
         return feature

lib/parse/preprocess.js

@@ -1,5 +1,5 @@
 
-const { findContext, findParent, findSibling } = require('../utils/context.js')
+const { findContext, findParent, findSibling, isProducedBy } = require('../utils/context.js')
 const { isColon, isComma, isDelimiter, isOmitted, isWhitespace } = require('../utils/value.js')
 const { length, omitted } = require('../values/value.js')
 const createError = require('../error.js')
@@ -32,7 +32,7 @@ function preParseCalcOperator(node) {
     if (input.atEnd()) {
         return null
     }
-    if (!isWhitespace(input.current) && findParent(node, node => node.definition.name === '<calc-sum>')) {
+    if (!isWhitespace(input.current) && isProducedBy(node, '<calc-sum>')) {
         if (isDelimiter(['-', '+'], input.next())) {
             return error(node)
         }
@@ -234,7 +234,7 @@ function preParseImageSetOption(node) {
     if (next) {
         const name = next.name?.toLowerCase()
         if (
-            context.function.parent.parent?.definition.name === '<url-set>'
+            isProducedBy(context.function.parent, '<url-set>')
             && name !== 'src'
             && name !== 'url'
             && next.types[0] !== '<string-token>'

lib/parse/replace.js

@@ -1,8 +1,8 @@
 
 const { colorFunctionKeywords, colorSpaces, colorSpaceKeywords } = require('../values/colors.js')
+const { findSibling, isProducedBy } = require('../utils/context.js')
 const { getCalculationType, matchNumericType } = require('./types.js')
 const createError = require('../error.js')
-const { findSibling } = require('../utils/context.js')
 const { isDelimiter } = require('../utils/value.js')
 const { simplifyCalculation } = require('./simplify.js')
 const substitutions = require('../values/substitutions.js')
@@ -47,7 +47,7 @@ function replaceNumeric(node, parser) {
 
     const { context, definition, input, parent } = node
     const name = input.next().name?.toLowerCase()
-    const topLevel = !context.replaced
+    const topLevel = !isProducedBy(node, '<calc-value>')
 
     const fn = name && substitutions.numeric.find(definition => definition.name === name)
 
@@ -71,7 +71,7 @@ function replaceNumeric(node, parser) {
         }
 
         // Validate type and simplify calculations once from top to bottom
-        if (topLevel && parent?.parent?.definition.name !== '<mf-value>') {
+        if (topLevel && !isProducedBy(node, '<mf-value>')) {
 
             const { name, range } = definition
             const replacedType = name === '<integer>' ? '<number>' : name

lib/serialize.js

@@ -2,7 +2,7 @@
 const { MAX_INTEGER, MIN_INTEGER } = require('./values/integers.js')
 const { canonicalize, definitions: dimensions, getCanonicalUnitFromType } = require('./values/dimensions.js')
 const { clamp, isDegenerate, safeFloat, toEightBit } = require('./utils/math.js')
-const { combinators, isCombination, isCompound, isMultiplied } = require('./utils/definition.js')
+const { combinators, isCombination, isCompound, isMultiplied } = require('./utils/node.js')
 const { hslToRgb, hwbToRgb } = require('./utils/color.js')
 const { isBlock, isCalculationOperator, isComma, isList, isNumeric, isOmitted } = require('./utils/value.js')
 const { isDigit, isIdentifierCharacter, isNonASCIIIdentifierCharacter } = require('./parse/tokenize.js')
@@ -671,10 +671,10 @@ function serializeDeclaration(declaration) {
  */
 function serializeDefinition(definition, parentPrecedence = 0) {
     const { associatedToken, max, min, name, range, separator, type, value } = definition
-    if (isMultiplied(definition)) {
+    if (isMultiplied({ definition })) {
         let string = ''
         string = serializeDefinition(value)
-        if (isCombination(value) || isCompound(value) || value.type === 'optional' || string.endsWith('}')) {
+        if (isCombination({ definition: value }) || isCompound({ definition: value }) || value.type === 'optional' || string.endsWith('}')) {
             string = `[${string}]`
         }
         if (type === 'optional') {
@@ -686,7 +686,7 @@ function serializeDefinition(definition, parentPrecedence = 0) {
         }
         return string
     }
-    if (isCombination(definition)) {
+    if (isCombination({ definition })) {
         const [seed, ...types] = value
         const precedence = combinators.indexOf(type)
         const combinator = type === ' ' ? type : ` ${type} `

lib/utils/context.js

@@ -1,4 +1,6 @@
 
+const { isCSSType } = require('./node.js')
+
 /**
  * @param {object} node
  * @param {function} accept
@@ -85,8 +87,37 @@ function findSibling({ context, parent }, accept, abort, climb) {
     return null
 }
 
+/**
+ * @param {object} node
+ * @returns {object}
+ */
+function getProduction(node) {
+    return findParent(node, isCSSType, isCSSType)
+}
+
+/**
+ * @param {object} node
+ * @param {string} name
+ * @returns {boolean}
+ */
+function isDeclaredBy(node, name) {
+    return node.context.declaration?.definition.name === name
+}
+
+/**
+ * @param {object} node
+ * @param {string} name
+ * @returns {boolean}
+ */
+function isProducedBy(node, name) {
+    return getProduction(node)?.definition.name === name
+}
+
 module.exports = {
     findContext,
     findParent,
     findSibling,
+    getProduction,
+    isDeclaredBy,
+    isProducedBy,
 }