Do not conflate the definition of a delcaration and its value

cdoublev · cdoublev · commit 914eaf01d112 · 2025-07-10T19:04:20.000+02:00
diff --git a/lib/parse/parser.js b/lib/parse/parser.js
@@ -592,7 +592,7 @@ function consumeDeclaration(tokens, context, nested) {
         return error(INVALID_DECLARATION_VALUE_ERROR)
     }
 
-    value = parseCSSDeclarationValue(value, definition, node)
+    value = parseCSSDeclarationValue(value, { ...definition, type: 'non-terminal' }, node)
     if (isFailure(value)) {
         consumeBadDeclaration(tokens, true, nested)
         return error(INVALID_DECLARATION_VALUE_ERROR)
@@ -1106,7 +1106,7 @@ function parseCSSDeclaration(name, value, important, context) {
     }
 
     value = new Stream(value, source)
-    value = parseCSSDeclarationValue(value, definition, node)
+    value = parseCSSDeclarationValue(value, { ...definition, type: 'non-terminal' }, node)
     if (isFailure(value)) {
         return value
     }
diff --git a/lib/parse/postprocess.js b/lib/parse/postprocess.js
@@ -519,7 +519,7 @@ function postParseFamilyName(name, node) {
  */
 function postParseFirstValid(substitution, node, { parseCSSDeclarationValue }) {
     const { context } = node
-    const { definition } = getDeclaration(node)
+    const definition = { ...getDeclaration(node).definition, type: 'non-terminal' }
     for (let value of substitution.value) {
         if (!isFailure(value = parseCSSDeclarationValue(value, definition, context))) {
             return value
@@ -1744,7 +1744,7 @@ function postParseViewTransitionName(name, node) {
  * It aborts parsing when the value is invalid for the property.
  */
 function postParseWholeValue(value, node, parser) {
-    const { definition } = getDeclaration(node)
+    const definition = { ...getDeclaration(node).definition, type: 'non-terminal' }
     if (isOmitted(value)) {
         return definition.name.startsWith('--') ? value : error(node)
     }
diff --git a/lib/utils/node.js b/lib/utils/node.js
@@ -2,16 +2,15 @@
 const type = Symbol('node')
 const sequences = ['||', '&&', ' ']
 const combinators = ['|', ...sequences]
-const compounds = ['block', 'function', 'rule']
+const compounds = ['block', 'declaration', 'function', 'rule']
 
 /**
  * @param {object} node
  * @returns {boolean}
  */
 function isBranch(node) {
     const { definition: { type } } = node
-    return type === 'declaration'
-        || type === 'non-terminal'
+    return type === 'non-terminal'
         || isCombination(node)
         || isMultiplied(node)
 }

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ function consumeDeclaration(tokens, context, nested) {`
`592`	`592`	`return error(INVALID_DECLARATION_VALUE_ERROR)`
`593`	`593`	`}`
`594`	`594`
`595`		`- value = parseCSSDeclarationValue(value, definition, node)`
	`595`	`+ value = parseCSSDeclarationValue(value, { ...definition, type: 'non-terminal' }, node)`
`596`	`596`	`if (isFailure(value)) {`
`597`	`597`	`consumeBadDeclaration(tokens, true, nested)`
`598`	`598`	`return error(INVALID_DECLARATION_VALUE_ERROR)`
`@@ -1106,7 +1106,7 @@ function parseCSSDeclaration(name, value, important, context) {`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`	`1108`	`value = new Stream(value, source)`
`1109`		`- value = parseCSSDeclarationValue(value, definition, node)`
	`1109`	`+ value = parseCSSDeclarationValue(value, { ...definition, type: 'non-terminal' }, node)`
`1110`	`1110`	`if (isFailure(value)) {`
`1111`	`1111`	`return value`
`1112`	`1112`	`}`