Minor things

Author: cdoublev

lib/parse/parser.js

@@ -691,7 +691,7 @@ function consumeAtRule(tokens, context, nested) {
  * order.
  */
 function consumeBlock(tokens, context, ignoreCloseCurlyBlock) {
-    const rules = []
+    const rules = list([], ' ', '<block-contents>')
     const declarations = []
     while (!tokens.atEnd()) {
         if (tokens.consume(isWhitespace) || tokens.consume(isSemicolon)) {

lib/parse/postprocess.js

@@ -1,5 +1,5 @@
 
-const { angle, keyword, list, map, number, omitted, string } = require('../values/value.js')
+const { angle, keyword, list, number, omitted, string } = require('../values/value.js')
 const { findContext, findParent, findSibling } = require('../utils/context.js')
 const { getCalculationType, matchNumericType } = require('./types.js')
 const { isCalculation, isColon, isList, isOmitted, isWhitespace } = require('../utils/value.js')
@@ -192,7 +192,7 @@ function postParseBorderRadius(radii) {
 }
 
 /**
- * @param {object[]} product
+ * @param {object|object[]} product
  * @returns {object[]}
  * @see {@link https://drafts.csswg.org/css-values-4/#typedef-calc-product}
  * @see {@link https://drafts.csswg.org/css-values-4/#parse-a-calculation}
@@ -215,7 +215,7 @@ function postParseCalcProduct([left, tail]) {
 }
 
 /**
- * @param {object[]} sum
+ * @param {object|object[]} sum
  * @returns {object|object[]}
  * @see {@link https://drafts.csswg.org/css-values-4/#typedef-calc-sum}
  * @see {@link https://drafts.csswg.org/css-values-4/#parse-a-calculation}

lib/parse/stream.js

@@ -1,4 +1,12 @@
 
+/**
+ * @param {string|object[]}
+ * @returns {string|[]}
+ */
+function empty(value) {
+    return Array.isArray(value) ? [] : ''
+}
+
 class Stream {
 
     index = -1
@@ -21,13 +29,6 @@ class Stream {
         return this.data[this.index]
     }
 
-    /**
-     * @returns {string|object[]}
-     */
-    get empty() {
-        return Array.isArray(this.data) ? [] : ''
-    }
-
     /**
      * @yields {object|string}
      */
@@ -69,7 +70,7 @@ class Stream {
         const fallback = args[0] ?? null
         if (typeof n === 'number') {
             if (1 < n) {
-                let consumed = this.empty
+                let consumed = empty(this.data)
                 while (n-- && !this.atEnd()) {
                     consumed = consumed.concat(data[++this.index])
                 }
@@ -95,7 +96,7 @@ class Stream {
      * @returns {string|object[]}
      */
     consumeRunOf(...items) {
-        let consumed = this.empty
+        let consumed = empty(this.data)
         let last
         while (items.some(item => last = this.consume(item))) {
             consumed = consumed.concat(last)
@@ -108,8 +109,8 @@ class Stream {
      * @returns {string|object[]}
      */
     consumeUntil(item) {
-        const { data, empty, index: start } = this
-        let consumed = empty
+        const { data, index: start } = this
+        let consumed = empty(data)
         while (this.index < data.length) {
             const next = data[this.index + 1]
             if (next === item) {
@@ -143,7 +144,7 @@ class Stream {
         }
         switch (size) {
             case 0:
-                return this.empty
+                return empty(this.data)
             case 1:
                 return this.data[this.index + offset + size]
             default:
@@ -164,7 +165,7 @@ class Stream {
         }
         switch (size) {
             case 0:
-                return this.empty
+                return empty(this.data)
             case 1:
                 return this.data[this.index - offset - size]
             default:

lib/parse/types.js

@@ -301,7 +301,7 @@ function getCalculationFunctionType({ name, value }, resolutionType) {
         case 'random':
         case 'rem':
         case 'round':
-            return combineCalculationTypes(addTypes, value.flat().filter(isCalculation), resolutionType)
+            return combineCalculationTypes(addTypes, value.filter(isCalculation), resolutionType)
         case 'container-progress':
         case 'media-progress': {
             const feature = value[0].value

lib/values/value.js

@@ -12,8 +12,8 @@ class List extends Array {
     /**
      * @see {@link https://github.com/tc39/proposal-rm-builtin-subclassing}
      *
-     * It prevents `list([1]).map(id)` from returning `[undefined, 1]`, and is
-     * compatible with a future breaking change.
+     * It enforces returning Array rather than a List, which is consistent with
+     * the TC39 proposal above.
      */
     static get [Symbol.species]() {
         return Array
@@ -64,7 +64,7 @@ function list(values = [], separator = ' ', types = []) {
 /**
  * @param {object} value
  * @param {function} transform
- * @param {string[]} newTypes
+ * @param {string[]} [newTypes]
  * @returns {object}
  */
 function map({ end, start, types, value, ...props }, transform, newTypes = []) {