Minor things

Author: cdoublev

lib/match/selector.js

@@ -1013,7 +1013,7 @@ function matchPseudoClassSelector(element, { name, value }, context) {
         case 'nth-of-type':
             return isAnBOfType(element, value)
         case 'where':
-            return isMatching(element, value, context, /* ignoreSpecifity = */ true)
+            return isMatching(element, value, context)
         default:
             return false
     }

lib/parse/parser.js

@@ -41,14 +41,14 @@ import {
     isSemicolon,
     isWhitespace,
 } from '../utils/value.js'
-import { isNode, type as nodeType } from '../utils/node.js'
 import Stream from './stream.js'
 import expandDeclaration from './shorthand.js'
+import { isNode } from '../utils/node.js'
 import root from '../rules/definitions.js'
 import { serializeIdentifier } from '../serialize.js'
 import shorthands from '../properties/shorthands.js'
-import tokenize from './tokenize.js'
 import { toLowerCase } from '../utils/string.js'
+import tokenize from './tokenize.js'
 
 /**
  * @param {object[]} declarations

lib/parse/simplify.js

@@ -1,8 +1,8 @@
 
 import * as substitutions from '../values/substitutions.js'
 import { angle, dimension, list, map, number, percentage } from '../values/value.js'
-import { canonicalize, getCanonicalUnitFromType } from '../values/dimensions.js'
 import { areEqual, clamp, isInfinite, isNegativeZero, round, sign, toDegrees, toRadians } from '../utils/math.js'
+import { canonicalize, getCanonicalUnitFromType } from '../values/dimensions.js'
 import { getCalculationType, matchNumericType, types as numericTypes } from './types.js'
 import { isCalculation, isCombinable, isList, isNumeric, isOmitted } from '../utils/value.js'
 
@@ -274,14 +274,14 @@ export function simplifyCalculation(node, resolutionType) {
                     }
                     const index = round('down', node.base * (multiplier + 1), 1)
                     if (!isInfinite(index)) {
-                        const value = min.value + index * step.value
+                        const value = min.value + (index * step.value)
                         if (index === multiplier && areEqual(value, max.value, epsilon)) {
                             return max
                         }
                         return map(min, () => value)
                     }
                 }
-                return map(min, () => min.value + node.base * (max.value - min.value))
+                return map(min, () => min.value + (node.base * (max.value - min.value)))
             }
             case 'rem':
                 return map(

lib/parse/stream.js

@@ -63,7 +63,7 @@ export default class Stream {
     }
 
     /**
-     * @param {number|object|string} [n]
+     * @param {*} [n]
      * @param  {...*} args
      * @returns {*}
      */
@@ -114,7 +114,7 @@ export default class Stream {
     }
 
     /**
-     * @param  {...object|...string} items
+     * @param  {...*} items
      * @returns {string|object[]}
      */
     consumeRunOf(...items) {

scripts/extract.js

@@ -20,7 +20,6 @@ import * as webref from './webref.js'
 import { quote, tab } from '../lib/utils/string.js'
 import arbitrary from '../lib/parse/arbitrary.js'
 import contextSensitiveTypes from '../lib/values/context-sensitive.js'
-import { definitions as dimensions } from '../lib/values/dimensions.js'
 import { findRule } from '../lib/utils/definition.js'
 import forgiving from '../lib/values/forgiving.js'
 import fs from 'node:fs/promises'
@@ -198,7 +197,7 @@ const replaced = {
         // https://github.com/w3c/csswg-drafts/issues/13010
         '<event-trigger-event>': 'activate | click | interest | touch | dblclick | keypress(<string>)',
         // https://github.com/w3c/csswg-drafts/issues/10797
-        '<input-position>': "<calc-sum>",
+        '<input-position>': '<calc-sum>',
         '<progress-source>': "<calc-sum> | <'animation-timeline'>",
         // https://github.com/w3c/fxtf-drafts/issues/532
         '<mask-reference>': 'none | <image>',

test/dom.js

@@ -250,6 +250,7 @@ export class Text extends CharacterData { nodeType = TEXT_NODE_TYPE }
 export class Document extends Node {
 
     adoptedStyleSheets = []
+    defaultView = globalThis
     fullscreenElement = null
     nodeType = DOCUMENT_NODE_TYPE
     pictureInPictureElement = null

test/match.js

@@ -757,7 +757,7 @@ describe('selector', () => {
          *       <input type="color">
          *       <input type="color" value>
          *       <input type="image">
-         *       <input type="number">  <!-- value set to "1" by the user -->
+         *       <input type="number">  <!-- the user set `value` to "1" -->
          *       <input type="radio" checked>
          *       <input type="reset">
          *       <input type="submit">
@@ -772,7 +772,7 @@ describe('selector', () => {
          *       <!-- :blank -->
          *       <input type="checkbox" disabled readonly>
          *       <input type="checkbox" value="value">
-         *       <input type="number" value="1">  <!-- value set to "" by the user -->
+         *       <input type="number" value="1">  <!-- the user set `value` to "" -->
          *       <input type="radio">
          *       <select value="value"></select>
          *       <select multiple>
@@ -981,17 +981,17 @@ describe('selector', () => {
          *       <div type="checkbox" checked="true"></div>
          *
          *       <!-- :unchecked -->
-         *       <input type="checkbox" checked="true">  <!-- unchecked by the user -->
-         *       <input type="radio" checked="true">  <!-- unchecked by the user -->
+         *       <input type="checkbox" checked="true">  <!-- the user unchecked the input -->
+         *       <input type="radio" checked="true">     <!-- the user unchecked the input -->
          *       <select multiple>
-         *         <option selected></option>  <!-- unselected by the user -->
+         *         <option selected></option>            <!-- the user unselected the option -->
          *         <option></option>
          *       </select>
          *
          *       <!-- :checked -->
          *       <input type="checkbox" checked disabled readonly>
-         *       <input type="checkbox">  <!-- checked by the user -->
-         *       <input type="radio">  <!-- checked by the user -->
+         *       <input type="checkbox">                 <!-- the user checked the input -->
+         *       <input type="radio">                    <!-- the user checked the input -->
          *       <select>
          *         <option></option>
          *       </select>
@@ -1860,8 +1860,8 @@ describe('selector', () => {
          *       <input type="week" value="2000-W02" max="2000-W01">
          *
          *       <!-- :in-range -->
-         *       <input type="date" min="2000-01-01" value="1999-12-31" max="2000-01-02">  <!-- value set to empty string by the user -->
-         *       <input type="date" min="1999-12-31" max="2000-01-02">  <!-- value set to "2000-01-01" by the user -->
+         *       <input type="date" min="2000-01-01" value="1999-12-31" max="2000-01-02">  <!-- the user set `value` to empty string -->
+         *       <input type="date" min="1999-12-31" max="2000-01-02">                     <!-- the user set `value` to "2000-01-01" -->
          *       <input type="date" min="2000-01-01" value="2000-01-01" max="2000-01-01">
          *       <input type="datetime-local" min="1999-12-31T00:00" value="2000-01-01T00:00" max="2000-01-01T00:01">
          *       <input type="month" min="1999-12" value="2000-01" max="2000-02">
@@ -3895,12 +3895,13 @@ describe('selector', () => {
         selectors.forEach(selector => assert.match(selector, document._selected.get(selector), document))
     })
     // Resource
+    test.todo(':animated-image')
     test(':buffering, :muted, :paused, :playing, :seeking, :stalled, :volume-locked', () => {
 
         /**
          * <html>
          *   <body>
-         *     <video muted="true"></video>  <!-- unmuted by the user -->
+         *     <video muted="true"></video>  <!-- the user unmuted the video -->
          *     <video muted></video>
          *     <div></div>
          *   </body>

test/style.js

@@ -224,7 +224,6 @@ describe('CSSStyleDeclaration.cssText', () => {
         assert.equal(style.cssText, 'color: green; font-size: 12px;')
     })
 })
-// TODO: add test for filtering declared values in @import style sheet
 describe('CSSStyleDeclaration.setProperty(), CSSStyleDeclaration.getPropertyValue(), CSSStyleDeclaration.removeProperty()', () => {
     it('throws an error when trying to set or remove a declaration while the readonly flag is set', () => {
         const style = createStyle({ readOnly: true })

test/value.js

@@ -1276,7 +1276,6 @@ describe('<signed-integer>', () => {
         assert.valid('<signed-integer>', `+${MAX_INTEGER + 1}`, `+${MAX_INTEGER}`)
     })
 })
-// TODO: add support for variable units
 describe('<dimension>', () => {
     test('invalid', () => {
         // Invalid identifier (start) code point
@@ -2359,7 +2358,7 @@ describe('<random()>', () => {
         assert.valid('<number>', 'random(fixed 1, infinity, 1)', 'calc(infinity)', styleRule)
         assert.valid('<number>', 'random(fixed 1, -infinity, 1)', 'calc(-infinity)', styleRule)
         // Discarded step when its multiplier is infinite
-        assert.valid('<number>', 'random(fixed 0.1, 0, 1, 0)', `calc(0.1)`, styleRule)
+        assert.valid('<number>', 'random(fixed 0.1, 0, 1, 0)', 'calc(0.1)', styleRule)
     })
 })
 describe('<sibling-count()>, <sibling-index()>', () => {