Remove circular dependency

Closes GH-9.
Closes GH-10.

Co-authored-by: Peter Babič <[email protected]>
Co-authored-by: Titus Wormer <[email protected]>

Author: peterbabic

index.js

@@ -8,13 +8,15 @@ var any = require('./lib/any')
 var parse = require('./lib/parse')
 
 function matches(selector, node) {
-  return Boolean(any(parse(selector), node, {one: true, shallow: true})[0])
+  return Boolean(
+    any(parse(selector), node, {one: true, shallow: true, any: any})[0]
+  )
 }
 
 function select(selector, node) {
-  return any(parse(selector), node, {one: true})[0] || null
+  return any(parse(selector), node, {one: true, any: any})[0] || null
 }
 
 function selectAll(selector, node) {
-  return any(parse(selector), node, {})
+  return any(parse(selector), node, {any: any})
 }

lib/any.js

@@ -52,7 +52,8 @@ function rule(query, tree, state) {
       scopeNodes: tree.type === 'root' ? tree.children : [tree],
       iterator: iterator,
       one: state.one,
-      shallow: state.shallow
+      shallow: state.shallow,
+      any: state.any
     })
   )
 

lib/pseudo.js

@@ -5,7 +5,6 @@ module.exports = match
 var zwitch = require('zwitch')
 var not = require('not')
 var convert = require('unist-util-is/convert')
-var anything = require('./any')
 
 var is = convert()
 
@@ -61,6 +60,7 @@ function match(query, node, index, parent, state) {
 function matches(query, node, index, parent, state) {
   var shallow = state.shallow
   var one = state.one
+  var anything = state.any
   var result
 
   state.one = true
@@ -160,6 +160,7 @@ function hasSelector(query, node, index, parent, state) {
   var one = state.one
   var scopeNodes = state.scopeNodes
   var value = appendScope(query.value)
+  var anything = state.any
   var result
 
   state.shallow = false

test/select-all.js

@@ -727,6 +727,16 @@ test('select.selectAll()', function (t) {
       sst.end()
     })
 
+    st.test(':has', function (sst) {
+      sst.deepEqual(
+        selectAll('c:has(:first-child)', u('a', [u('b'), u('c', [u('d')])])),
+        [u('c', [u('d')])],
+        'should select a node'
+      )
+
+      sst.end()
+    })
+
     st.end()
   })
 

test/select.js

@@ -693,6 +693,16 @@ test('select.select()', function (t) {
       sst.end()
     })
 
+    st.test(':has', function (sst) {
+      sst.deepEqual(
+        select('c:has(:first-child)', u('a', [u('b'), u('c', [u('d')])])),
+        u('c', [u('d')]),
+        'should select a node'
+      )
+
+      sst.end()
+    })
+
     st.end()
   })