Refactor to simplify has handling

Author: wooorm

lib/parse.js

@@ -1,5 +1,6 @@
 /**
  * @typedef {import('./types.js').Selectors} Selectors
+ * @typedef {import('./types.js').RuleSet} RuleSet
  */
 
 import {CssSelectorParser} from 'css-selector-parser'
@@ -12,23 +13,12 @@ parser.registerNestingOperators('>', '+', '~')
 
 /**
  * @param {string} selector
- * @returns {Selectors}
+ * @returns {Selectors|RuleSet|undefined}
  */
 export function parse(selector) {
   if (typeof selector !== 'string') {
     throw new TypeError('Expected `string` as selector, not `' + selector + '`')
   }
 
-  const query = parser.parse(selector)
-
-  // Empty selectors object doesn’t match anything.
-  if (!query) {
-    return {type: 'selectors', selectors: []}
-  }
-
-  if (query.type === 'selectors') {
-    return query
-  }
-
-  return {type: 'selectors', selectors: [query]}
+  return parser.parse(selector)
 }

lib/pseudo.js

@@ -1,11 +1,12 @@
 /**
  * @typedef {import('./types.js').Rule} Rule
+ * @typedef {import('./types.js').RuleSet} RuleSet
  * @typedef {import('./types.js').RulePseudo} RulePseudo
  * @typedef {import('./types.js').RulePseudoSelector} RulePseudoSelector
  * @typedef {import('./types.js').Parent} Parent
- * @typedef {import('./types.js').Selector} Selector
  * @typedef {import('./types.js').Selectors} Selectors
  * @typedef {import('./types.js').SelectState} SelectState
+ * @typedef {import('./types.js').Root} Root
  * @typedef {import('./types.js').Element} Element
  * @typedef {import('./types.js').ElementChild} ElementChild
  */
@@ -103,8 +104,7 @@ export function pseudo(query, element, index, parent, state) {
  * @returns {boolean}
  */
 function matches(query, element, _, parent, state) {
-  const shallow = state.shallow
-  const one = state.one
+  const {shallow, one} = state
 
   state.shallow = false
   state.one = true
@@ -344,7 +344,6 @@ function lang(query, _1, _2, _3, state) {
   return (
     state.language !== '' &&
     state.language !== undefined &&
-    state.language !== undefined &&
     // @ts-expect-error never `selectors`.
     extendedFilter(state.language, commas(query.value)).length > 0
   )
@@ -540,16 +539,15 @@ function assertDeep(state, query) {
  * @returns {boolean}
  */
 function has(query, element, _1, _2, state) {
-  const shallow = state.shallow
-  const one = state.one
-  const scopeElements = state.scopeElements
-  const value = appendScope(query.value)
+  /** @type {Root} */
+  const fragment = {type: 'root', children: element.children}
+  const {shallow, one, scopeElements} = state
 
   state.shallow = false
   state.one = true
   state.scopeElements = [element]
 
-  const result = any(value, element, state).length > 0
+  const result = any(query.value, fragment, state).length > 0
 
   state.shallow = shallow
   state.one = one
@@ -558,36 +556,6 @@ function has(query, element, _1, _2, state) {
   return result
 }
 
-/**
- * @param {Selector} value
- * @returns {Selectors}
- */
-function appendScope(value) {
-  /** @type {Selectors} */
-  const selector =
-    value.type === 'ruleSet' ? {type: 'selectors', selectors: [value]} : value
-  let index = -1
-
-  while (++index < selector.selectors.length) {
-    const rule = selector.selectors[index].rule
-    rule.nestingOperator = null
-
-    if (
-      !rule.pseudos ||
-      rule.pseudos.length !== 1 ||
-      rule.pseudos[0].name !== 'scope'
-    ) {
-      selector.selectors[index] = {
-        type: 'ruleSet',
-        // @ts-expect-error pseudos are fine w/ just a name!
-        rule: {type: 'rule', rule, pseudos: [{name: 'scope'}]}
-      }
-    }
-  }
-
-  return selector
-}
-
 /**
  * @param {RulePseudo} query
  * @returns {(value: number) => boolean}

lib/types.js

@@ -17,8 +17,6 @@
  * @typedef {Properties[keyof Properties]} PropertyValue
  *   Any property value.
  *
- * @typedef {import('css-selector-parser').Selector} Selector
- *   One selector.
  * @typedef {import('css-selector-parser').Selectors} Selectors
  *   Multiple selectors.
  * @typedef {import('css-selector-parser').Rule} Rule
@@ -47,7 +45,7 @@
  *   Name of pseudo, such as `'matches'`.
  * @property {'selector'} valueType
  *   Set to `'selector'`, because `value` is a compiled selector.
- * @property {Selector} value
+ * @property {Selectors|RuleSet} value
  *   Selector.
  *
  * @typedef {'html' | 'svg'} Space