Minor things

Author: cdoublev

doc/parse/parser.md

@@ -161,7 +161,7 @@ A CSS rule definition must define:
   - whether declarations cascade
   - whether it applies to elements
 
-The grammar may be extended depending on the context. CSS-wide keywords, arbitrary and whole value substitutions, are not part of a specific property grammar but are accepted for any property, and for descriptors in some contexts. Similarly, some numeric substitutions are only valid in contexts applying to an element.
+The grammar may be extended depending on the context. Arbitrary and whole value substitutions are not part of a specific property grammar but are accepted for any property, and for descriptors in some contexts. Similarly, some numeric substitutions are only valid in contexts applying to an element.
 
 `Element.style`, `Element.sizes`, `CanvasTextDrawingStyles.font`, `CSSFontFeatureValuesMap.set()`, etc, use parser entry points that take a grammar but no context. However, since CSS Syntax often requires validating values *"in the context"*, it is implicitly required, and the `grammar` argument can remain context-free. It cannot represent a style rule by default, since none of the above interfaces are associated to a style rule.
 

doc/serialize/README.md

@@ -46,4 +46,4 @@ CSS values are currently represented either as a `List` or a plain object, with
   > 4. Replace each component value in components with the result of invoking *serialize a CSS component value*.
   > 5. Join the items of components into a single string, inserting `" "` (U+0020 SPACE) between each pair of items unless the second item is a `","` (U+002C COMMA). Return the result.
 
-Step 3 is skipped since `<whitespace-token>`s are already removed from the representation of all productions but arbitrary ones (this could otherwise prevent validating a parent production like `<whole-value>`), which are represented with a `List` whose `separator` is an empty string.
+Step 3 is skipped since leading and trailing `<whitespace-token>`s are already removed while consuming a list of component values and in the parse result, except for arbitrary substitution containing values, which are represented with a `List` whose `separator` is an empty string.

lib/parse/arbitrary.js

@@ -53,8 +53,8 @@ function matchAnyValue(input, restricted, stops = []) {
  * @returns {object}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#typedef-block-contents}
  */
-function matchBlockContents(node, parser) {
-    if (node.context.rule) {
+function matchBlockContents({ context, input }, parser) {
+    if (context.rule) {
         return parser.parseBlockContents(input, context)
     }
     return parser.parseStyleSheet(input, context)

lib/parse/parser.js

@@ -320,11 +320,11 @@ function getRuleDefinition({ root, rule }, name, prelude, type) {
 }
 
 /**
- * @param {CSSRuleImpl|CSSFontFeatureValuesMap|CSSStyleSheetImpl|Element|...string} [identifiers] CSSOM value or rule name(s)
- * @returns {object[]}
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|CSSStyleSheetImpl|Element|object|string|string[]} [value]
+ * @returns {object}
  */
-function createContext(...identifiers) {
-    const value = identifiers[0]
+function createContext(value) {
+
     if (value?.type === contextType) {
         return value
     }
@@ -342,34 +342,31 @@ function createContext(...identifiers) {
         const definition = value._definition
         return { ...context, rule: { context, definition, value } }
     }
+
     const namespaces = new Set(['*'])
-    const globals = new Map([['namespaces', namespaces]])
-    const trees = []
+    const context = {
+        globals: new Map([['namespaces', namespaces]]),
+        definition: root,
+        trees: [],
+    }
+
     if (!value) {
-        return { globals, trees, type: contextType }
+        return context
     }
     if (CSSStyleSheet.isImpl(value)) {
         value._rules?.forEach(rule => {
             if (CSSNamespaceRule.isImpl(rule)) {
                 namespaces.add(rule.prefix)
             }
         })
-        return {
-            globals,
-            root: { definition: root, value },
-            trees,
-            type: contextType,
-        }
-    }
-    const context = {
-        globals,
-        root: { definition: root },
-        trees,
-        type: contextType,
+        return { ...context, value }
     }
     // Rule name(s)
     if (typeof value === 'string') {
-        return identifiers.reduce(
+        value = [value]
+    }
+    if (Array.isArray(value)) {
+        return value.reduce(
             (context, name) => {
                 const { root, rule } = context
                 const contextDefinition = rule ? rule.definition.value : root.definition
@@ -864,7 +861,7 @@ function parseComponentValueList(input) {
 
 /**
  * @param {Stream|string|object[]} input
- * @param {CSSRuleImpl|Element|object|string} context
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|Element|object|string|string[]} context
  * @returns {SyntaxError|object|null}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#parse-a-declaration}
  *
@@ -880,7 +877,7 @@ function parseDeclaration(input, context) {
 
 /**
  * @param {Stream|string|object[]} input
- * @param {CSSRuleImpl|CSSStyleSheet} context
+ * @param {CSSRuleImpl|CSSStyleSheetImpl|object|string|string[]} context
  * @returns {SyntaxError|CSSRuleImpl}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#parse-a-rule}
  */
@@ -906,7 +903,7 @@ function parseRule(input, context) {
 
 /**
  * @param {Stream|string|object[]} input
- * @param {CSSRuleImpl|Element} context
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|Element|object|string|string[]} context
  * @returns {object[]}
  */
 function parseDeclarationBlock(input, context) {
@@ -918,7 +915,7 @@ function parseDeclarationBlock(input, context) {
 
 /**
  * @param {Stream|string|object[]} input
- * @param {CSSRuleImpl|Element} context
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|Element|object|string|string[]} context
  * @returns {object[]}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#parse-a-blocks-contents}
  */
@@ -1030,7 +1027,7 @@ function parseCSSValueSubstitution(input, context) {
 /**
  * @param {Stream|string|object[]} value
  * @param {object|string} definition
- * @param {object} context
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|Element|object|string|string[]} [context]
  * @returns {SyntaxError|object|object[]|null}
  * @see {@link https://drafts.csswg.org/cssom-1/#parse-a-css-value}
  */
@@ -1053,7 +1050,7 @@ function parseCSSDeclarationValue(value, definition, context) {
  * @param {string} name
  * @param {string} value
  * @param {boolean} important
- * @param {CSSRuleImpl|Element|string} context
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|Element|object|string|string[]} context
  * @returns {object|null}
  */
 function parseCSSDeclaration(name, value, important, context) {
@@ -1112,7 +1109,7 @@ function parseCSSStyleSheet(rules) {
 /**
  * @param {Stream|string|object[]} input
  * @param {string} definition
- * @param {CSSRuleImpl|Element|string} [context]
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|CSSStyleSheetImpl|Element|object|string|string[]} [context]
  * @param {string} [strategy]
  * @returns {SyntaxError|object|object[]|null}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#css-parse-something-according-to-a-css-grammar}
@@ -1154,7 +1151,7 @@ function parseCSSGrammar(input, definition, context, strategy = 'backtrack') {
 /**
  * @param {Stream|string|object[]} input
  * @param {object|string} grammar
- * @param {CSSRuleImpl|Element|string} [context]
+ * @param {CSSRuleImpl|CSSFontFeatureValuesMap|CSSStyleSheetImpl|Element|object|string|string[]} [context]
  * @returns {object[]|null}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#css-parse-a-comma-separated-list-according-to-a-css-grammar}
  */

scripts/extract.js

@@ -567,7 +567,7 @@ const excluded = {
             '<mask-source>',
         ],
         'css-values-5': [
-            // TODO: add support for `<boolean-expr[<test>]`
+            // TODO: add support for `<boolean-expr[<test>]>`
             '<if()>',
             '<if-condition>',
             '<if-test>',