Use ESM

Author: wooorm

.gitignore

@@ -1,8 +1,5 @@
 .DS_Store
 *.log
-.nyc_output/
 coverage/
 node_modules/
-hast-util-select.js
-hast-util-select.min.js
 yarn.lock

.prettierignore

@@ -1,5 +1,2 @@
 coverage/
-hast-util-select.js
-hast-util-select.min.js
-*.json
 *.md

index.js

@@ -1,22 +1,16 @@
-'use strict'
+import {any} from './lib/any.js'
+import {parse} from './lib/parse.js'
 
-exports.matches = matches
-exports.selectAll = selectAll
-exports.select = select
-
-var any = require('./lib/any')
-var parse = require('./lib/parse')
-
-function matches(selector, node, space) {
+export function matches(selector, node, space) {
   return Boolean(
-    any(parse(selector), node, {space: space, one: true, shallow: true})[0]
+    any(parse(selector), node, {space, one: true, shallow: true})[0]
   )
 }
 
-function select(selector, node, space) {
-  return any(parse(selector), node, {space: space, one: true})[0] || null
+export function select(selector, node, space) {
+  return any(parse(selector), node, {space, one: true})[0] || null
 }
 
-function selectAll(selector, node, space) {
-  return any(parse(selector), node, {space: space})
+export function selectAll(selector, node, space) {
+  return any(parse(selector), node, {space})
 }

lib/any.js

@@ -1,26 +1,17 @@
-'use strict'
-
-module.exports = match
-
-var html = require('property-information/html')
-var svg = require('property-information/svg')
-var zwitch = require('zwitch')
-var enter = require('./enter-state')
-var nest = require('./nest')
-var pseudo = require('./pseudo')
-var test = require('./test')
+import {html, svg} from 'property-information'
+import {zwitch} from 'zwitch'
+import {enterState} from './enter-state.js'
+import {nest} from './nest.js'
+import {pseudo} from './pseudo.js'
+import {test} from './test.js'
 
 var type = zwitch('type', {
   unknown: unknownType,
   invalid: invalidType,
-  handlers: {
-    selectors: selectors,
-    ruleSet: ruleSet,
-    rule: rule
-  }
+  handlers: {selectors, ruleSet, rule}
 })
 
-function match(query, node, state) {
+export function any(query, node, state) {
   return query && node ? type(query, node, state) : []
 }
 
@@ -57,7 +48,7 @@ function rule(query, tree, state) {
       direction: 'ltr',
       editableOrEditingHost: false,
       scopeElements: tree.type === 'root' ? tree.children : [tree],
-      iterator: iterator,
+      iterator,
       one: state.one,
       shallow: state.shallow
     })
@@ -66,7 +57,7 @@ function rule(query, tree, state) {
   return collect.result
 
   function iterator(query, node, index, parent, state) {
-    var exit = enter(state, node)
+    var exit = enterState(state, node)
 
     if (test(query, node, index, parent, state)) {
       if (query.rule) {
@@ -85,7 +76,7 @@ function rule(query, tree, state) {
     var index = -1
 
     while (++index < pseudos.length) {
-      if (pseudo.needsIndex.indexOf(pseudos[index].name) > -1) {
+      if (pseudo.needsIndex.includes(pseudos[index].name)) {
         state.index = true
         break
       }
@@ -95,12 +86,14 @@ function rule(query, tree, state) {
   }
 }
 
-/* istanbul ignore next - Shouldn’t be invoked, all data is handled. */
+// Shouldn’t be called, all data is handled.
+/* c8 ignore next 3 */
 function unknownType(query) {
   throw new Error('Unknown type `' + query.type + '`')
 }
 
-/* istanbul ignore next - Shouldn’t be invoked, parser gives correct data. */
+// Shouldn’t be called, parser gives correct data.
+/* c8 ignore next 3 */
 function invalidType() {
   throw new Error('Invalid type')
 }
@@ -127,12 +120,13 @@ function collector(one) {
 
     function collectOne(element) {
       if (one) {
-        /* istanbul ignore if - shouldn’t happen, safeguards performance problems. */
+        // Shouldn’t happen, safeguards performance problems.
+        /* c8 ignore next */
         if (found) throw new Error('Cannot collect multiple nodes')
         found = true
       }
 
-      if (result.indexOf(element) < 0) result.push(element)
+      if (!result.includes(element)) result.push(element)
     }
   }
 }

lib/attribute.js

@@ -1,12 +1,8 @@
-'use strict'
-
-module.exports = match
-
-var commas = require('comma-separated-tokens')
-var has = require('hast-util-has-property')
-var find = require('property-information/find')
-var spaces = require('space-separated-tokens')
-var zwitch = require('zwitch')
+import {stringify as commas} from 'comma-separated-tokens'
+import {hasProperty} from 'hast-util-has-property'
+import {find} from 'property-information'
+import {stringify as spaces} from 'space-separated-tokens'
+import {zwitch} from 'zwitch'
 
 var handle = zwitch('operator', {
   unknown: unknownOperator,
@@ -21,7 +17,7 @@ var handle = zwitch('operator', {
   }
 })
 
-function match(query, node, schema) {
+export function attribute(query, node, schema) {
   var attrs = query.attrs
   var index = -1
 
@@ -34,13 +30,13 @@ function match(query, node, schema) {
 
 // `[attr]`
 function exists(query, node, info) {
-  return has(node, info.property)
+  return hasProperty(node, info.property)
 }
 
 // `[attr=value]`
 function exact(query, node, info) {
   return (
-    has(node, info.property) &&
+    hasProperty(node, info.property) &&
     normalizeValue(node.properties[info.property], info) === query.value
   )
 }
@@ -55,10 +51,11 @@ function spaceSeparatedList(query, node, info) {
     (!info.commaSeparated &&
       value &&
       typeof value === 'object' &&
-      value.indexOf(query.value) > -1) ||
+      value.includes(query.value)) ||
     // For all other values (including comma-separated lists), return whether this
     // is an exact match.
-    (has(node, info.property) && normalizeValue(value, info) === query.value)
+    (hasProperty(node, info.property) &&
+      normalizeValue(value, info) === query.value)
   )
 }
 
@@ -67,7 +64,7 @@ function exactOrPrefix(query, node, info) {
   var value = normalizeValue(node.properties[info.property], info)
 
   return (
-    has(node, info.property) &&
+    hasProperty(node, info.property) &&
     (value === query.value ||
       (value.slice(0, query.value.length) === query.value &&
         value.charAt(query.value.length) === '-'))
@@ -77,7 +74,7 @@ function exactOrPrefix(query, node, info) {
 // `[attr^=value]`
 function begins(query, node, info) {
   return (
-    has(node, info.property) &&
+    hasProperty(node, info.property) &&
     normalizeValue(node.properties[info.property], info).slice(
       0,
       query.value.length
@@ -88,7 +85,7 @@ function begins(query, node, info) {
 // `[attr$=value]`
 function ends(query, node, info) {
   return (
-    has(node, info.property) &&
+    hasProperty(node, info.property) &&
     normalizeValue(node.properties[info.property], info).slice(
       -query.value.length
     ) === query.value
@@ -98,13 +95,13 @@ function ends(query, node, info) {
 // `[attr*=value]`
 function contains(query, node, info) {
   return (
-    has(node, info.property) &&
-    normalizeValue(node.properties[info.property], info).indexOf(query.value) >
-      -1
+    hasProperty(node, info.property) &&
+    normalizeValue(node.properties[info.property], info).includes(query.value)
   )
 }
 
-/* istanbul ignore next - Shouldn’t be invoked, Parser throws an error instead. */
+// Shouldn’t be called, Parser throws an error instead.
+/* c8 ignore next 3 */
 function unknownOperator(query) {
   throw new Error('Unknown operator `' + query.operator + '`')
 }
@@ -120,7 +117,7 @@ function normalizeValue(value, info) {
   }
 
   if (typeof value === 'object' && 'length' in value) {
-    return (info.commaSeparated ? commas.stringify : spaces.stringify)(value)
+    return (info.commaSeparated ? commas : spaces)(value)
   }
 
   return value

lib/class-name.js

@@ -1,13 +1,9 @@
-'use strict'
-
-module.exports = match
-
-function match(query, node) {
+export function className(query, node) {
   var value = node.properties.className || []
   var index = -1
 
   while (++index < query.classNames.length) {
-    if (value.indexOf(query.classNames[index]) < 0) return
+    if (!value.includes(query.classNames[index])) return
   }
 
   return true

lib/enter-state.js

@@ -1,15 +1,11 @@
-'use strict'
-
-module.exports = enter
-
-var direction = require('direction')
-var is = require('hast-util-is-element')
-var toString = require('hast-util-to-string')
-var svg = require('property-information/svg')
-var visit = require('unist-util-visit')
+import {direction} from 'direction'
+import {isElement} from 'hast-util-is-element'
+import toString from 'hast-util-to-string'
+import {svg} from 'property-information'
+import {visit, EXIT, SKIP} from 'unist-util-visit'
 
 // eslint-disable-next-line complexity
-function enter(state, node) {
+export function enterState(state, node) {
   var schema = state.schema
   var language = state.language
   var currentDirection = state.direction
@@ -25,7 +21,7 @@ function enter(state, node) {
     type = node.properties.type || 'text'
     dir = dirProperty(node)
 
-    if (lang != null) {
+    if (lang !== undefined && lang !== null) {
       state.language = lang
       found = true
     }
@@ -36,7 +32,7 @@ function enter(state, node) {
         found = true
       }
 
-      if (is(node, 'svg')) {
+      if (isElement(node, 'svg')) {
         state.schema = svg
         found = true
       }
@@ -49,18 +45,18 @@ function enter(state, node) {
         // Explicit `[dir=ltr]`.
         dir === 'ltr' ||
         // HTML with an invalid or no `[dir]`.
-        (dir !== 'auto' && is(node, 'html')) ||
+        (dir !== 'auto' && isElement(node, 'html')) ||
         // `input[type=tel]` with an invalid or no `[dir]`.
-        (dir !== 'auto' && is(node, 'input') && type === 'tel')
+        (dir !== 'auto' && isElement(node, 'input') && type === 'tel')
       ) {
         dirInferred = 'ltr'
         // `[dir=auto]` or `bdi` with an invalid or no `[dir]`.
-      } else if (dir === 'auto' || is(node, 'bdi')) {
-        if (is(node, 'textarea')) {
+      } else if (dir === 'auto' || isElement(node, 'bdi')) {
+        if (isElement(node, 'textarea')) {
           // Check contents of `<textarea>`.
           dirInferred = dirBidi(toString(node))
         } else if (
-          is(node, 'input') &&
+          isElement(node, 'input') &&
           (type === 'email' ||
             type === 'search' ||
             type === 'tel' ||
@@ -100,14 +96,15 @@ function enter(state, node) {
   function inferDirectionality(child) {
     if (child.type === 'text') {
       dirInferred = dirBidi(child.value)
-      return dirInferred ? visit.EXIT : null
+      return dirInferred ? EXIT : null
     }
 
     if (
       child !== node &&
-      (is(child, ['bdi', 'script', 'style', 'textare']) || dirProperty(child))
+      (isElement(child, ['bdi', 'script', 'style', 'textare']) ||
+        dirProperty(child))
     ) {
-      return visit.SKIP
+      return SKIP
     }
   }
 }

lib/id.js

@@ -1,7 +1,3 @@
-'use strict'
-
-module.exports = match
-
-function match(query, node) {
+export function id(query, node) {
   return node.properties.id === query.id
 }

lib/name.js

@@ -1,7 +1,3 @@
-'use strict'
-
-module.exports = match
-
-function match(query, node) {
+export function name(query, node) {
   return query.tagName === '*' || query.tagName === node.tagName
 }

lib/nest.js

@@ -1,9 +1,5 @@
-'use strict'
-
-module.exports = match
-
-var zwitch = require('zwitch')
-var enter = require('./enter-state')
+import {zwitch} from 'zwitch'
+import {enterState} from './enter-state.js'
 
 var own = {}.hasOwnProperty
 
@@ -18,59 +14,62 @@ var handle = zwitch('nestingOperator', {
   }
 })
 
-function match(query, node, index, parent, state) {
+export function nest(query, node, index, parent, state) {
   return handle(query, node, index, parent, state)
 }
 
-/* istanbul ignore next - Shouldn’t be invoked, parser gives correct data. */
+// Shouldn’t be called, parser gives correct data.
+/* c8 ignore next 3 */
 function unknownNesting(query) {
   throw new Error('Unexpected nesting `' + query.nestingOperator + '`')
 }
 
 function topScan(query, node, index, parent, state) {
-  /* istanbul ignore if - Shouldn’t happen. */
+  // Shouldn’t happen.
+  /* c8 ignore next 3 */
   if (parent) {
     throw new Error('topScan is supposed to be called from the root node')
   }
 
-  state.iterator.apply(null, arguments)
+  state.iterator(...arguments)
 
-  if (!state.shallow) descendant.apply(null, arguments)
+  if (!state.shallow) descendant(...arguments)
 }
 
 function descendant(query, node, index, parent, state) {
   var previous = state.iterator
 
   state.iterator = iterator
 
-  child.apply(this, arguments)
+  child(...arguments)
 
-  function iterator(_, node, index, parent, state) {
+  function iterator(_, ...rest) {
     state.iterator = previous
-    previous.apply(this, arguments)
+    previous(...arguments)
     state.iterator = iterator
 
     if (state.one && state.found) return
 
-    child.call(this, query, node, index, parent, state)
+    child(query, ...rest)
   }
 }
 
 function child(query, node, index, parent, state) {
-  if (!node.children || !node.children.length) return
+  if (!node.children || node.children.length === 0) return
   indexedSearch(query, node, state)
 }
 
 function nextSibling(query, node, index, parent, state) {
-  /* istanbul ignore if - Shouldn’t happen. */
+  // Shouldn’t happen.
+  /* c8 ignore next */
   if (!parent) return
   indexedSearch(query, parent, state, index + 1, true)
 }
 
 function subsequentSibling(query, node, index, parent, state) {
-  /* istanbul ignore if - Shouldn’t happen. */
+  // Shouldn’t happen.
+  /* c8 ignore next */
   if (!parent) return
-
   indexedSearch(query, parent, state, index + 1)
 }
 
@@ -84,7 +83,7 @@ function indexedSearch(query, parent, state, from, firstElementOnly) {
   var index = -1
 
   // Start looking at `from`
-  if (from == null) from = 0
+  if (from === undefined || from === null) from = 0
 
   // Exit if there are no further nodes.
   if (from >= children.length) return
@@ -143,7 +142,7 @@ function indexedSearch(query, parent, state, from, firstElementOnly) {
   }
 
   function add(node, childIndex) {
-    var exit = enter(state, node)
+    var exit = enterState(state, node)
     state.iterator(query, node, childIndex, parent, state)
     exit()
   }

lib/parse.js

@@ -1,30 +1,29 @@
-'use strict'
+import {CssSelectorParser} from 'css-selector-parser'
+import fauxEsmNthCheck from 'nth-check'
+import {zwitch} from 'zwitch'
 
-module.exports = parse
+var nthCheck = fauxEsmNthCheck.default
 
-var Parser = require('css-selector-parser').CssSelectorParser
-var nthCheck = require('nth-check').default
-var zwitch = require('zwitch')
+var nth = new Set([
+  'nth-child',
+  'nth-last-child',
+  'nth-of-type',
+  'nth-last-of-type'
+])
 
-var nth = ['nth-child', 'nth-last-child', 'nth-of-type', 'nth-last-of-type']
-
-var parser = new Parser()
+var parser = new CssSelectorParser()
 
 var compile = zwitch('type', {
-  handlers: {
-    selectors: selectors,
-    ruleSet: ruleSet,
-    rule: rule
-  }
+  handlers: {selectors, ruleSet, rule}
 })
 
 parser.registerAttrEqualityMods('~', '|', '^', '$', '*')
 parser.registerSelectorPseudos('any', 'matches', 'not', 'has')
 parser.registerNestingOperators('>', '+', '~')
 
-function parse(selector) {
+export function parse(selector) {
   if (typeof selector !== 'string') {
-    throw new Error('Expected `string` as selector, not `' + selector + '`')
+    throw new TypeError('Expected `string` as selector, not `' + selector + '`')
   }
 
   return compile(parser.parse(selector))
@@ -53,7 +52,7 @@ function rule(query) {
   while (++index < pseudos.length) {
     pseudo = pseudos[index]
 
-    if (nth.indexOf(pseudo.name) > -1) {
+    if (nth.has(pseudo.name)) {
       pseudo.value = nthCheck(pseudo.value)
       pseudo.valueType = 'function'
     }

lib/pseudo.js

@@ -1,35 +1,31 @@
-'use strict'
-
-module.exports = match
-
-var bcp47Match = require('bcp-47-match')
-var commaSeparated = require('comma-separated-tokens')
-var has = require('hast-util-has-property')
-var is = require('hast-util-is-element')
-var whitespace = require('hast-util-whitespace')
-var not = require('not')
-var zwitch = require('zwitch')
-var anything = require('./any')
+import {extendedFilter} from 'bcp-47-match'
+import {parse as commas} from 'comma-separated-tokens'
+import {hasProperty} from 'hast-util-has-property'
+import {isElement} from 'hast-util-is-element'
+import {whitespace} from 'hast-util-whitespace'
+import not from 'not'
+import {zwitch} from 'zwitch'
+import {any} from './any.js'
 
 var handle = zwitch('name', {
   unknown: unknownPseudo,
   invalid: invalidPseudo,
   handlers: {
     any: matches,
     'any-link': anyLink,
-    blank: blank,
-    checked: checked,
-    dir: dir,
-    disabled: disabled,
-    empty: empty,
+    blank,
+    checked,
+    dir,
+    disabled,
+    empty,
     enabled: not(disabled),
     'first-child': firstChild,
     'first-of-type': firstOfType,
-    has: hasSelector,
-    lang: lang,
+    has,
+    lang,
     'last-child': lastChild,
     'last-of-type': lastOfType,
-    matches: matches,
+    matches,
     not: not(matches),
     'nth-child': nthChild,
     'nth-last-child': nthLastChild,
@@ -40,13 +36,13 @@ var handle = zwitch('name', {
     optional: not(required),
     'read-only': not(readWrite),
     'read-write': readWrite,
-    required: required,
-    root: root,
-    scope: scope
+    required,
+    root,
+    scope
   }
 })
 
-match.needsIndex = [
+pseudo.needsIndex = [
   'first-child',
   'first-of-type',
   'last-child',
@@ -59,7 +55,7 @@ match.needsIndex = [
   'only-of-type'
 ]
 
-function match(query, node, index, parent, state) {
+export function pseudo(query, node, index, parent, state) {
   var pseudos = query.pseudos
   var offset = -1
 
@@ -78,7 +74,7 @@ function matches(query, node, index, parent, state) {
   state.shallow = true
   state.one = true
 
-  result = anything(query.value, node, state)[0] === node
+  result = any(query.value, node, state)[0] === node
 
   state.shallow = shallow
   state.one = one
@@ -87,19 +83,19 @@ function matches(query, node, index, parent, state) {
 }
 
 function anyLink(query, node) {
-  return is(node, ['a', 'area', 'link']) && has(node, 'href')
+  return isElement(node, ['a', 'area', 'link']) && hasProperty(node, 'href')
 }
 
 function checked(query, node) {
-  if (is(node, ['input', 'menuitem'])) {
+  if (isElement(node, ['input', 'menuitem'])) {
     return (
       (node.properties.type === 'checkbox' ||
         node.properties.type === 'radio') &&
-      has(node, 'checked')
+      hasProperty(node, 'checked')
     )
   }
 
-  if (is(node, 'option')) return has(node, 'selected')
+  if (isElement(node, 'option')) return hasProperty(node, 'selected')
 }
 
 function dir(query, node, index, parent, state) {
@@ -108,7 +104,7 @@ function dir(query, node, index, parent, state) {
 
 function disabled(query, node) {
   return (
-    is(node, [
+    isElement(node, [
       'button',
       'input',
       'select',
@@ -117,30 +113,33 @@ function disabled(query, node) {
       'option',
       'menuitem',
       'fieldset'
-    ]) && has(node, 'disabled')
+    ]) && hasProperty(node, 'disabled')
   )
 }
 
 function required(query, node) {
-  return is(node, ['input', 'textarea', 'select']) && has(node, 'required')
+  return (
+    isElement(node, ['input', 'textarea', 'select']) &&
+    hasProperty(node, 'required')
+  )
 }
 
 function readWrite(query, node, index, parent, state) {
-  return is(node, ['input', 'textarea'])
-    ? !has(node, 'readOnly') && !has(node, 'disabled')
+  return isElement(node, ['input', 'textarea'])
+    ? !hasProperty(node, 'readOnly') && !hasProperty(node, 'disabled')
     : state.editableOrEditingHost
 }
 
 function root(query, node, index, parent, state) {
   return (
     (!parent || parent.type === 'root') &&
     (state.schema.space === 'html' || state.schema.space === 'svg') &&
-    is(node, ['html', 'svg'])
+    isElement(node, ['html', 'svg'])
   )
 }
 
 function scope(query, node, index, parent, state) {
-  return is(node) && state.scopeElements.indexOf(node) > -1
+  return isElement(node) && state.scopeElements.includes(node)
 }
 
 function empty(query, node) {
@@ -169,9 +168,9 @@ function firstChild(query, node, index, parent, state) {
 function lang(query, node, index, parent, state) {
   return (
     state.language !== '' &&
-    state.language != null &&
-    bcp47Match.extendedFilter(state.language, commaSeparated.parse(query.value))
-      .length
+    state.language !== undefined &&
+    state.language !== null &&
+    extendedFilter(state.language, commas(query.value)).length > 0
   )
 }
 
@@ -229,7 +228,8 @@ function someChildren(node, check) {
   }
 }
 
-/* istanbul ignore next - Shouldn’t be invoked, parser gives correct data. */
+// Shouldn’t be called, parser gives correct data.
+/* c8 ignore next 3 */
 function invalidPseudo() {
   throw new Error('Invalid pseudo-selector')
 }
@@ -248,7 +248,7 @@ function assertDeep(state, query) {
   }
 }
 
-function hasSelector(query, node, index, parent, state) {
+function has(query, node, index, parent, state) {
   var shallow = state.shallow
   var one = state.one
   var scopeElements = state.scopeElements
@@ -259,7 +259,7 @@ function hasSelector(query, node, index, parent, state) {
   state.one = true
   state.scopeElements = [node]
 
-  result = anything(value, node, state)[0]
+  result = any(value, node, state)[0]
 
   state.shallow = shallow
   state.one = one
@@ -285,7 +285,7 @@ function appendScope(value) {
     ) {
       selector.selectors[index] = {
         type: 'rule',
-        rule: rule,
+        rule,
         pseudos: [{name: 'scope'}]
       }
     }

lib/test.js

@@ -1,21 +1,17 @@
-'use strict'
+import {attribute} from './attribute.js'
+import {className} from './class-name.js'
+import {id} from './id.js'
+import {name} from './name.js'
+import {pseudo} from './pseudo.js'
 
-module.exports = test
-
-var attributes = require('./attribute')
-var classNames = require('./class-name')
-var id = require('./id')
-var name = require('./name')
-var pseudos = require('./pseudo')
-
-function test(query, node, index, parent, state) {
+export function test(query, node, index, parent, state) {
   return (
     node &&
     node.type === 'element' &&
     (!query.tagName || name(query, node)) &&
-    (!query.classNames || classNames(query, node)) &&
+    (!query.classNames || className(query, node)) &&
     (!query.id || id(query, node)) &&
-    (!query.attrs || attributes(query, node, state.schema)) &&
-    (!query.pseudos || pseudos(query, node, index, parent, state))
+    (!query.attrs || attribute(query, node, state.schema)) &&
+    (!query.pseudos || pseudo(query, node, index, parent, state))
   )
 }

package.json

@@ -28,52 +28,44 @@
   "contributors": [
     "Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)"
   ],
+  "sideEffects": false,
+  "type": "module",
+  "main": "index.js",
+  "files": [
+    "lib/",
+    "index.js"
+  ],
   "dependencies": {
-    "bcp-47-match": "^1.0.0",
-    "comma-separated-tokens": "^1.0.0",
+    "bcp-47-match": "^2.0.0",
+    "comma-separated-tokens": "^2.0.0",
     "css-selector-parser": "^1.0.0",
-    "direction": "^1.0.0",
-    "hast-util-has-property": "^1.0.0",
-    "hast-util-is-element": "^1.0.0",
+    "direction": "^2.0.0",
+    "hast-util-has-property": "^2.0.0",
+    "hast-util-is-element": "^2.0.0",
     "hast-util-to-string": "^1.0.0",
-    "hast-util-whitespace": "^1.0.0",
+    "hast-util-whitespace": "^2.0.0",
     "not": "^0.1.0",
     "nth-check": "^2.0.0",
-    "property-information": "^5.0.0",
-    "space-separated-tokens": "^1.0.0",
-    "unist-util-visit": "^2.0.0",
-    "zwitch": "^1.0.0"
+    "property-information": "^6.0.0",
+    "space-separated-tokens": "^2.0.0",
+    "unist-util-visit": "^3.0.0",
+    "zwitch": "^2.0.0"
   },
-  "files": [
-    "lib",
-    "index.js"
-  ],
   "devDependencies": {
-    "browserify": "^17.0.0",
-    "hastscript": "^6.0.0",
-    "nyc": "^15.0.0",
+    "c8": "^7.0.0",
+    "hastscript": "^7.0.0",
     "prettier": "^2.0.0",
     "remark-cli": "^9.0.0",
     "remark-preset-wooorm": "^8.0.0",
     "tape": "^5.0.0",
-    "tinyify": "^3.0.0",
-    "unist-builder": "^2.0.0",
-    "xo": "^0.38.0"
+    "unist-builder": "^3.0.0",
+    "xo": "^0.39.0"
   },
   "scripts": {
     "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
-    "build-bundle": "browserify . -s hastUtilSelect > hast-util-select.js",
-    "build-mangle": "browserify . -s hastUtilSelect -p tinyify > hast-util-select.min.js",
-    "build": "npm run build-bundle && npm run build-mangle",
-    "test-api": "node test",
-    "test-coverage": "nyc --reporter lcov tape test/index.js",
-    "test": "npm run format && npm run build && npm run test-coverage"
-  },
-  "nyc": {
-    "check-coverage": true,
-    "lines": 100,
-    "functions": 100,
-    "branches": 100
+    "test-api": "node test/index.js",
+    "test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov node test/index.js",
+    "test": "npm run format && npm run test-coverage"
   },
   "prettier": {
     "tabWidth": 2,
@@ -85,26 +77,12 @@
   },
   "xo": {
     "prettier": true,
-    "esnext": false,
     "rules": {
-      "eqeqeq": [
-        "error",
-        "always",
-        {
-          "null": "ignore"
-        }
-      ],
       "max-params": "off",
-      "no-eq-null": "off",
-      "unicorn/explicit-length-check": "off",
-      "unicorn/prefer-includes": "off",
-      "unicorn/prefer-reflect-apply": "off",
-      "unicorn/prefer-type-error": "off",
-      "unicorn/no-array-for-each": "off"
-    },
-    "ignores": [
-      "hast-util-select.js"
-    ]
+      "unicorn/no-array-for-each": "off",
+      "no-var": "off",
+      "prefer-arrow-callback": "off"
+    }
   },
   "remarkConfig": {
     "plugins": [

readme.md

@@ -22,6 +22,9 @@ This information is not stored in hast, so selectors like that don’t work.
 
 ## Install
 
+This package is [ESM only](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c):
+Node 12+ is needed to use it and it must be `import`ed instead of `require`d.
+
 [npm][]:
 
 ```sh
@@ -30,7 +33,11 @@ npm install hast-util-select
 
 ## API
 
-### `select.matches(selector, node[, space])`
+This package exports the following identifiers: `matches`, `select`, and
+`selectAll`.
+There is no default export.
+
+### `matches(selector, node[, space])`
 
 Check that the given `node` matches `selector`.
 Returns boolean, whether the node matches or not.
@@ -43,8 +50,8 @@ This only checks that the given element matches the selector.
 ##### Use
 
 ```js
-var h = require('hastscript')
-var matches = require('hast-util-select').matches
+import {h} from 'hastscript'
+import {matches} from 'hast-util-select'
 
 matches('b, i', h('b')) // => true
 matches(':any-link', h('a')) // => false
@@ -69,7 +76,7 @@ matches('[lang|=en]', h('a', {lang: 'en-GB'})) // => true
 
 `boolean` — Whether the node matches the selector.
 
-### `select.select(selector, tree[, space])`
+### `select(selector, tree[, space])`
 
 Select the first `node` matching `selector` in the given `tree` (could be the
 tree itself).
@@ -78,8 +85,8 @@ Searches the [*tree*][tree] in [*preorder*][preorder].
 ##### Use
 
 ```js
-var h = require('hastscript')
-var select = require('hast-util-select').select
+import {h} from 'hastscript'
+import {select} from 'hast-util-select'
 
 console.log(
   select(
@@ -115,7 +122,7 @@ Yields:
 
 [`Element?`][element] — The found element, if any.
 
-### `select.selectAll(selector, tree[, space])`
+### `selectAll(selector, tree[, space])`
 
 Select all nodes matching `selector` in the given `tree` (could include the tree
 itself).
@@ -124,8 +131,8 @@ Searches the [*tree*][tree] in [*preorder*][preorder].
 ##### Use
 
 ```js
-var h = require('hastscript')
-var selectAll = require('hast-util-select').selectAll
+import {h} from 'hastscript'
+import {selectAll} from 'hast-util-select'
 
 console.log(
   selectAll(
@@ -224,13 +231,13 @@ Yields:
 *   [ ] ‡ `[*|attr]` (any namespace attribute)
 *   [ ] ‡ `[|attr]` (no namespace attribute)
 *   [ ] ‡ `[attr=value i]` (attribute case-insensitive)
-*   [ ] ‡ `:has()` (functional pseudo-class).
-    <small>Relative selectors (`:has(> img)`) are not supported, but scope is
+*   [ ] ‡ `:has()` (functional pseudo-class).  <small>Relative
+    selectors (`:has(> img)`) are not supported, but scope is
     (`:has(:scope > img)`) </small>
-*   [ ] ‖ `:nth-child(n of S)` (functional pseudo-class).
-    <small>Scoping to parents is not supported</small>
-*   [ ] ‖ `:nth-last-child(n of S)` (scoped to parent S).
-    <small>Scoping to parents is not supported</small>
+*   [ ] ‖ `:nth-child(n of S)` (functional pseudo-class).  <small>Scoping
+    to parents is not supported</small>
+*   [ ] ‖ `:nth-last-child(n of S)` (scoped to parent S).  <small>Scoping
+    to parents is not supported</small>
 *   [ ] † `:active` (pseudo-class)
 *   [ ] † `:current` (pseudo-class)
 *   [ ] † `:current()` (functional pseudo-class)

test/all.js

@@ -1,9 +1,7 @@
-'use strict'
-
-var test = require('tape')
-var u = require('unist-builder')
-var h = require('hastscript')
-var selectAll = require('..').selectAll
+import test from 'tape'
+import {u} from 'unist-builder'
+import {h} from 'hastscript'
+import {selectAll} from '../index.js'
 
 test('all together now', function (t) {
   t.deepEqual(

test/index.js

@@ -1,9 +1,7 @@
-'use strict'
-
 /* eslint-disable import/no-unassigned-import */
-require('./matches')
-require('./select')
-require('./select-all')
-require('./all')
-require('./svg')
+import './matches.js'
+import './select.js'
+import './select-all.js'
+import './all.js'
+import './svg.js'
 /* eslint-enable import/no-unassigned-import */

test/matches.js

@@ -1,10 +1,7 @@
-'use strict'
-
-var test = require('tape')
-var u = require('unist-builder')
-var h = require('hastscript')
-var s = require('hastscript/svg')
-var matches = require('..').matches
+import test from 'tape'
+import {u} from 'unist-builder'
+import {h, s} from 'hastscript'
+import {matches} from '../index.js'
 
 test('select.matches()', function (t) {
   t.test('invalid selector', function (t) {
@@ -18,63 +15,63 @@ test('select.matches()', function (t) {
 
     t.throws(
       function () {
-        matches([], h())
+        matches([], h(''))
       },
       /Error: Expected `string` as selector, not ``/,
       'should throw w/ invalid selector (1)'
     )
 
     t.throws(
       function () {
-        matches('@supports (transform-origin: 5% 5%) {}', h())
+        matches('@supports (transform-origin: 5% 5%) {}', h(''))
       },
       /Error: Rule expected but "@" found./,
       'should throw w/ invalid selector (2)'
     )
 
     t.throws(
       function () {
-        matches('[foo%=bar]', h())
+        matches('[foo%=bar]', h(''))
       },
       /Error: Expected "=" but "%" found./,
       'should throw on invalid attribute operators'
     )
 
     t.throws(
       function () {
-        matches(':active', h())
+        matches(':active', h(''))
       },
       /Error: Unknown pseudo-selector `active`/,
       'should throw on invalid pseudo classes'
     )
 
     t.throws(
       function () {
-        matches(':nth-foo(2n+1)', h())
+        matches(':nth-foo(2n+1)', h(''))
       },
       /Error: Unknown pseudo-selector `nth-foo`/,
       'should throw on invalid pseudo class “functions”'
     )
 
     t.throws(
       function () {
-        matches('::before', h())
+        matches('::before', h(''))
       },
       /Error: Unexpected pseudo-element or empty pseudo-class/,
       'should throw on invalid pseudo elements'
     )
 
     t.throws(
       function () {
-        matches('foo bar', h())
+        matches('foo bar', h(''))
       },
       /Error: Expected selector without nesting/,
       'should throw on nested selectors (descendant)'
     )
 
     t.throws(
       function () {
-        matches('foo > bar', h())
+        matches('foo > bar', h(''))
       },
       /Error: Expected selector without nesting/,
       'should throw on nested selectors (direct child)'
@@ -103,7 +100,7 @@ test('select.matches()', function (t) {
     simplePseudos.forEach(function (pseudo) {
       t.throws(
         function () {
-          matches(':' + pseudo, h())
+          matches(':' + pseudo, h(''))
         },
         new RegExp('Error: Cannot use `:' + pseudo + '` without parent'),
         'should throw on `' + pseudo + '`'
@@ -113,7 +110,7 @@ test('select.matches()', function (t) {
     functionalPseudos.forEach(function (pseudo) {
       t.throws(
         function () {
-          matches(':' + pseudo + '()', h())
+          matches(':' + pseudo + '()', h(''))
         },
         new RegExp('Error: Cannot use `:' + pseudo + '` without parent'),
         'should throw on `' + pseudo + '()`'
@@ -124,8 +121,8 @@ test('select.matches()', function (t) {
   })
 
   t.test('general', function (t) {
-    t.notOk(matches('', h()), 'false for the empty string as selector')
-    t.notOk(matches(' ', h()), 'false for a white-space only selector')
+    t.notOk(matches('', h('')), 'false for the empty string as selector')
+    t.notOk(matches(' ', h('')), 'false for a white-space only selector')
     t.notOk(matches('*'), 'false if not given a node')
     t.notOk(
       matches('*', {type: 'text', value: 'a'}),
@@ -143,15 +140,15 @@ test('select.matches()', function (t) {
   })
 
   t.test('tag-names: `div`, `*`', function (t) {
-    t.ok(matches('*', h()), 'true for `*`')
+    t.ok(matches('*', h('')), 'true for `*`')
     t.ok(matches('b', h('b')), 'true if tag-names matches')
     t.notOk(matches('b', h('i')), 'false if tag-names don’t matches')
 
     t.end()
   })
 
   t.test('id: `#id`', function (t) {
-    t.notOk(matches('#one', h()), 'false if no id exists')
+    t.notOk(matches('#one', h('')), 'false if no id exists')
     t.ok(matches('#one', h('#one')), 'true for matchesing id’s')
     t.notOk(matches('#two', h('#one')), 'false for mismatchesed id’s')
     t.ok(
@@ -167,7 +164,7 @@ test('select.matches()', function (t) {
   })
 
   t.test('class: `.class`', function (t) {
-    t.notOk(matches('.one', h()), 'false if no class-name exists')
+    t.notOk(matches('.one', h('')), 'false if no class-name exists')
     t.ok(matches('.one', h('.one')), 'true for matchesing class-name')
     t.ok(
       matches('.one', h('.one.two')),
@@ -932,7 +929,7 @@ test('select.matches()', function (t) {
         'false for options w/o `selected`'
       )
 
-      t.notOk(matches(':checked', h()), 'false for other nodes')
+      t.notOk(matches(':checked', h('')), 'false for other nodes')
 
       t.end()
     })
@@ -1010,33 +1007,33 @@ test('select.matches()', function (t) {
     })
 
     t.test(':empty', function (t) {
-      t.ok(matches(':empty', h()), 'true if w/o children')
+      t.ok(matches(':empty', h('')), 'true if w/o children')
       t.ok(
-        matches(':empty', h(null, u('comment', '?'))),
+        matches(':empty', h('', u('comment', '?'))),
         'true if w/o elements or texts'
       )
-      t.notOk(matches(':empty', h(null, h())), 'false if w/ elements')
-      t.notOk(matches(':empty', h(null, u('text', '.'))), 'false if w/ text')
+      t.notOk(matches(':empty', h('', h(''))), 'false if w/ elements')
+      t.notOk(matches(':empty', h('', u('text', '.'))), 'false if w/ text')
       t.notOk(
-        matches(':empty', h(null, u('text', ' '))),
+        matches(':empty', h('', u('text', ' '))),
         'false if w/ white-space text'
       )
 
       t.end()
     })
 
     t.test(':blank', function (t) {
-      t.ok(matches(':blank', h()), 'true if w/o children')
+      t.ok(matches(':blank', h('')), 'true if w/o children')
       t.ok(
-        matches(':blank', h(null, u('comment', '?'))),
+        matches(':blank', h('', u('comment', '?'))),
         'true if w/o elements or texts'
       )
       t.ok(
-        matches(':blank', h(null, u('text', ' '))),
+        matches(':blank', h('', u('text', ' '))),
         'true if w/ white-space text'
       )
-      t.notOk(matches(':blank', h(null, h())), 'false if w/ elements')
-      t.notOk(matches(':blank', h(null, u('text', '.'))), 'false if w/ text')
+      t.notOk(matches(':blank', h('', h(''))), 'false if w/ elements')
+      t.notOk(matches(':blank', h('', u('text', '.'))), 'false if w/ text')
 
       t.end()
     })

test/select-all.js

@@ -1,10 +1,7 @@
-'use strict'
-
-var test = require('tape')
-var u = require('unist-builder')
-var s = require('hastscript/svg')
-var h = require('hastscript')
-var selectAll = require('..').selectAll
+import test from 'tape'
+import {u} from 'unist-builder'
+import {h, s} from 'hastscript'
+import {selectAll} from '../index.js'
 
 test('select.selectAll()', function (t) {
   t.test('invalid selectors', function (t) {
@@ -18,47 +15,47 @@ test('select.selectAll()', function (t) {
 
     t.throws(
       function () {
-        selectAll([], h())
+        selectAll([], h(''))
       },
       /Error: Expected `string` as selector, not ``/,
       'should throw w/ invalid selector (1)'
     )
 
     t.throws(
       function () {
-        selectAll('@supports (transform-origin: 5% 5%) {}', h())
+        selectAll('@supports (transform-origin: 5% 5%) {}', h(''))
       },
       /Error: Rule expected but "@" found./,
       'should throw w/ invalid selector (2)'
     )
 
     t.throws(
       function () {
-        selectAll('[foo%=bar]', h())
+        selectAll('[foo%=bar]', h(''))
       },
       /Error: Expected "=" but "%" found./,
       'should throw on invalid attribute operators'
     )
 
     t.throws(
       function () {
-        selectAll(':active', h())
+        selectAll(':active', h(''))
       },
       /Error: Unknown pseudo-selector `active`/,
       'should throw on invalid pseudo classes'
     )
 
     t.throws(
       function () {
-        selectAll(':nth-foo(2n+1)', h())
+        selectAll(':nth-foo(2n+1)', h(''))
       },
       /Error: Unknown pseudo-selector `nth-foo`/,
       'should throw on invalid pseudo class “functions”'
     )
 
     t.throws(
       function () {
-        selectAll('::before', h())
+        selectAll('::before', h(''))
       },
       /Error: Unexpected pseudo-element or empty pseudo-class/,
       'should throw on invalid pseudo elements'
@@ -69,12 +66,12 @@ test('select.selectAll()', function (t) {
 
   t.test('general', function (t) {
     t.deepEqual(
-      selectAll('', h()),
+      selectAll('', h('')),
       [],
       'nothing for the empty string as selector'
     )
     t.deepEqual(
-      selectAll(' ', h()),
+      selectAll(' ', h('')),
       [],
       'nothing for a white-space only selector'
     )

test/select.js

@@ -1,10 +1,7 @@
-'use strict'
-
-var test = require('tape')
-var u = require('unist-builder')
-var s = require('hastscript/svg')
-var h = require('hastscript')
-var select = require('..').select
+import test from 'tape'
+import {u} from 'unist-builder'
+import {h, s} from 'hastscript'
+import {select} from '../index.js'
 
 test('select.select()', function (t) {
   t.test('invalid selectors', function (t) {
@@ -18,47 +15,47 @@ test('select.select()', function (t) {
 
     t.throws(
       function () {
-        select([], h())
+        select([], h(''))
       },
       /Error: Expected `string` as selector, not ``/,
       'should throw w/ invalid selector (1)'
     )
 
     t.throws(
       function () {
-        select('@supports (transform-origin: 5% 5%) {}', h())
+        select('@supports (transform-origin: 5% 5%) {}', h(''))
       },
       /Error: Rule expected but "@" found./,
       'should throw w/ invalid selector (2)'
     )
 
     t.throws(
       function () {
-        select('[foo%=bar]', h())
+        select('[foo%=bar]', h(''))
       },
       /Error: Expected "=" but "%" found./,
       'should throw on invalid attribute operators'
     )
 
     t.throws(
       function () {
-        select(':active', h())
+        select(':active', h(''))
       },
       /Error: Unknown pseudo-selector `active`/,
       'should throw on invalid pseudo classes'
     )
 
     t.throws(
       function () {
-        select(':nth-foo(2n+1)', h())
+        select(':nth-foo(2n+1)', h(''))
       },
       /Error: Unknown pseudo-selector `nth-foo`/,
       'should throw on invalid pseudo class “functions”'
     )
 
     t.throws(
       function () {
-        select('::before', h())
+        select('::before', h(''))
       },
       /Error: Unexpected pseudo-element or empty pseudo-class/,
       'should throw on invalid pseudo elements'
@@ -68,8 +65,8 @@ test('select.select()', function (t) {
   })
 
   t.test('general', function (t) {
-    t.equal(select('', h()), null, 'nothing for the empty string as selector')
-    t.equal(select(' ', h()), null, 'nothing for a white-space only selector')
+    t.equal(select('', h('')), null, 'nothing for the empty string as selector')
+    t.equal(select(' ', h('')), null, 'nothing for a white-space only selector')
     t.equal(select('*'), null, 'nothing if not given a node')
     t.equal(
       select('*', {type: 'text', value: 'a'}),

test/svg.js

@@ -1,11 +1,7 @@
-'use strict'
-
-var test = require('tape')
-var u = require('unist-builder')
-var s = require('hastscript/svg')
-var h = require('hastscript')
-var select = require('..').select
-var selectAll = require('..').selectAll
+import test from 'tape'
+import {u} from 'unist-builder'
+import {h, s} from 'hastscript'
+import {select, selectAll} from '../index.js'
 
 test('svg', function (t) {
   t.deepEqual(