Refactor code-style

Author: wooorm

index.js

@@ -23,24 +23,22 @@ import {own} from './lib/util/own.js'
 export {one} from './lib/one.js'
 export {all} from './lib/all.js'
 
-var block = convert(['heading', 'paragraph', 'root'])
+const block = convert(['heading', 'paragraph', 'root'])
 
 /**
  * @param {Node} tree
  * @param {Options} [options]
  */
 export function toMdast(tree, options = {}) {
   /** @type {Object.<string, Element>} */
-  var byId = {}
-  /** @type {MdastNode|Array.<MdastNode>|void} */
-  var result
+  const byId = {}
   /** @type {MdastNode|MdastRoot} */
-  var mdast
+  let mdast
 
   /**
    * @type {H}
    */
-  var h = Object.assign(
+  const h = Object.assign(
     /**
      * @type {HWithProps & HWithoutProps}
      */
@@ -51,11 +49,9 @@ export function toMdast(tree, options = {}) {
        * @param {Properties|string|Array.<Node>} [props]
        * @param {string|Array.<Node>} [children]
        */
-      function (node, type, props, children) {
-        /** @type {Node} */
-        var result
+      (node, type, props, children) => {
         /** @type {Properties} */
-        var properties
+        let properties
 
         if (typeof props === 'string' || Array.isArray(props)) {
           children = props
@@ -64,8 +60,9 @@ export function toMdast(tree, options = {}) {
           properties = props
         }
 
+        /** @type {Node} */
         // @ts-ignore Assume valid `type` and `children`/`value`.
-        result = {type, ...properties}
+        const result = {type, ...properties}
 
         if (typeof children === 'string') {
           result.value = children
@@ -101,7 +98,7 @@ export function toMdast(tree, options = {}) {
 
   minifyWhitespace({newlines: options.newlines === true})(tree)
 
-  result = one(h, tree, null)
+  const result = one(h, tree, null)
 
   if (!result) {
     mdast = {type: 'root', children: []}
@@ -117,7 +114,8 @@ export function toMdast(tree, options = {}) {
 
   /** @type {import('unist-util-visit').Visitor<Element>} */
   function onelement(node) {
-    var id = hasProperty(node, 'id') && String(node.properties.id).toUpperCase()
+    const id =
+      hasProperty(node, 'id') && String(node.properties.id).toUpperCase()
 
     if (id && !own.call(byId, id)) {
       byId[id] = node
@@ -134,7 +132,7 @@ export function toMdast(tree, options = {}) {
    * @type {import('unist-util-visit').Visitor<Text>}
    */
   function ontext(node, index, parent) {
-    var previous = parent.children[index - 1]
+    const previous = parent.children[index - 1]
 
     if (previous && node.type === previous.type) {
       previous.value += node.value

lib/all.js

@@ -16,12 +16,12 @@ import {one} from './one.js'
 export function all(h, parent) {
   /** @type {Array.<Node>} */
   // @ts-ignore Assume `parent` is a parent.
-  var nodes = parent.children || []
+  const nodes = parent.children || []
   /** @type {Array.<MdastNode>} */
-  var values = []
-  var index = -1
+  let values = []
+  let index = -1
   /** @type {MdastNode|Array.<MdastNode>} */
-  var result
+  let result
 
   while (++index < nodes.length) {
     // @ts-ignore assume `parent` is a parent.

lib/handlers/code.js

@@ -10,26 +10,26 @@ import {toText} from 'hast-util-to-text'
 import {trimTrailingLines} from 'trim-trailing-lines'
 import {wrapText} from '../util/wrap-text.js'
 
-var prefix = 'language-'
+const prefix = 'language-'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'pre'}>} */
-var pre = convertElement('pre')
+const pre = convertElement('pre')
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'code'}>} */
-var isCode = convertElement('code')
+const isCode = convertElement('code')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 export function code(h, node) {
-  var children = node.children
-  var index = -1
+  const children = node.children
+  let index = -1
   /** @type {Array.<string|number>} */
-  var classList
+  let classList
   /** @type {string} */
-  var lang
+  let lang
   /** @type {ElementChild} */
-  var child
+  let child
 
   if (pre(node)) {
     while (++index < children.length) {

lib/handlers/dl.js

@@ -17,31 +17,29 @@ import {listItemsSpread} from '../util/list-items-spread.js'
 import {wrapListItems} from '../util/wrap-list-items.js'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'div'}>} */
-var div = convertElement('div')
+const div = convertElement('div')
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'dt'}>} */
-var dt = convertElement('dt')
+const dt = convertElement('dt')
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'dd'}>} */
-var dd = convertElement('dd')
+const dd = convertElement('dd')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 export function dl(h, node) {
-  var children = node.children
-  var index = -1
+  const children = node.children
+  let index = -1
   /** @type {Array.<ElementChild>} */
-  var clean = []
+  let clean = []
   /** @type {Array.<Group>} */
-  var groups = []
+  const groups = []
   /** @type {Group} */
-  var group = {titles: [], definitions: []}
-  /** @type {Array.<MdastListContent>} */
-  var content
+  let group = {titles: [], definitions: []}
   /** @type {ElementChild} */
-  var child
+  let child
   /** @type {Array.<MdastBlockContent>} */
-  var result
+  let result
 
   // Unwrap `<div>`s
   while (++index < children.length) {
@@ -71,7 +69,8 @@ export function dl(h, node) {
 
   // Create items.
   index = -1
-  content = []
+  /** @type {Array.<MdastListContent>} */
+  const content = []
 
   while (++index < groups.length) {
     result = [
@@ -106,7 +105,7 @@ export function dl(h, node) {
  * @returns {Array.<MdastBlockContent>}
  */
 function handle(h, children) {
-  var nodes = wrapListItems(h, {type: 'element', tagName: 'x', children})
+  const nodes = wrapListItems(h, {type: 'element', tagName: 'x', children})
 
   if (nodes.length === 0) {
     return []

lib/handlers/heading.js

@@ -13,13 +13,11 @@ import {all} from '../all.js'
 export function heading(h, node) {
   // `else` shouldn’t happen, of course…
   /* c8 ignore next */
-  var depth = Number(node.tagName.charAt(1)) || 1
-  var wrap = h.wrapText
-  /** @type {MdastNode} */
-  var result
+  const depth = Number(node.tagName.charAt(1)) || 1
+  const wrap = h.wrapText
 
   h.wrapText = false
-  result = h(node, 'heading', {depth}, all(h, node))
+  const result = h(node, 'heading', {depth}, all(h, node))
   h.wrapText = wrap
 
   return result

lib/handlers/iframe.js

@@ -11,8 +11,8 @@ import {wrapText} from '../util/wrap-text.js'
  * @param {Element} node
  */
 export function iframe(h, node) {
-  var src = String(node.properties.src || '')
-  var title = String(node.properties.title || '')
+  const src = String(node.properties.src || '')
+  const title = String(node.properties.title || '')
 
   // Only create a link if there is a title.
   // We can’t use the content of the frame because conforming HTML parsers treat

lib/handlers/input.js

@@ -12,25 +12,25 @@ import {resolve} from '../util/resolve.js'
 import {wrapText} from '../util/wrap-text.js'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'datalist'}>} */
-var datalist = convertElement('datalist')
+const datalist = convertElement('datalist')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 // eslint-disable-next-line complexity
 export function input(h, node) {
-  var props = node.properties
-  var value = String(props.value || props.placeholder || '')
+  const props = node.properties
+  let value = String(props.value || props.placeholder || '')
   /** @type {Array.<MdastNode>} */
-  var results = []
+  const results = []
   /** @type {Array.<string>} */
-  var texts = []
+  const texts = []
   /** @type {Array.<[string, string|null]>} */
-  var values = []
-  var index = -1
+  let values = []
+  let index = -1
   /** @type {string} */
-  var list
+  let list
 
   if (props.disabled || props.type === 'hidden' || props.type === 'file') {
     return

lib/handlers/li.js

@@ -10,24 +10,22 @@ import {shallow} from '../util/shallow.js'
 import {wrapChildren} from '../util/wrap-children.js'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'p'}>} */
-var p = convertElement('p')
+const p = convertElement('p')
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'input'}>} */
-var input = convertElement('input')
+const input = convertElement('input')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 export function li(h, node) {
-  var head = node.children[0]
+  const head = node.children[0]
   /** @type {boolean} */
-  var checked = null
-  /** @type {Array.<MdastNode>} */
-  var content
+  let checked = null
   /** @type {ElementChild} */
-  var checkbox
+  let checkbox
   /** @type {Element} */
-  var clone
+  let clone
 
   // Check if this node starts with a checkbox.
   if (p(head)) {
@@ -50,7 +48,7 @@ export function li(h, node) {
     }
   }
 
-  content = wrapChildren(h, clone || node)
+  const content = wrapChildren(h, clone || node)
 
   return h(node, 'listItem', {spread: content.length > 1, checked}, content)
 }

lib/handlers/list.js

@@ -9,17 +9,17 @@ import {listItemsSpread} from '../util/list-items-spread.js'
 import {wrapListItems} from '../util/wrap-list-items.js'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'ol'}>} */
-var ol = convertElement('ol')
+const ol = convertElement('ol')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 export function list(h, node) {
-  var ordered = ol(node)
-  var children = wrapListItems(h, node)
+  const ordered = ol(node)
+  const children = wrapListItems(h, node)
   /** @type {number} */
-  var start = null
+  let start = null
 
   if (ordered) {
     start = hasProperty(node, 'start')

lib/handlers/media.js

@@ -12,23 +12,23 @@ import {resolve} from '../util/resolve.js'
 import {wrapNeeded} from '../util/wrap.js'
 
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'source'}>} */
-var source = convertElement('source')
+const source = convertElement('source')
 /** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'video'}>} */
-var video = convertElement('video')
+const video = convertElement('video')
 
 /**
  * @type {Handle}
  * @param {Element} node
  */
 export function media(h, node) {
-  var nodes = all(h, node)
-  var poster = video(node) && String(node.properties.poster || '')
-  var src = String(node.properties.src || '')
-  var index = -1
+  let nodes = all(h, node)
+  const poster = video(node) && String(node.properties.poster || '')
+  let src = String(node.properties.src || '')
+  let index = -1
   /** @type {boolean} */
-  var linkInFallbackContent
+  let linkInFallbackContent
   /** @type {ElementChild} */
-  var child
+  let child
 
   visit({type: 'root', children: nodes}, 'link', findLink)
 
@@ -58,9 +58,9 @@ export function media(h, node) {
   }
 
   // Link to the media resource.
-  // @ts-ignore Types are broken.
   return {
     type: 'link',
+    // @ts-ignore Types are broken.
     title: node.properties.title || null,
     url: resolve(h, src),
     // @ts-ignore Assume phrasing content.