Refactor code-style

Author: wooorm

index.js

@@ -5,7 +5,7 @@
 
 import {toString} from 'nlcst-to-string'
 
-var single = [
+const single = [
   '-', // Hyphen-minus
   '–', // En dash
   '—', // Em dash
@@ -16,7 +16,7 @@ var single = [
 // Pair delimiters.
 // From common sense, and WikiPedia:
 // <https://en.wikipedia.org/wiki/Quotation_mark>.
-var pairs = {
+const pairs = {
   ',': [','],
   '-': ['-'],
   '–': ['–'],
@@ -40,7 +40,7 @@ var pairs = {
   '「': ['」']
 }
 
-var open = Object.keys(pairs)
+const open = Object.keys(pairs)
 
 /**
  * Check if the node in `parent` at `position` is enclosed by matching
@@ -84,7 +84,7 @@ export function isLiteral(parent, index) {
  * @returns {Node|void}
  */
 function isWrapped(parent, position) {
-  var previous = siblingDelimiter(parent, position, -1, open)
+  const previous = siblingDelimiter(parent, position, -1, open)
 
   if (previous) {
     return siblingDelimiter(parent, position, 1, pairs[toString(previous)])
@@ -102,12 +102,10 @@ function isWrapped(parent, position) {
  * @returns {Node|void}
  */
 function siblingDelimiter(parent, position, step, delimiters) {
-  var index = position + step
-  /** @type {Node} */
-  var sibling
+  let index = position + step
 
   while (index > -1 && index < parent.children.length) {
-    sibling = parent.children[index]
+    const sibling = parent.children[index]
 
     if (sibling.type === 'WordNode' || sibling.type === 'SourceNode') {
       return

package.json

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

readme.md

@@ -44,18 +44,16 @@ The word — quux — is meant as a literal.
 And our script, `example.js`, looks as follows:
 
 ```js
-import vfile from 'to-vfile'
-import unified from 'unified'
-import english from 'retext-english'
+import {readSync} from 'to-vfile'
+import {unified} from 'unified'
+import retextEnglish from 'retext-english'
 import {visit} from 'unist-util-visit'
 import {toString} from 'nlcst-to-string'
 import {isLiteral} from 'nlcst-is-literal'
 
-var file = vfile.readSync('example.txt')
+const file = readSync('example.txt')
 
-var tree = unified()
-  .use(english)
-  .parse(file)
+const tree = unified().use(retextEnglish).parse(file)
 
 visit(tree, 'WordNode', visitor)
 

test.js

@@ -10,9 +10,9 @@ import retext from 'retext'
 import {visit} from 'unist-util-visit'
 import {isLiteral} from './index.js'
 
-test('isLiteral()', function (t) {
+test('isLiteral()', (t) => {
   t.throws(
-    function () {
+    () => {
       // @ts-ignore runtime.
       isLiteral()
     },
@@ -21,7 +21,7 @@ test('isLiteral()', function (t) {
   )
 
   t.throws(
-    function () {
+    () => {
       // @ts-ignore runtime.
       isLiteral({})
     },
@@ -30,7 +30,7 @@ test('isLiteral()', function (t) {
   )
 
   t.throws(
-    function () {
+    () => {
       // @ts-ignore runtime.
       isLiteral({children: []})
     },
@@ -39,31 +39,31 @@ test('isLiteral()', function (t) {
   )
 
   t.throws(
-    function () {
+    () => {
       // @ts-ignore runtime.
       isLiteral({children: []}, {type: 'a'})
     },
     /Node must be a child of `parent`/,
     'should throw if `node` is not in `parent`'
   )
 
-  t.doesNotThrow(function () {
-    var n = {type: 'a'}
+  t.doesNotThrow(() => {
+    const n = {type: 'a'}
     // @ts-ignore runtime.
     isLiteral({children: [n]}, n)
   }, 'should not throw if `node` is in `parent`')
 
-  t.doesNotThrow(function () {
+  t.doesNotThrow(() => {
     process(
       'Well? Ha! Funky',
-      /** @type {Visitor} */ function (_, index, parent) {
+      /** @type {Visitor} */ (_, index, parent) => {
         assert.strictEqual(isLiteral(parent, index), false)
       }
     )
   }, 'should work on single word sentences')
 
-  t.doesNotThrow(function () {
-    var fixtures = [
+  t.doesNotThrow(() => {
+    const fixtures = [
       'Foo - is meant as a literal.',
       'Foo – is meant as a literal.',
       'Foo — is meant as a literal.',
@@ -74,12 +74,12 @@ test('isLiteral()', function (t) {
       'Foo: is meant as a literal.',
       'Foo; is meant as a literal.'
     ]
-    var index = -1
+    let index = -1
 
     while (++index < fixtures.length) {
       process(
         fixtures[index],
-        /** @type {Visitor} */ function (_, index, parent) {
+        /** @type {Visitor} */ (_, index, parent) => {
           assert.strictEqual(
             isLiteral(parent, index),
             index === 0,
@@ -90,8 +90,8 @@ test('isLiteral()', function (t) {
     }
   }, 'Initial')
 
-  t.doesNotThrow(function () {
-    var fixtures = [
+  t.doesNotThrow(() => {
+    const fixtures = [
       'Meant as a literal is - foo.',
       'Meant as a literal is – foo.',
       'Meant as a literal is — foo.',
@@ -102,12 +102,12 @@ test('isLiteral()', function (t) {
       'Meant as a literal is: foo.',
       'Meant as a literal is; foo.'
     ]
-    var index = -1
+    let index = -1
 
     while (++index < fixtures.length) {
       process(
         fixtures[index],
-        /** @type {Visitor} */ function (_, index, parent) {
+        /** @type {Visitor} */ (_, index, parent) => {
           assert.strictEqual(
             isLiteral(parent, index),
             index === parent.children.length - 2,
@@ -118,8 +118,8 @@ test('isLiteral()', function (t) {
     }
   }, 'Final')
 
-  t.doesNotThrow(function () {
-    var fixtures = [
+  t.doesNotThrow(() => {
+    const fixtures = [
       'The word, foo, is meant as a literal.',
       'The word -foo- is meant as a literal.',
       'The word –foo– is meant as a literal.',
@@ -147,13 +147,13 @@ test('isLiteral()', function (t) {
       'The word ⟨foo⟩ is meant as a literal.',
       'The word 「foo」 is meant as a literal.'
     ]
-    var index = -1
+    let index = -1
 
     while (++index < fixtures.length) {
       process(
         fixtures[index],
-        /** @type {Visitor} */ function (_, place, parent) {
-          var pos = 5
+        /** @type {Visitor} */ (_, place, parent) => {
+          let pos = 5
 
           // Adjacent hyphens are part of the word.
           if (index === 1) {