Refactor code-style

Author: wooorm

index.js

@@ -3,8 +3,8 @@ import {findAndReplace} from 'mdast-util-find-and-replace'
 import unicodePunctuation from 'micromark/dist/character/unicode-punctuation.js'
 import unicodeWhitespace from 'micromark/dist/character/unicode-whitespace.js'
 
-var inConstruct = 'phrasing'
-var notInConstruct = ['autolink', 'link', 'image', 'label']
+const inConstruct = 'phrasing'
+const notInConstruct = ['autolink', 'link', 'image', 'label']
 
 export const gfmAutolinkLiteralFromMarkdown = {
   transforms: [transformGfmAutolinkLiterals],
@@ -78,10 +78,9 @@ function transformGfmAutolinkLiterals(tree) {
   )
 }
 
+// eslint-disable-next-line max-params
 function findUrl($0, protocol, domain, path, match) {
-  var prefix = ''
-  var parts
-  var result
+  let prefix = ''
 
   // Not an expected previous character.
   if (!previous(match)) {
@@ -99,11 +98,11 @@ function findUrl($0, protocol, domain, path, match) {
     return false
   }
 
-  parts = splitUrl(domain + path)
+  const parts = splitUrl(domain + path)
 
   if (!parts[0]) return false
 
-  result = {
+  let result = {
     type: 'link',
     title: null,
     url: prefix + protocol + parts[0],
@@ -132,7 +131,7 @@ function findEmail($0, atext, label, match) {
 }
 
 function isCorrectDomain(domain) {
-  var parts = domain.split('.')
+  const parts = domain.split('.')
 
   if (
     parts.length < 2 ||
@@ -150,10 +149,10 @@ function isCorrectDomain(domain) {
 }
 
 function splitUrl(url) {
-  var trail = /[!"&'),.:;<>?\]}]+$/.exec(url)
-  var closingParenIndex
-  var openingParens
-  var closingParens
+  let trail = /[!"&'),.:;<>?\]}]+$/.exec(url)
+  let closingParenIndex
+  let openingParens
+  let closingParens
 
   if (trail) {
     url = url.slice(0, trail.index)
@@ -174,9 +173,11 @@ function splitUrl(url) {
 }
 
 function previous(match, email) {
-  var code = match.input.charCodeAt(match.index - 1)
+  const code = match.input.charCodeAt(match.index - 1)
   return (
-    (code !== code || unicodeWhitespace(code) || unicodePunctuation(code)) &&
+    (match.index === 0 ||
+      unicodeWhitespace(code) ||
+      unicodePunctuation(code)) &&
     (!email || code !== 47)
   )
 }

package.json

@@ -68,17 +68,7 @@
     "trailingComma": "none"
   },
   "xo": {
-    "prettier": true,
-    "prettier": true,
-    "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off",
-      "max-params": "off",
-      "no-self-compare": "off",
-      "unicorn/no-array-for-each": "off",
-      "unicorn/prefer-includes": "off",
-      "unicorn/prefer-optional-catch-binding": "off"
-    }
+    "prettier": true
   },
   "remarkConfig": {
     "plugins": [

test/index.js

@@ -11,7 +11,7 @@ import {
   gfmAutolinkLiteralToMarkdown
 } from '../index.js'
 
-test('markdown -> mdast', function (t) {
+test('markdown -> mdast', (t) => {
   t.deepEqual(
     fromMarkdown(
       'www.example.com, https://example.com, and contact@example.com.',
@@ -170,7 +170,7 @@ test('markdown -> mdast', function (t) {
   t.end()
 })
 
-test('mdast -> markdown', function (t) {
+test('mdast -> markdown', (t) => {
   t.deepEqual(
     toMarkdown(
       {
@@ -363,28 +363,30 @@ test('mdast -> markdown', function (t) {
     'should not escape colons in image (resource) labels'
   )
 
-  fs.readdirSync('test')
-    .filter((d) => path.extname(d) === '.md')
-    .forEach((d) => {
-      var stem = path.basename(d, '.md')
-      var actual = toHtml(
-        toHast(
-          fromMarkdown(fs.readFileSync(path.join('test', d)), {
-            extensions: [gfmAutolinkLiteral],
-            mdastExtensions: [gfmAutolinkLiteralFromMarkdown]
-          }),
-          {allowDangerousHtml: true}
-        ),
-        {allowDangerousHtml: true, entities: {useNamedReferences: true}}
-      )
-      var expected = String(fs.readFileSync(path.join('test', stem + '.html')))
+  const files = fs.readdirSync('test').filter((d) => path.extname(d) === '.md')
+  let index = -1
 
-      if (actual.charCodeAt(actual.length - 1) !== 10) {
-        actual += '\n'
-      }
+  while (++index < files.length) {
+    const d = files[index]
+    const stem = path.basename(d, '.md')
+    let actual = toHtml(
+      toHast(
+        fromMarkdown(fs.readFileSync(path.join('test', d)), {
+          extensions: [gfmAutolinkLiteral],
+          mdastExtensions: [gfmAutolinkLiteralFromMarkdown]
+        }),
+        {allowDangerousHtml: true}
+      ),
+      {allowDangerousHtml: true, entities: {useNamedReferences: true}}
+    )
+    const expected = String(fs.readFileSync(path.join('test', stem + '.html')))
+
+    if (actual.charCodeAt(actual.length - 1) !== 10) {
+      actual += '\n'
+    }
 
-      t.deepEqual(actual, expected, stem)
-    })
+    t.deepEqual(actual, expected, stem)
+  }
 
   t.end()
 })