Refactor code-style

Author: wooorm

index.js

@@ -17,11 +17,10 @@ export class Index {
     /** @type {Map.<unknown, Array.<Node>>} */
     this.index = new Map()
     /** @type {KeyFunction} */
-    this.key =
-      typeof prop === 'string' ? (/** @type {Node} */ node) => node[prop] : prop
+    this.key = typeof prop === 'string' ? (node) => node[prop] : prop
 
     if (tree) {
-      visit(tree, test, (/** @type {Node} */ node) => {
+      visit(tree, test, (node) => {
         this.add(node)
       })
     }
@@ -39,15 +38,13 @@ export class Index {
    * @param {Node} node
    */
   add(node) {
-    var key = this.key(node)
-    /** @type {Array.<Node>} */
-    var nodes
+    const key = this.key(node)
 
     if (!this.index.has(key)) {
       this.index.set(key, [])
     }
 
-    nodes = this.index.get(key)
+    const nodes = this.index.get(key)
 
     if (!nodes.includes(node)) {
       nodes.push(node)
@@ -60,9 +57,9 @@ export class Index {
    * @param {Node} node
    */
   remove(node) {
-    var key = this.key(node)
-    var nodes = this.index.get(key)
-    var pos = nodes ? nodes.indexOf(node) : -1
+    const key = this.key(node)
+    const nodes = this.index.get(key)
+    const pos = nodes ? nodes.indexOf(node) : -1
 
     if (pos !== -1) {
       nodes.splice(pos, 1)

package.json

@@ -75,11 +75,7 @@
     "trailingComma": "none"
   },
   "xo": {
-    "prettier": true,
-    "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off"
-    }
+    "prettier": true
   },
   "remarkConfig": {
     "plugins": [

readme.md

@@ -25,23 +25,23 @@ npm install unist-util-index
 ## Use
 
 ```js
-import fs from 'fs'
-import remark from 'remark'
-import toString from 'mdast-util-to-string'
+import fs from 'node:fs'
+import {remark} from 'remark'
+import {toString} from 'mdast-util-to-string'
 import {Index} from 'unist-util-index'
 
 // Parse and read this repo’s readme:
-var tree = remark.parse(fs.readFileSync('readme.md'))
+const tree = remark.parse(fs.readFileSync('readme.md'))
 
 // Index on heading depth:
-var index = new Index('depth', tree, 'heading')
+const indexOnDepth = new Index('depth', tree, 'heading')
 
-console.log(index.get(2).map(toString))
+console.log(indexOnDepth.get(2).map(toString))
 
 // Index on definition identifier:
-index = new Index('identifier', tree, 'definition')
+const indexOnIdentifier = new Index('identifier', tree, 'definition')
 
-console.log(index.get('unist').map(node => node.url))
+console.log(indexOnIdentifier.get('unist').map(node => node.url))
 ```
 
 Yields:

test.js

@@ -9,11 +9,11 @@ import {u} from 'unist-builder'
 import {select} from 'unist-util-select'
 import {Index} from './index.js'
 
-test('Index', function (t) {
-  var node = {type: 'a', id: 1}
-  var alt = {type: 'b', id: 1}
-  var tree = {type: 'root', children: [node, alt]}
-  var instance = new Index('id')
+test('Index', (t) => {
+  const node = {type: 'a', id: 1}
+  const alt = {type: 'b', id: 1}
+  const tree = {type: 'root', children: [node, alt]}
+  let instance = new Index('id')
   instance.add(node)
 
   t.deepEqual(
@@ -55,14 +55,14 @@ test('Index', function (t) {
   t.end()
 })
 
-test('index.add', function (t) {
-  var ast = u('root', [u('node', {word: 'foo'}), u('node', {word: 'bar'})])
-  var extraNode = u('node', {word: 'foo'})
+test('index.add', (t) => {
+  const ast = u('root', [u('node', {word: 'foo'}), u('node', {word: 'bar'})])
+  const extraNode = u('node', {word: 'foo'})
 
-  var index = new Index('word', ast)
+  const index = new Index('word', ast)
   t.deepEqual(index.get('foo'), [select('[word=foo]', ast)])
 
-  var result = index.add(extraNode)
+  const result = index.add(extraNode)
   t.deepEqual(index.get('foo'), [select('[word=foo]', ast), extraNode])
 
   t.equal(result, index, 'returns this')
@@ -76,9 +76,9 @@ test('index.add', function (t) {
   t.end()
 })
 
-test('index.get', function (t) {
-  t.test('get', function (st) {
-    var ast = u('node', {color: 'black', id: 0}, [
+test('index.get', (t) => {
+  t.test('get', (st) => {
+    const ast = u('node', {color: 'black', id: 0}, [
       u('node', {color: 'black', id: 1}, [
         u('node', {color: 'red', id: 2}, [
           u('node', {color: 'black', id: 3}),
@@ -101,7 +101,7 @@ test('index.get', function (t) {
       ])
     ])
 
-    var index = new Index('color', ast)
+    const index = new Index('color', ast)
 
     st.deepEqual(index.get('black'), [
       select('[id=0]', ast),
@@ -129,32 +129,32 @@ test('index.get', function (t) {
     st.end()
   })
 
-  t.test('degenerate keys', function (st) {
-    st.test('Object.prototype keys', function (sst) {
-      var ast = u('node', {word: '__proto__', id: 0}, [
+  t.test('degenerate keys', (st) => {
+    st.test('Object.prototype keys', (sst) => {
+      const ast = u('node', {word: '__proto__', id: 0}, [
         u('node', {word: 'constructor', id: 1}),
         u('node', {word: 'toString', id: 2})
       ])
-      var index = new Index('word', ast)
+      const index = new Index('word', ast)
 
       sst.deepEqual(index.get('__proto__'), [select('[id=0]', ast)])
       sst.deepEqual(index.get('constructor'), [select('[id=1]', ast)])
       sst.deepEqual(index.get('toString'), [select('[id=2]', ast)])
       sst.end()
     })
 
-    st.test('identity keys', function (sst) {
-      var id1 = {foo: 'bar'}
-      var id2 = {foo: 'bar'}
-      var ast = u('root', [
+    st.test('identity keys', (sst) => {
+      const id1 = {foo: 'bar'}
+      const id2 = {foo: 'bar'}
+      const ast = u('root', [
         u('node', {word: false, id: 0}),
         u('node', {word: 'false', id: 1}),
         u('node', {word: 1, id: 2}),
         u('node', {word: '1', id: 3}),
         u('node', {word: id1, id: 4}),
         u('node', {word: id2, id: 5})
       ])
-      var index = new Index('word', ast)
+      const index = new Index('word', ast)
 
       sst.deepEqual(index.get(false), [select('[id=0]', ast)])
       sst.deepEqual(index.get('false'), [select('[id=1]', ast)])
@@ -169,29 +169,29 @@ test('index.get', function (t) {
     st.end()
   })
 
-  t.test('empty index', function (st) {
+  t.test('empty index', (st) => {
     st.deepEqual(new Index('foo', null).get('bar'), [])
     st.deepEqual(new Index('foo').get('bar'), [])
     st.end()
   })
 
-  t.test('Index filter', function (st) {
-    var ast = u('root', [
+  t.test('Index filter', (st) => {
+    const ast = u('root', [
       u('node', {word: 'foo'}),
       u('node', {word: 'bar'}),
       u('skip', {word: 'foo'}),
       u('skip', {word: 'bar'})
     ])
 
-    st.test('type test', function (sst) {
-      var index = new Index('word', ast, 'node')
+    st.test('type test', (sst) => {
+      const index = new Index('word', ast, 'node')
       sst.deepEqual(index.get('foo'), [select('node[word="foo"]', ast)])
       sst.deepEqual(index.get('bar'), [select('node[word="bar"]', ast)])
       sst.end()
     })
 
-    st.test('function test', function (sst) {
-      var index = new Index('word', ast, filter)
+    st.test('function test', (sst) => {
+      const index = new Index('word', ast, filter)
       sst.deepEqual(index.get('foo'), [select('node[word="foo"]', ast)])
       sst.deepEqual(index.get('bar'), [select('node[word="bar"]', ast)])
       sst.end()
@@ -209,19 +209,19 @@ test('index.get', function (t) {
     st.end()
   })
 
-  t.test('computed keys', function (st) {
+  t.test('computed keys', (st) => {
     /**
      * @typedef {{x: number, y: number, z: number}} FunkyNode
      */
 
-    var ast = u('root', {x: 0, y: 4, id: 0}, [
+    const ast = u('root', {x: 0, y: 4, id: 0}, [
       u('node', {x: 3, y: 2, id: 1}),
       u('node', {x: 2, y: 2, id: 2}),
       u('node', {x: 3, y: 1, id: 3}),
       u('node', {x: 4, y: 1, id: 4})
     ])
     // @ts-ignore it’s fine
-    var index = new Index(xPlusY, ast)
+    const index = new Index(xPlusY, ast)
     st.deepEqual(index.get(4), [
       select('[id=0]', ast),
       select('[id=2]', ast),
@@ -249,20 +249,20 @@ test('index.get', function (t) {
   t.end()
 })
 
-test('index.remove', function (t) {
-  var ast = u('root', [
+test('index.remove', (t) => {
+  const ast = u('root', [
     u('bad', {word: 'foo'}),
     u('node', {word: 'foo'}),
     u('node', {word: 'bar'})
   ])
 
-  var index = new Index('word', ast)
+  const index = new Index('word', ast)
   t.deepEqual(index.get('foo'), [
     select('bad[word=foo]', ast),
     select('node[word=foo]', ast)
   ])
 
-  var result = index.remove(select('bad', ast))
+  const result = index.remove(select('bad', ast))
   t.deepEqual(index.get('foo'), [select('node[word=foo]', ast)])
 
   t.equal(result, index, 'returns this')