add :any(simple-selector, ...) pseudoselector

README.md

@@ -59,6 +59,7 @@ Returns true or false depending on whether the provided node matches the selecto
 `:empty`
 `:root`
 `:contains(text)`
+`:any(selector, selector, selector)`
 
 ## Supported attribute lookups
 

index.js

@@ -45,6 +45,7 @@ function parse(selector, options) {
  function group(token) {
  if(token.type === 'comma') {
  selectors.unshift(bits = [])
+
  return
  }
 
@@ -89,6 +90,7 @@ function parse(selector, options) {
  return true
  }
  }
+
  return false
  }
 
@@ -199,13 +201,23 @@ function valid_pseudo(options, match) {
  case 'root': return valid_root(options)
  }
 
- if(match.indexOf('contains') !== 0) {
- return function() {
- return false
- }
+ if(match.indexOf('contains') === 0) {
+ return valid_contains(options, match.slice(9, -1))
+ }
+
+ if(match.indexOf('any') === 0) {
+ return valid_any_match(options, match.slice(4, -1))
  }
 
- return valid_contains(options, match.slice(9, -1))
+ return function() {
+ return false
+ }
+}
+
+function valid_any_match(options, selector) {
+ var fn = parse(selector, options)
+
+ return fn
 }
 
 function valid_attr(fn, lhs, cmp, rhs) {

test/index.js

@@ -81,6 +81,11 @@ function test_select_multiple() {
  assert.ok(!language(':contains(world)')(data))
  assert.ok(language(':contains(hello)')(data2))
  assert.ok(language(':contains(world)')(data2))
+
+ assert.ok(
+ language(':root > :any(thing-tag, parent-tag, #asdf) > #one-id')(data)
+ )
+
 }
 
 // utils

tokenizer.js

@@ -27,6 +27,7 @@ function tokenize() {
  , stream
  , length
  , quote
+ , depth
  , lhs
  , cmp
  , c
@@ -136,6 +137,7 @@ function tokenize() {
  lhs = gathered.join('')
  state = PSEUDOSTART
  gathered.length = 0
+ depth = 1
  ++idx
 
  return
@@ -170,20 +172,25 @@ function tokenize() {
  return
  }
 
- state_gather(true)
+ gathered.push(c)
 
- if(state !== READY) {
- return
+ if(c === '(') {
+ ++depth
+ } else if(c === ')') {
+ --depth
  }
-
- stream.queue({
- type: rhs 
- , data: lhs+'('+gathered.join('')+')'
- })
+
+ if(!depth) {
+ gathered.pop()
+ stream.queue({
+ type: rhs 
+ , data: lhs+'('+gathered.join('')+')'
+ })
 
- state = READY
- lhs = rhs = cmp = null
- gathered.length = 0
+ state = READY
+ lhs = rhs = cmp = null
+ gathered.length = 0
+ }
 
  return 
  }