Redefine descriptor/property definition as declaration definition

Author: cdoublev

lib/parse/parser.js

@@ -247,35 +247,35 @@ function getDeclarationName(name, context) {
  * @param {object} context
  * @returns {object|null}
  */
-function getDeclarationValueDefinition(name, context) {
+function getDeclarationDefinition(name, context) {
     name = getDeclarationName(name, context)
     const { rule: { definition: { name: ruleName, value: { descriptors, properties } } } } = context
     if (properties) {
         if (name.startsWith('--')) {
             const definition = properties?.['--*']
             if (definition) {
-                return { name, type: 'property', value: definition.value }
+                return { name, type: 'declaration', value: definition.value }
             }
             return null
         }
         const target = compatibility.properties.mappings.get(name)
         const value = properties[target]?.value ?? properties[name]?.value
         if (value) {
-            return { name, type: 'property', value }
+            return { name, type: 'declaration', value }
         }
     }
     if (descriptors) {
         if (name.startsWith('--')) {
             const definition = descriptors?.['--*']
             if (definition) {
-                return { name, type: 'descriptor', value: definition.value }
+                return { name, type: 'declaration', value: definition.value }
             }
             return null
         }
         const target = compatibility.descriptors[ruleName]?.mappings?.get(name)
         const value = descriptors[target]?.value ?? descriptors[name]?.value ?? descriptors['*']
         if (value) {
-            return { name, type: 'descriptor', value }
+            return { name, type: 'declaration', value }
         }
     }
     return null
@@ -536,7 +536,7 @@ function consumeDeclaration(tokens, context, nested) {
     if (!name) {
         return null
     }
-    const definition = getDeclarationValueDefinition(name.value, context)
+    const definition = getDeclarationDefinition(name.value, context)
     if (!definition) {
         return null
     }
@@ -1064,7 +1064,7 @@ function parseCSSValue(input, definition, context, strategy = 'backtrack') {
     const { forgiving, trees } = context
 
     // Try parsing arbitrary substitution containing value
-    if (trees.length === 0 && (type === 'descriptor' || type === 'property')) {
+    if (type === 'declaration' && !context.function) {
         const substitution = parseCSSArbitrarySubstitutionContainingValue(input, context)
         if (substitution) {
             return substitution
@@ -1103,12 +1103,8 @@ function parseCSSValue(input, definition, context, strategy = 'backtrack') {
         case 'aborted':
             return (forgiving && !context.function?.context.forgiving) ? null : match
         // The current list is invalid (match is null or undefined)
-        case 'rejected': {
-            if (type === 'descriptor' || type === 'property') {
-                return parseCSSValueSubstitution(input, context)
-            }
-            return null
-        }
+        case 'rejected':
+            return type === 'declaration' ? parseCSSValueSubstitution(input, context) : null
         default:
             return match
     }
@@ -1129,7 +1125,7 @@ function parseCSSDeclaration(name, value, important, context) {
         return null
     }
 
-    const definition = getDeclarationValueDefinition(name, context)
+    const definition = getDeclarationDefinition(name, context)
     if (!definition) {
         return null
     }
@@ -1174,7 +1170,7 @@ function parseCSSStyleSheet(rules) {
 const parser = module.exports = {
     createContext,
     getDeclarationName,
-    getDeclarationValueDefinition,
+    getDeclarationDefinition,
     insertCSSRule,
     parseBlockContents,
     parseCSSDeclaration,

lib/parse/postprocess.js

@@ -1514,11 +1514,11 @@ function postParseSteps(steps, node) {
  * It aborts parsing when the feature is an unknown property or a declaration
  * whose value is either `revert` or `revert-layer`.
  */
-function postParseStyleFeature(feature, node, { createContext, getDeclarationValueDefinition }) {
+function postParseStyleFeature(feature, node, { createContext, getDeclarationDefinition }) {
     const { types, value } = feature
     if (
         types[0] === '<ident-token>'
-            ? getDeclarationValueDefinition(value, createContext('@style'))
+            ? getDeclarationDefinition(value, createContext('@style'))
             : !value.value?.startsWith?.('revert')
     ) {
         return feature

lib/utils/definition.js

@@ -9,9 +9,8 @@ const compounds = ['function', 'rule', 'simple-block']
  */
 function isBranch(definition) {
     const { type } = definition
-    return type === 'descriptor'
+    return type === 'declaration'
         || type === 'non-terminal'
-        || type === 'property'
         || isCombination(definition)
         || isMultiplied(definition)
 }