Refactor code-style

Author: wooorm

lib/any.js

@@ -17,7 +17,7 @@ import {pseudo} from './pseudo.js'
 import {test} from './test.js'
 import {root} from './util.js'
 
-var type = zwitch('type', {
+const type = zwitch('type', {
   // @ts-expect-error: hush.
   unknown: unknownType,
   invalid: invalidType,
@@ -42,8 +42,8 @@ export function any(query, node, state) {
  * @param {SelectState} state
  */
 function selectors(query, node, state) {
-  var collect = collector(state.one)
-  var index = -1
+  const collect = collector(state.one)
+  let index = -1
 
   while (++index < query.selectors.length) {
     collect(ruleSet(query.selectors[index], node, state))
@@ -67,7 +67,7 @@ function ruleSet(query, node, state) {
  * @param {SelectState} state
  */
 function rule(query, tree, state) {
-  var collect = collector(state.one)
+  const collect = collector(state.one)
 
   if (state.shallow && query.rule) {
     throw new Error('Expected selector without nesting')
@@ -110,8 +110,8 @@ function rule(query, tree, state) {
  * @returns {S}
  */
 function configure(query, state) {
-  var pseudos = query.pseudos || []
-  var index = -1
+  const pseudos = query.pseudos || []
+  let index = -1
 
   while (++index < pseudos.length) {
     if (pseudo.needsIndex.includes(pseudos[index].name)) {
@@ -143,9 +143,9 @@ function invalidType() {
  */
 function collector(one) {
   /** @type {Array.<Node>} */
-  var result = []
+  const result = []
   /** @type {boolean} */
-  var found
+  let found
 
   collect.result = result
 
@@ -157,7 +157,7 @@ function collector(one) {
    * @param {Node|Array.<Node>} node
    */
   function collect(node) {
-    var index = -1
+    let index = -1
 
     if ('length' in node) {
       while (++index < node.length) {

lib/attribute.js

@@ -6,7 +6,7 @@
 
 import {zwitch} from 'zwitch'
 
-var handle = zwitch('operator', {
+const handle = zwitch('operator', {
   // @ts-expect-error: hush.
   unknown: unknownOperator,
   // @ts-expect-error: hush.
@@ -30,7 +30,7 @@ var handle = zwitch('operator', {
  * @param {Node} node
  */
 export function attribute(query, node) {
-  var index = -1
+  let index = -1
 
   while (++index < query.attrs.length) {
     if (!handle(query.attrs[index], node)) return false
@@ -70,7 +70,7 @@ function exact(query, node) {
 function containsArray(query, node) {
   /** @type {unknown} */
   // @ts-expect-error: Looks like a record.
-  var value = node[query.name]
+  const value = node[query.name]
 
   if (value === null || value === undefined) return false
 
@@ -95,7 +95,7 @@ function containsArray(query, node) {
 function begins(query, node) {
   /** @type {unknown} */
   // @ts-expect-error: Looks like a record.
-  var value = node[query.name]
+  const value = node[query.name]
 
   return (
     query.value &&
@@ -113,7 +113,7 @@ function begins(query, node) {
 function ends(query, node) {
   /** @type {unknown} */
   // @ts-expect-error: Looks like a record.
-  var value = node[query.name]
+  const value = node[query.name]
 
   return (
     query.value &&
@@ -131,7 +131,7 @@ function ends(query, node) {
 function containsString(query, node) {
   /** @type {unknown} */
   // @ts-expect-error: Looks like a record.
-  var value = node[query.name]
+  const value = node[query.name]
   return query.value && typeof value === 'string' && value.includes(query.value)
 }
 

lib/nest.js

@@ -11,9 +11,9 @@
 import {zwitch} from 'zwitch'
 import {parent} from './util.js'
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
-var handle = zwitch('nestingOperator', {
+const handle = zwitch('nestingOperator', {
   // @ts-expect-error: hush.
   unknown: unknownNesting,
   // @ts-expect-error: hush.
@@ -72,7 +72,7 @@ function descendant(query, node, index, parent, state) {
     throw new Error('Expected `iterator` to be defined')
   }
 
-  var previous = state.iterator
+  const previous = state.iterator
 
   state.iterator = iterator
   child(query, node, index, parent, state)
@@ -161,7 +161,7 @@ class WalkIterator {
    * @returns {this}
    */
   prefillTypeIndex(x, y) {
-    var [start, end] = this.defaults(x, y)
+    let [start, end] = this.defaults(x, y)
 
     if (this.typeIndex) {
       while (start < end) {
@@ -179,12 +179,12 @@ class WalkIterator {
    * @returns {this}
    */
   each(x, y) {
-    var [start, end] = this.defaults(x, y)
-    var child = this.parent.children[start]
+    const [start, end] = this.defaults(x, y)
+    const child = this.parent.children[start]
     /** @type {number} */
-    var index
+    let index
     /** @type {number} */
-    var nodeIndex
+    let nodeIndex
 
     if (start >= end) return this
 
@@ -236,7 +236,7 @@ class WalkIterator {
    * @returns {this}
    */
   done() {
-    var index = -1
+    let index = -1
 
     while (++index < this.delayed.length) {
       this.delayed[index].call(this)
@@ -272,7 +272,7 @@ class TypeIndex {
    * @returns {number}
    */
   index(node) {
-    var type = node.type
+    const type = node.type
 
     this.nodes++
 

lib/parse.js

@@ -13,23 +13,23 @@ import {zwitch} from 'zwitch'
 
 /** @type {import('nth-check').default} */
 // @ts-expect-error
-var nthCheck = fauxEsmNthCheck.default
+const nthCheck = fauxEsmNthCheck.default
 
-var nth = new Set([
+const nth = new Set([
   'nth-child',
   'nth-last-child',
   'nth-of-type',
   'nth-last-of-type'
 ])
 
-var parser = new CssSelectorParser()
+const parser = new CssSelectorParser()
 
 parser.registerAttrEqualityMods('~', '^', '$', '*')
 parser.registerSelectorPseudos('any', 'matches', 'not', 'has')
 parser.registerNestingOperators('>', '+', '~')
 
 // @ts-expect-error: hush.
-var compile = zwitch('type', {handlers: {selectors, ruleSet, rule}})
+const compile = zwitch('type', {handlers: {selectors, ruleSet, rule}})
 
 /**
  * @param {string} selector
@@ -48,8 +48,8 @@ export function parse(selector) {
  * @param {Selectors} query
  */
 function selectors(query) {
-  var selectors = query.selectors
-  var index = -1
+  const selectors = query.selectors
+  let index = -1
 
   while (++index < selectors.length) {
     compile(selectors[index])
@@ -69,10 +69,10 @@ function ruleSet(query) {
  * @param {Rule} query
  */
 function rule(query) {
-  var pseudos = query.pseudos || []
-  var index = -1
+  const pseudos = query.pseudos || []
+  let index = -1
   /** @type {RulePseudo|RulePseudoNth} */
-  var pseudo
+  let pseudo
 
   while (++index < pseudos.length) {
     pseudo = pseudos[index]

lib/pseudo.js

@@ -14,9 +14,9 @@ import {zwitch} from 'zwitch'
 import {convert} from 'unist-util-is'
 import {parent} from './util.js'
 
-var is = convert()
+const is = convert()
 
-var handle = zwitch('name', {
+const handle = zwitch('name', {
   // @ts-expect-error: hush.
   unknown: unknownPseudo,
   invalid: invalidPseudo,
@@ -82,8 +82,8 @@ pseudo.needsIndex = [
  * @returns {boolean}
  */
 export function pseudo(query, node, index, parent, state) {
-  var pseudos = query.pseudos
-  var offset = -1
+  const pseudos = query.pseudos
+  let offset = -1
 
   while (++offset < pseudos.length) {
     if (!handle(pseudos[offset], node, index, parent, state)) return false
@@ -101,15 +101,13 @@ export function pseudo(query, node, index, parent, state) {
  * @returns {boolean}
  */
 function matches(query, node, _1, _2, state) {
-  var shallow = state.shallow
-  var one = state.one
-  /** @type {boolean} */
-  var result
+  const shallow = state.shallow
+  const one = state.one
 
   state.one = true
   state.shallow = true
 
-  result = state.any(query.value, node, state)[0] === node
+  const result = state.any(query.value, node, state)[0] === node
 
   state.shallow = shallow
   state.one = one
@@ -346,19 +344,17 @@ function assertDeep(state, query) {
  * @returns {boolean}
  */
 function hasSelector(query, node, _1, _2, state) {
-  var shallow = state.shallow
-  var one = state.one
-  var scopeNodes = state.scopeNodes
-  var value = appendScope(query.value)
-  var anything = state.any
-  /** @type {boolean} */
-  var result
+  const shallow = state.shallow
+  const one = state.one
+  const scopeNodes = state.scopeNodes
+  const value = appendScope(query.value)
+  const anything = state.any
 
   state.shallow = false
   state.one = true
   state.scopeNodes = [node]
 
-  result = Boolean(anything(value, node, state)[0])
+  const result = Boolean(anything(value, node, state)[0])
 
   state.shallow = shallow
   state.one = one
@@ -372,11 +368,11 @@ function hasSelector(query, node, _1, _2, state) {
  */
 function appendScope(value) {
   /** @type {Selectors} */
-  var selector =
+  const selector =
     value.type === 'ruleSet' ? {type: 'selectors', selectors: [value]} : value
-  var index = -1
+  let index = -1
   /** @type {Rule} */
-  var rule
+  let rule
 
   while (++index < selector.selectors.length) {
     rule = selector.selectors[index].rule

package.json

@@ -85,10 +85,7 @@
   "xo": {
     "prettier": true,
     "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off",
-      "max-params": "off",
-      "unicorn/no-array-for-each": "off"
+      "max-params": "off"
     }
   },
   "remarkConfig": {

test/all.js

@@ -2,7 +2,7 @@ import test from 'tape'
 import {u} from 'unist-builder'
 import {selectAll} from '../index.js'
 
-test('all together now', function (t) {
+test('all together now', (t) => {
   t.deepEqual(
     selectAll(
       'a > b[d]:nth-of-type(odd)',