Minor things

Author: cdoublev

doc/parse/README.md

@@ -155,7 +155,7 @@ Some rules like `@charset`, `@import`, `@namespace`, `@layer`, also define the o
 
 However, CSS Syntax does not prescribe when and how to construct the CSSOM representation.
 
-Parsing a style sheet must run recursively from its top to bottom level, which allows to construct the CSSOM tree in parallel, noting that a `CSSStyleSheet` will never be discarded, or with a second traversal, to avoid discarding `CSSRule`s and cancelling any processing, like fetching a style sheet referenced by a `CSSImportRule`.
+Parsing a style sheet must run recursively from its top to bottom level, which allows constructing the CSSOM tree in parallel, noting that a `CSSStyleSheet` will never be discarded, or with a second traversal, to avoid discarding `CSSRule`s and cancelling any processing, like fetching a style sheet referenced by a `CSSImportRule`.
 
 ---
 

lib/parse/arbitrary.js

@@ -5,7 +5,7 @@ const Stream = require('./stream.js')
 const blocks = require('../values/blocks.js')
 const createError = require('../error.js')
 
-const endingTokens = Object.values(blocks.associatedTokens)
+const closingTokens = Object.values(blocks.associatedTokens)
 
 /**
  * @param {object} node
@@ -25,7 +25,7 @@ function error({ definition: { name, value } }) {
  * It deviates from the specification by trimming whitespaces.
  */
 function matchAnyValue(input, restricted, stops = []) {
-    stops = [...endingTokens, ...stops]
+    stops = [...closingTokens, ...stops]
     const values = list([], '')
     input.consume(isWhitespace)
     while (!input.atEnd()) {

lib/parse/definition.js

@@ -66,11 +66,11 @@ function consumeRangeBoundary(chars, infinity) {
  * @returns {object}
  */
 function consumeRange(chars, infinity = Infinity) {
-    const endingToken = blocks.associatedTokens[chars.current]
+    const closingToken = blocks.associatedTokens[chars.current]
     const bounds = []
     for (const char of chars) {
         switch (char) {
-            case endingToken: {
+            case closingToken: {
                 const [min, max = min] = bounds
                 return { max, min }
             }
@@ -84,7 +84,7 @@ function consumeRange(chars, infinity = Infinity) {
                 break
         }
     }
-    throw error({ message: `Missing "${endingToken}"` })
+    throw error({ message: `Missing "${closingToken}"` })
 }
 
 /**

lib/parse/grammar.js

@@ -567,7 +567,7 @@ function create(definition, input, context, parent = null) {
         context,
         definition,
         input,
-        location: input.index ?? null,
+        location: input.index,
         parent,
         state: 'waiting',
     }

lib/parse/parser.js

@@ -13,7 +13,7 @@ const shorthands = require('../properties/shorthands.js')
 const substitutions = require('../values/substitutions.js')
 
 const contextType = Symbol('context')
-const endingTokens = Object.values(blocks.associatedTokens)
+const closingTokens = Object.values(blocks.associatedTokens)
 
 const EXTRA_COMPONENT_VALUE_ERROR = {
     message: 'Cannot parse more than a single component value',
@@ -392,9 +392,9 @@ function consumeFunction(tokens, { start, value: name }) {
  * It deviates from the specification by trimming whitespaces.
  */
 function consumeSimpleBlock(tokens, { start, value: associatedToken }) {
-    const endingToken = blocks.associatedTokens[associatedToken]
-    const value = consumeComponentValueList(tokens, [endingToken])
-    if (!tokens.consume(isDelimiter(endingToken))) {
+    const closingToken = blocks.associatedTokens[associatedToken]
+    const value = consumeComponentValueList(tokens, [closingToken])
+    if (!tokens.consume(isDelimiter(closingToken))) {
         error({ message: 'Unclosed block' })
     }
     return { associatedToken, end: tokens.current.end, start, types: ['<simple-block>'], value }
@@ -492,7 +492,7 @@ function consumeDeclarationValue(tokens, forCustomProperty, nested) {
             break
         }
         // Invalid token
-        if (token.types[0].startsWith('<bad-') || isDelimiter(endingTokens, token)) {
+        if (token.types[0].startsWith('<bad-') || isDelimiter(closingTokens, token)) {
             return error(INVALID_DECLARATION_VALUE_ERROR)
         }
         const value = consumeComponentValue(tokens)

lib/parse/types.js

@@ -18,11 +18,10 @@ const staticCalcKeywords = nonTerminal['<calc-keyword>'].split(' | ')
  */
 function areEqualTypes(type1, type2, left = true) {
     for (const [type, power] of type1) {
-        const value = type2.get(type)
-        if (power === 0 && !value) {
+        if (power === 0 && !type2.has(type)) {
             continue
         }
-        if (power !== value) {
+        if (power !== type2.get(type)) {
             return false
         }
     }
@@ -408,11 +407,11 @@ function getCalculationType(calculation, resolutionType) {
  * @see {@link https://drafts.css-houdini.org/css-typed-om-1/#cssnumericvalue-match}
  */
 function matchNumericType(type, production, resolutionType = null) {
-    // For convenience, allow to run this function with a type failure
+    // For convenience, allow running this function with a type failure
     if (type === null) {
         return false
     }
-    // Allow to run this function with some productions to match
+    // Allow running this function with some productions to match
     if (Array.isArray(production)) {
         return production.some(production => matchNumericType(type, production, resolutionType))
     }

lib/serialize.js

@@ -429,7 +429,7 @@ function serializeColor({ name, types, value }, specified) {
             value = canonicalize(component).value
         } else if (types[0] === '<function>') {
             // Only extract a resolved math function value for sRGB color functions
-            if (!isSRGB || !value || !isNumeric(value, true)) {
+            if (!isSRGB || value === undefined || !isNumeric(value, true)) {
                 resolved = false
                 value = serializeCalculationFunction(component)
                 if (isAlpha) {