Refactor code-style

Author: wooorm

lib/any.js

@@ -15,7 +15,7 @@ import {nest} from './nest.js'
 import {pseudo} from './pseudo.js'
 import {test} from './test.js'
 
-var type = zwitch('type', {
+const type = zwitch('type', {
   unknown: unknownType,
   invalid: invalidType,
   handlers: {selectors, ruleSet, rule}
@@ -39,8 +39,8 @@ export function any(query, node, state) {
  * @returns {Array.<Element>}
  */
 function selectors(query, node, state) {
-  var collector = new Collector(state.one)
-  var index = -1
+  const collector = new Collector(state.one)
+  let index = -1
 
   while (++index < query.selectors.length) {
     collector.collectAll(ruleSet(query.selectors[index], node, state))
@@ -66,7 +66,7 @@ function ruleSet(query, node, state) {
  * @returns {Array.<Element>}
  */
 function rule(query, tree, state) {
-  var collector = new Collector(state.one)
+  const collector = new Collector(state.one)
 
   if (state.shallow && query.rule) {
     throw new Error('Expected selector without nesting')
@@ -94,7 +94,7 @@ function rule(query, tree, state) {
 
   /** @type {SelectIterator} */
   function iterator(query, node, index, parent, state) {
-    var exit = enterState(state, node)
+    const exit = enterState(state, node)
 
     if (test(query, node, index, parent, state)) {
       if (query.rule) {
@@ -116,8 +116,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)) {
@@ -164,7 +164,7 @@ class Collector {
    * @param {Array.<Element>} elements
    */
   collectAll(elements) {
-    var index = -1
+    let index = -1
 
     while (++index < elements.length) {
       this.collect(elements[index])

lib/attribute.js

@@ -13,7 +13,7 @@ import {find} from 'property-information'
 import {stringify as spaces} from 'space-separated-tokens'
 import {zwitch} from 'zwitch'
 
-var handle = zwitch('operator', {
+const handle = zwitch('operator', {
   unknown: unknownOperator,
   invalid: exists,
   handlers: {
@@ -33,8 +33,8 @@ var handle = zwitch('operator', {
  * @returns {boolean}
  */
 export function attribute(query, element, schema) {
-  var attrs = query.attrs
-  var index = -1
+  const attrs = query.attrs
+  let index = -1
 
   while (++index < attrs.length) {
     if (!handle(attrs[index], element, find(schema, attrs[index].name))) return
@@ -79,7 +79,7 @@ function exact(query, element, info) {
  * @returns {boolean}
  */
 function spaceSeparatedList(query, element, info) {
-  var value = element.properties[info.property]
+  const value = element.properties[info.property]
 
   return (
     // If this is a comma-separated list, and the query is contained in it, return
@@ -104,7 +104,7 @@ function spaceSeparatedList(query, element, info) {
  * @returns {boolean}
  */
 function exactOrPrefix(query, element, info) {
-  var value = normalizeValue(element.properties[info.property], info)
+  const value = normalizeValue(element.properties[info.property], info)
 
   return (
     hasProperty(element, info.property) &&

lib/class-name.js

@@ -11,8 +11,8 @@
 export function className(query, element) {
   /** @type {Array.<string>} */
   // @ts-ignore Assume array.
-  var value = element.properties.className || []
-  var index = -1
+  const value = element.properties.className || []
+  let index = -1
 
   while (++index < query.classNames.length) {
     if (!value.includes(query.classNames[index])) return

lib/enter-state.js

@@ -20,30 +20,24 @@ import {element} from './util.js'
  */
 // eslint-disable-next-line complexity
 export function enterState(state, node) {
-  var schema = state.schema
-  var language = state.language
-  var currentDirection = state.direction
-  var editableOrEditingHost = state.editableOrEditingHost
+  const schema = state.schema
+  const language = state.language
+  const currentDirection = state.direction
+  const editableOrEditingHost = state.editableOrEditingHost
   /** @type {Direction|null} */
-  var dirInferred
-  /** @type {string} */
-  var type
+  let dirInferred
   /** @type {boolean} */
-  var found
-  /** @type {string} */
-  var lang
-  /** @type {Direction|null} */
-  var dir
+  let found
 
   if (element(node)) {
     // @ts-ignore Assume string.
-    lang = node.properties.xmlLang || node.properties.lang
+    const lang = node.properties.xmlLang || node.properties.lang
     // @ts-ignore Assume string.
-    type = node.properties.type || 'text'
-    dir = dirProperty(node)
+    const type = node.properties.type || 'text'
+    const dir = dirProperty(node)
 
     if (lang !== undefined && lang !== null) {
-      state.language = lang
+      state.language = String(lang)
       found = true
     }
 
@@ -138,7 +132,7 @@ export function enterState(state, node) {
  * @returns {Direction}
  */
 function dirBidi(value) {
-  var result = direction(value)
+  const result = direction(value)
   return result === 'neutral' ? null : result
 }
 
@@ -147,7 +141,7 @@ function dirBidi(value) {
  * @returns {Direction}
  */
 function dirProperty(node) {
-  var value =
+  const value =
     element(node) && typeof node.properties.dir === 'string'
       ? node.properties.dir.toLowerCase()
       : null

lib/nest.js

@@ -12,9 +12,9 @@ import {zwitch} from 'zwitch'
 import {enterState} from './enter-state.js'
 import {parent, element} from './util.js'
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
-var handle = zwitch('nestingOperator', {
+const handle = zwitch('nestingOperator', {
   unknown: unknownNesting,
   invalid: topScan, // `undefined` is the top query selector.
   handlers: {
@@ -53,7 +53,7 @@ function topScan(query, node, index, parent, state) {
 
 /** @type {Handler} */
 function descendant(query, node, index, parent, state) {
-  var previous = state.iterator
+  const previous = state.iterator
 
   state.iterator = iterator
   child(query, node, index, parent, state)
@@ -103,16 +103,14 @@ function generalSibling(query, _, index, parent, state) {
  * @param {boolean} [firstElementOnly=false]
  */
 function indexedSearch(query, parent, state, from, firstElementOnly) {
-  var handle = state.index ? delay : add
-  var children = parent.children
-  var elements = 0
-  var index = -1
+  const handle = state.index ? delay : add
+  const children = parent.children
+  let elements = 0
+  let index = -1
   /** @type {Object.<string, number>} */
-  var types = {}
+  const types = {}
   /** @type {Array.<Function>} */
-  var delayed = []
-  /** @type {Node} */
-  var child
+  const delayed = []
 
   // Start looking at `from`
   if (from === undefined || from === null) from = 0
@@ -123,15 +121,15 @@ function indexedSearch(query, parent, state, from, firstElementOnly) {
   // If we need to index for types, do so for all elements before `from`.
   if (state.index) {
     while (++index < from) {
-      child = children[index]
+      const child = children[index]
       if (element(child)) count(child.tagName)
     }
   }
 
   index = from - 1
 
   while (++index < children.length) {
-    child = children[index]
+    const child = children[index]
     // Only check elements.
     // Check either all elements, or only check the first sibling
     if (element(child)) {
@@ -157,8 +155,8 @@ function indexedSearch(query, parent, state, from, firstElementOnly) {
    * @param {number} childIndex
    */
   function delay(node, childIndex) {
-    var elementsBefore = elements
-    var elementsByTypeBefore = own.call(types, node.tagName)
+    const elementsBefore = elements
+    const elementsByTypeBefore = own.call(types, node.tagName)
       ? types[node.tagName]
       : 0
 
@@ -184,7 +182,7 @@ function indexedSearch(query, parent, state, from, firstElementOnly) {
    * @param {number} childIndex
    */
   function add(node, childIndex) {
-    var exit = enterState(state, node)
+    const exit = enterState(state, node)
     state.iterator(query, node, childIndex, parent, state)
     exit()
   }

lib/parse.js

@@ -13,18 +13,18 @@ import {zwitch} from 'zwitch'
 
 /** @type {import('nth-check').default} */
 // @ts-ignore
-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()
 
-var compile = zwitch('type', {handlers: {selectors, ruleSet, rule}})
+const compile = zwitch('type', {handlers: {selectors, ruleSet, rule}})
 
 parser.registerAttrEqualityMods('~', '|', '^', '$', '*')
 parser.registerSelectorPseudos('any', 'matches', 'not', 'has')
@@ -48,7 +48,7 @@ export function parse(selector) {
  * @returns {Selectors}
  */
 function selectors(query) {
-  var index = -1
+  let index = -1
 
   while (++index < query.selectors.length) {
     compile(query.selectors[index])
@@ -70,13 +70,11 @@ function ruleSet(query) {
  * @returns {Rule}
  */
 function rule(query) {
-  var pseudos = query.pseudos || []
-  var index = -1
-  /** @type {RulePseudo|RulePseudoNth} */
-  var pseudo
+  const pseudos = query.pseudos || []
+  let index = -1
 
   while (++index < pseudos.length) {
-    pseudo = pseudos[index]
+    const pseudo = pseudos[index]
 
     if (nth.has(pseudo.name)) {
       // @ts-ignore Patch a non-primitive type.

lib/pseudo.js

@@ -19,7 +19,7 @@ import {whitespace} from 'hast-util-whitespace'
 import {zwitch} from 'zwitch'
 import {any} from './any.js'
 
-var handle = zwitch('name', {
+const handle = zwitch('name', {
   unknown: unknownPseudo,
   invalid: invalidPseudo,
   handlers: {
@@ -76,8 +76,8 @@ pseudo.needsIndex = [
  * @returns {boolean}
  */
 export function pseudo(query, element, 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], element, index, parent, state)) return
@@ -95,15 +95,13 @@ export function pseudo(query, element, index, parent, state) {
  * @returns {boolean}
  */
 function matches(query, element, _1, _2, state) {
-  var shallow = state.shallow
-  var one = state.one
-  /** @type {boolean} */
-  var result
+  const shallow = state.shallow
+  const one = state.one
 
   state.shallow = true
   state.one = true
 
-  result = any(query.value, element, state)[0] === element
+  const result = any(query.value, element, state)[0] === element
 
   state.shallow = shallow
   state.one = one
@@ -457,8 +455,8 @@ function onlyOfType(query, _1, _2, _3, state) {
  * @returns {boolean}
  */
 function someChildren(element, check) {
-  var children = element.children
-  var index = -1
+  const children = element.children
+  let index = -1
 
   while (++index < children.length) {
     if (check(children[index])) return true
@@ -501,18 +499,16 @@ function assertDeep(state, query) {
  * @returns {boolean}
  */
 function has(query, element, _2, _3, state) {
-  var shallow = state.shallow
-  var one = state.one
-  var scopeElements = state.scopeElements
-  var value = appendScope(query.value)
-  /** @type {boolean} */
-  var result
+  const shallow = state.shallow
+  const one = state.one
+  const scopeElements = state.scopeElements
+  const value = appendScope(query.value)
 
   state.shallow = false
   state.one = true
   state.scopeElements = [element]
 
-  result = any(value, element, state).length > 0
+  const result = any(value, element, state).length > 0
 
   state.shallow = shallow
   state.one = one
@@ -527,14 +523,12 @@ function has(query, element, _2, _3, state) {
  */
 function appendScope(value) {
   /** @type {Selectors} */
-  var selector =
+  const selector =
     value.type === 'ruleSet' ? {type: 'selectors', selectors: [value]} : value
-  var index = -1
-  /** @type {Rule} */
-  var rule
+  let index = -1
 
   while (++index < selector.selectors.length) {
-    rule = selector.selectors[index].rule
+    const rule = selector.selectors[index].rule
     rule.nestingOperator = null
 
     if (