Refactor code-style

Author: wooorm

lib/configure.js

@@ -1,6 +1,6 @@
 export function configure(base, extension) {
-  var index = -1
-  var key
+  let index = -1
+  let key
 
   // First do subextensions.
   if (extension.extensions) {

lib/handle/blockquote.js

@@ -2,8 +2,8 @@ import {containerFlow} from '../util/container-flow.js'
 import {indentLines} from '../util/indent-lines.js'
 
 export function blockquote(node, _, context) {
-  var exit = context.enter('blockquote')
-  var value = indentLines(containerFlow(node, context), map)
+  const exit = context.enter('blockquote')
+  const value = indentLines(containerFlow(node, context), map)
   exit()
   return value
 }

lib/handle/break.js

@@ -1,7 +1,7 @@
 import {patternInScope} from '../util/pattern-in-scope.js'
 
 export function hardBreak(node, _, context, safe) {
-  var index = -1
+  let index = -1
 
   while (++index < context.unsafe.length) {
     // If we can’t put eols in this construct (setext headings, tables), use a

lib/handle/code.js

@@ -6,19 +6,18 @@ import {indentLines} from '../util/indent-lines.js'
 import {safe} from '../util/safe.js'
 
 export function code(node, _, context) {
-  var marker = checkFence(context)
-  var raw = node.value || ''
-  var suffix = marker === '`' ? 'GraveAccent' : 'Tilde'
-  var value
-  var sequence
-  var exit
-  var subexit
+  const marker = checkFence(context)
+  const raw = node.value || ''
+  const suffix = marker === '`' ? 'GraveAccent' : 'Tilde'
+  let value
+  let exit
 
   if (formatCodeAsIndented(node, context)) {
     exit = context.enter('codeIndented')
     value = indentLines(raw, map)
   } else {
-    sequence = repeat(marker, Math.max(longestStreak(raw, marker) + 1, 3))
+    const sequence = repeat(marker, Math.max(longestStreak(raw, marker) + 1, 3))
+    let subexit
     exit = context.enter('codeFenced')
     value = sequence
 

lib/handle/definition.js

@@ -3,11 +3,11 @@ import {checkQuote} from '../util/check-quote.js'
 import {safe} from '../util/safe.js'
 
 export function definition(node, _, context) {
-  var marker = checkQuote(context)
-  var suffix = marker === '"' ? 'Quote' : 'Apostrophe'
-  var exit = context.enter('definition')
-  var subexit = context.enter('label')
-  var value =
+  const marker = checkQuote(context)
+  const suffix = marker === '"' ? 'Quote' : 'Apostrophe'
+  const exit = context.enter('definition')
+  let subexit = context.enter('label')
+  let value =
     '[' + safe(context, association(node), {before: '[', after: ']'}) + ']: '
 
   subexit()

lib/handle/emphasis.js

@@ -8,9 +8,12 @@ emphasis.peek = emphasisPeek
 // There’s no way around that though, except for injecting zero-width stuff.
 // Do we need to safeguard against that?
 export function emphasis(node, _, context) {
-  var marker = checkEmphasis(context)
-  var exit = context.enter('emphasis')
-  var value = containerPhrasing(node, context, {before: marker, after: marker})
+  const marker = checkEmphasis(context)
+  const exit = context.enter('emphasis')
+  const value = containerPhrasing(node, context, {
+    before: marker,
+    after: marker
+  })
   exit()
   return marker + value + marker
 }

lib/handle/heading.js

@@ -3,11 +3,10 @@ import {formatHeadingAsSetext} from '../util/format-heading-as-setext.js'
 import {containerPhrasing} from '../util/container-phrasing.js'
 
 export function heading(node, _, context) {
-  var rank = Math.max(Math.min(6, node.depth || 1), 1)
-  var exit
-  var subexit
-  var value
-  var sequence
+  const rank = Math.max(Math.min(6, node.depth || 1), 1)
+  let exit
+  let subexit
+  let value
 
   if (formatHeadingAsSetext(node, context)) {
     exit = context.enter('headingSetext')
@@ -30,7 +29,7 @@ export function heading(node, _, context) {
     )
   }
 
-  sequence = repeat('#', rank)
+  const sequence = repeat('#', rank)
   exit = context.enter('headingAtx')
   subexit = context.enter('phrasing')
   value = containerPhrasing(node, context, {before: '# ', after: '\n'})

lib/handle/image-reference.js

@@ -4,20 +4,18 @@ import {safe} from '../util/safe.js'
 imageReference.peek = imageReferencePeek
 
 export function imageReference(node, _, context) {
-  var type = node.referenceType
-  var exit = context.enter('imageReference')
-  var subexit = context.enter('label')
-  var alt = safe(context, node.alt, {before: '[', after: ']'})
-  var value = '![' + alt + ']'
-  var reference
-  var stack
+  const type = node.referenceType
+  const exit = context.enter('imageReference')
+  let subexit = context.enter('label')
+  const alt = safe(context, node.alt, {before: '[', after: ']'})
+  let value = '![' + alt + ']'
 
   subexit()
   // Hide the fact that we’re in phrasing, because escapes don’t work.
-  stack = context.stack
+  const stack = context.stack
   context.stack = []
   subexit = context.enter('reference')
-  reference = safe(context, association(node), {before: '[', after: ']'})
+  const reference = safe(context, association(node), {before: '[', after: ']'})
   subexit()
   context.stack = stack
   exit()

lib/handle/image.js

@@ -4,11 +4,11 @@ import {safe} from '../util/safe.js'
 image.peek = imagePeek
 
 export function image(node, _, context) {
-  var quote = checkQuote(context)
-  var suffix = quote === '"' ? 'Quote' : 'Apostrophe'
-  var exit = context.enter('image')
-  var subexit = context.enter('label')
-  var value = '![' + safe(context, node.alt, {before: '[', after: ']'}) + ']('
+  const quote = checkQuote(context)
+  const suffix = quote === '"' ? 'Quote' : 'Apostrophe'
+  const exit = context.enter('image')
+  let subexit = context.enter('label')
+  let value = '![' + safe(context, node.alt, {before: '[', after: ']'}) + ']('
 
   subexit()
 

lib/handle/inline-code.js

@@ -3,13 +3,9 @@ import {patternCompile} from '../util/pattern-compile.js'
 inlineCode.peek = inlineCodePeek
 
 export function inlineCode(node, parent, context) {
-  var value = node.value || ''
-  var sequence = '`'
-  var index = -1
-  var pattern
-  var expression
-  var match
-  var position
+  let value = node.value || ''
+  let sequence = '`'
+  let index = -1
 
   // If there is a single grave accent on its own in the code, use a fence of
   // two.
@@ -36,17 +32,17 @@ export function inlineCode(node, parent, context) {
   // transformed to spaces when going from markdown to HTML anyway, we can swap
   // them out.
   while (++index < context.unsafe.length) {
-    pattern = context.unsafe[index]
+    const pattern = context.unsafe[index]
+    const expression = patternCompile(pattern)
+    let match
 
     // Only look for `atBreak`s.
     // Btw: note that `atBreak` patterns will always start the regex at LF or
     // CR.
     if (!pattern.atBreak) continue
 
-    expression = patternCompile(pattern)
-
     while ((match = expression.exec(value))) {
-      position = match.index
+      let position = match.index
 
       // Support CRLF (patterns only look for one of the characters).
       if (

lib/handle/link-reference.js

@@ -5,20 +5,18 @@ import {safe} from '../util/safe.js'
 linkReference.peek = linkReferencePeek
 
 export function linkReference(node, _, context) {
-  var type = node.referenceType
-  var exit = context.enter('linkReference')
-  var subexit = context.enter('label')
-  var text = containerPhrasing(node, context, {before: '[', after: ']'})
-  var value = '[' + text + ']'
-  var reference
-  var stack
+  const type = node.referenceType
+  const exit = context.enter('linkReference')
+  let subexit = context.enter('label')
+  const text = containerPhrasing(node, context, {before: '[', after: ']'})
+  let value = '[' + text + ']'
 
   subexit()
   // Hide the fact that we’re in phrasing, because escapes don’t work.
-  stack = context.stack
+  const stack = context.stack
   context.stack = []
   subexit = context.enter('reference')
-  reference = safe(context, association(node), {before: '[', after: ']'})
+  const reference = safe(context, association(node), {before: '[', after: ']'})
   subexit()
   context.stack = stack
   exit()

lib/handle/link.js

@@ -6,16 +6,15 @@ import {safe} from '../util/safe.js'
 link.peek = linkPeek
 
 export function link(node, _, context) {
-  var quote = checkQuote(context)
-  var suffix = quote === '"' ? 'Quote' : 'Apostrophe'
-  var exit
-  var subexit
-  var value
-  var stack
+  const quote = checkQuote(context)
+  const suffix = quote === '"' ? 'Quote' : 'Apostrophe'
+  let exit
+  let subexit
+  let value
 
   if (formatLinkAsAutolink(node, context)) {
     // Hide the fact that we’re in phrasing, because escapes don’t work.
-    stack = context.stack
+    const stack = context.stack
     context.stack = []
     exit = context.enter('autolink')
     value =

lib/handle/list-item.js

@@ -5,11 +5,8 @@ import {containerFlow} from '../util/container-flow.js'
 import {indentLines} from '../util/indent-lines.js'
 
 export function listItem(node, parent, context) {
-  var bullet = checkBullet(context)
-  var listItemIndent = checkListItemIndent(context)
-  var size
-  var value
-  var exit
+  const listItemIndent = checkListItemIndent(context)
+  let bullet = checkBullet(context)
 
   if (parent && parent.ordered) {
     bullet =
@@ -20,7 +17,7 @@ export function listItem(node, parent, context) {
       '.'
   }
 
-  size = bullet.length + 1
+  let size = bullet.length + 1
 
   if (
     listItemIndent === 'tab' ||
@@ -29,8 +26,8 @@ export function listItem(node, parent, context) {
     size = Math.ceil(size / 4) * 4
   }
 
-  exit = context.enter('listItem')
-  value = indentLines(containerFlow(node, context), map)
+  const exit = context.enter('listItem')
+  const value = indentLines(containerFlow(node, context), map)
   exit()
 
   return value

lib/handle/list.js

@@ -1,8 +1,8 @@
 import {containerFlow} from '../util/container-flow.js'
 
 export function list(node, _, context) {
-  var exit = context.enter('list')
-  var value = containerFlow(node, context)
+  const exit = context.enter('list')
+  const value = containerFlow(node, context)
   exit()
   return value
 }

lib/handle/paragraph.js

@@ -1,9 +1,9 @@
 import {containerPhrasing} from '../util/container-phrasing.js'
 
 export function paragraph(node, _, context) {
-  var exit = context.enter('paragraph')
-  var subexit = context.enter('phrasing')
-  var value = containerPhrasing(node, context, {before: '\n', after: '\n'})
+  const exit = context.enter('paragraph')
+  const subexit = context.enter('phrasing')
+  const value = containerPhrasing(node, context, {before: '\n', after: '\n'})
   subexit()
   exit()
   return value

lib/handle/strong.js

@@ -8,9 +8,12 @@ strong.peek = strongPeek
 // There’s no way around that though, except for injecting zero-width stuff.
 // Do we need to safeguard against that?
 export function strong(node, _, context) {
-  var marker = checkStrong(context)
-  var exit = context.enter('strong')
-  var value = containerPhrasing(node, context, {before: marker, after: marker})
+  const marker = checkStrong(context)
+  const exit = context.enter('strong')
+  const value = containerPhrasing(node, context, {
+    before: marker,
+    after: marker
+  })
   exit()
   return marker + marker + value + marker + marker
 }

lib/handle/thematic-break.js

@@ -3,7 +3,7 @@ import {checkRuleRepeat} from '../util/check-rule-repeat.js'
 import {checkRule} from '../util/check-rule.js'
 
 export function thematicBreak(node, parent, context) {
-  var value = repeat(
+  const value = repeat(
     checkRule(context) + (context.options.ruleSpaces ? ' ' : ''),
     checkRuleRepeat(context)
   )

lib/index.js

@@ -1,27 +1,21 @@
 import {zwitch} from 'zwitch'
 import {configure} from './configure.js'
-import {handle as defaultHandle} from './handle/index.js'
-import {join as defaultJoin} from './join.js'
-import {unsafe as defaultUnsafe} from './unsafe.js'
+import {handle} from './handle/index.js'
+import {join} from './join.js'
+import {unsafe} from './unsafe.js'
 
-export function toMarkdown(tree, options) {
-  var settings = options || {}
-  var context = {
+export function toMarkdown(tree, options = {}) {
+  const context = {
     enter,
     stack: [],
     unsafe: [],
     join: [],
     handlers: {},
     options: {}
   }
-  var result
 
-  configure(context, {
-    unsafe: defaultUnsafe,
-    join: defaultJoin,
-    handlers: defaultHandle
-  })
-  configure(context, settings)
+  configure(context, {unsafe, join, handlers: handle})
+  configure(context, options)
 
   if (context.options.tightDefinitions) {
     context.join = [joinDefinition].concat(context.join)
@@ -33,7 +27,7 @@ export function toMarkdown(tree, options) {
     handlers: context.handlers
   })
 
-  result = context.handle(tree, null, context, {before: '\n', after: '\n'})
+  let result = context.handle(tree, null, context, {before: '\n', after: '\n'})
 
   if (
     result &&

lib/util/association.js

@@ -1,7 +1,7 @@
 import {decodeEntity} from 'parse-entities/decode-entity.js'
 
-var characterEscape = /\\([!-/:-@[-`{-~])/g
-var characterReference = /&(#(\d{1,7}|x[\da-f]{1,6})|[\da-z]{1,31});/gi
+const characterEscape = /\\([!-/:-@[-`{-~])/g
+const characterReference = /&(#(\d{1,7}|x[\da-f]{1,6})|[\da-z]{1,31});/gi
 
 // The `label` of an association is the string value: character escapes and
 // references work, and casing is intact.

lib/util/check-bullet.js

@@ -1,5 +1,5 @@
 export function checkBullet(context) {
-  var marker = context.options.bullet || '*'
+  const marker = context.options.bullet || '*'
 
   if (marker !== '*' && marker !== '+' && marker !== '-') {
     throw new Error(

lib/util/check-emphasis.js

@@ -1,5 +1,5 @@
 export function checkEmphasis(context) {
-  var marker = context.options.emphasis || '*'
+  const marker = context.options.emphasis || '*'
 
   if (marker !== '*' && marker !== '_') {
     throw new Error(