Refactor code-style

Author: wooorm

lib/index.js

@@ -16,16 +16,16 @@ import {one} from './tree.js'
  * @returns {string}
  */
 export function toHtml(node, options = {}) {
-  var quote = options.quote || '"'
+  const quote = options.quote || '"'
   /** @type {Quote} */
-  var alternative = quote === '"' ? "'" : '"'
+  const alternative = quote === '"' ? "'" : '"'
 
   if (quote !== '"' && quote !== "'") {
     throw new Error('Invalid quote `' + quote + '`, expected `\'` or `"`')
   }
 
   /** @type {Context} */
-  var context = {
+  const context = {
     valid: options.allowParseErrors ? 0 : 1,
     safe: options.allowDangerousCharacters ? 0 : 1,
     schema: options.space === 'svg' ? svg : html,

lib/omission/closing.js

@@ -37,7 +37,7 @@ export const closing = omission({
  * @type {OmitHandle}
  */
 function headOrColgroupOrCaption(_, index, parent) {
-  var next = siblingAfter(parent, index, true)
+  const next = siblingAfter(parent, index, true)
   return !next || (!comment(next) && !whitespaceStart(next))
 }
 
@@ -47,7 +47,7 @@ function headOrColgroupOrCaption(_, index, parent) {
  * @type {OmitHandle}
  */
 function html(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || !comment(next)
 }
 
@@ -57,7 +57,7 @@ function html(_, index, parent) {
  * @type {OmitHandle}
  */
 function body(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || !comment(next)
 }
 
@@ -67,7 +67,7 @@ function body(_, index, parent) {
  * @type {OmitHandle}
  */
 function p(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return next
     ? isElement(next, [
         'address',
@@ -120,7 +120,7 @@ function p(_, index, parent) {
  * @type {OmitHandle}
  */
 function li(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, 'li')
 }
 
@@ -130,7 +130,7 @@ function li(_, index, parent) {
  * @type {OmitHandle}
  */
 function dt(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return next && isElement(next, ['dt', 'dd'])
 }
 
@@ -140,7 +140,7 @@ function dt(_, index, parent) {
  * @type {OmitHandle}
  */
 function dd(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['dt', 'dd'])
 }
 
@@ -150,7 +150,7 @@ function dd(_, index, parent) {
  * @type {OmitHandle}
  */
 function rubyElement(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['rp', 'rt'])
 }
 
@@ -160,7 +160,7 @@ function rubyElement(_, index, parent) {
  * @type {OmitHandle}
  */
 function optgroup(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, 'optgroup')
 }
 
@@ -170,7 +170,7 @@ function optgroup(_, index, parent) {
  * @type {OmitHandle}
  */
 function option(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['option', 'optgroup'])
 }
 
@@ -180,7 +180,7 @@ function option(_, index, parent) {
  * @type {OmitHandle}
  */
 function menuitem(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['menuitem', 'hr', 'menu'])
 }
 
@@ -190,7 +190,7 @@ function menuitem(_, index, parent) {
  * @type {OmitHandle}
  */
 function thead(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return next && isElement(next, ['tbody', 'tfoot'])
 }
 
@@ -200,7 +200,7 @@ function thead(_, index, parent) {
  * @type {OmitHandle}
  */
 function tbody(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['tbody', 'tfoot'])
 }
 
@@ -219,7 +219,7 @@ function tfoot(_, index, parent) {
  * @type {OmitHandle}
  */
 function tr(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, 'tr')
 }
 
@@ -229,6 +229,6 @@ function tr(_, index, parent) {
  * @type {OmitHandle}
  */
 function cells(_, index, parent) {
-  var next = siblingAfter(parent, index)
+  const next = siblingAfter(parent, index)
   return !next || isElement(next, ['td', 'th'])
 }

lib/omission/omission.js

@@ -2,7 +2,7 @@
  * @typedef {import('../types.js').OmitHandle} OmitHandle
  */
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
 /**
  * Factory to check if a given node can have a tag omitted.

lib/omission/opening.js

@@ -24,7 +24,7 @@ export const opening = omission({
  * @type {OmitHandle}
  */
 function html(node) {
-  var head = siblingAfter(node, -1)
+  const head = siblingAfter(node, -1)
   return !head || !comment(head)
 }
 
@@ -34,12 +34,12 @@ function html(node) {
  * @type {OmitHandle}
  */
 function head(node) {
-  var children = node.children
+  const children = node.children
   /** @type {Array.<string>} */
-  var seen = []
-  var index = -1
+  const seen = []
+  let index = -1
   /** @type {Child} */
-  var child
+  let child
 
   while (++index < children.length) {
     child = children[index]
@@ -58,7 +58,7 @@ function head(node) {
  * @type {OmitHandle}
  */
 function body(node) {
-  var head = siblingAfter(node, -1, true)
+  const head = siblingAfter(node, -1, true)
 
   return (
     !head ||
@@ -77,8 +77,8 @@ function body(node) {
  * @type {OmitHandle}
  */
 function colgroup(node, index, parent) {
-  var previous = siblingBefore(parent, index)
-  var head = siblingAfter(node, -1, true)
+  const previous = siblingBefore(parent, index)
+  const head = siblingAfter(node, -1, true)
 
   // Previous colgroup was already omitted.
   if (
@@ -97,8 +97,8 @@ function colgroup(node, index, parent) {
  * @type {OmitHandle}
  */
 function tbody(node, index, parent) {
-  var previous = siblingBefore(parent, index)
-  var head = siblingAfter(node, -1)
+  const previous = siblingBefore(parent, index)
+  const head = siblingAfter(node, -1)
 
   // Previous table section was already omitted.
   if (

lib/omission/util/siblings.js

@@ -25,9 +25,9 @@ function siblings(increment) {
    * @returns {Child}
    */
   function sibling(parent, index, includeWhitespace) {
-    var siblings = parent && parent.children
-    var offset = index + increment
-    var next = siblings && siblings[offset]
+    const siblings = parent && parent.children
+    let offset = index + increment
+    let next = siblings && siblings[offset]
 
     if (!includeWhitespace) {
       while (next && whitespace(next)) {

lib/omission/util/whitespace-start.js

@@ -8,7 +8,7 @@ import {whitespace} from 'hast-util-whitespace'
 
 /** @type {import('unist-util-is').AssertPredicate<Text>} */
 // @ts-ignore
-var isText = convert('text')
+const isText = convert('text')
 
 /**
  * Check if `node` starts with whitespace.

lib/text.js

@@ -11,7 +11,10 @@ import {stringifyEntities} from 'stringify-entities'
  */
 export function text(ctx, node, _, parent) {
   // Check if content of `node` should be escaped.
-  return parent && (parent.tagName === 'script' || parent.tagName === 'style')
+  return parent &&
+    parent.type === 'element' &&
+    // @ts-expect-error: hush.
+    (parent.tagName === 'script' || parent.tagName === 'style')
     ? node.value
     : stringifyEntities(
         node.value,

lib/tree.js

@@ -13,15 +13,15 @@ import {stringify as commas} from 'comma-separated-tokens'
 import {stringifyEntities} from 'stringify-entities'
 import {ccount} from 'ccount'
 import {constants} from './constants.js'
-import {comment} from './comment'
-import {doctype} from './doctype'
-import {raw} from './raw'
-import {text} from './text'
+import {comment} from './comment.js'
+import {doctype} from './doctype.js'
+import {raw} from './raw.js'
+import {text} from './text.js'
 
 /**
  * @type {Object.<string, Handle>}
  */
-var handlers = {
+const handlers = {
   comment,
   doctype,
   element,
@@ -32,7 +32,7 @@ var handlers = {
   text
 }
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
 /**
  * @type {Handle}
@@ -57,9 +57,9 @@ export function one(ctx, node, index, parent) {
  */
 export function all(ctx, parent) {
   /** @type {Array.<string>} */
-  var results = []
-  var children = (parent && parent.children) || []
-  var index = -1
+  const results = []
+  const children = (parent && parent.children) || []
+  let index = -1
 
   while (++index < children.length) {
     results[index] = one(ctx, children[index], index, parent)
@@ -74,28 +74,24 @@ export function all(ctx, parent) {
  */
 // eslint-disable-next-line complexity
 export function element(ctx, node, index, parent) {
-  var schema = ctx.schema
-  var omit = schema.space === 'svg' ? undefined : ctx.omit
-  var selfClosing =
+  const schema = ctx.schema
+  const omit = schema.space === 'svg' ? undefined : ctx.omit
+  let selfClosing =
     schema.space === 'svg'
       ? ctx.closeEmpty
       : ctx.voids.includes(node.tagName.toLowerCase())
   /** @type {Array.<string>} */
-  var parts = []
+  const parts = []
   /** @type {string} */
-  var attrs
-  /** @type {string} */
-  var content
-  /** @type {string} */
-  var last
+  let last
 
   if (schema.space === 'html' && node.tagName === 'svg') {
     ctx.schema = svg
   }
 
-  attrs = serializeAttributes(ctx, node.properties)
+  const attrs = serializeAttributes(ctx, node.properties)
 
-  content = all(
+  const content = all(
     ctx,
     schema.space === 'html' && node.tagName === 'template' ? node.content : node
   )
@@ -143,14 +139,14 @@ export function element(ctx, node, index, parent) {
  */
 function serializeAttributes(ctx, props) {
   /** @type {Array.<string>} */
-  var values = []
-  var index = -1
+  const values = []
+  let index = -1
   /** @type {string} */
-  var key
+  let key
   /** @type {string} */
-  var value
+  let value
   /** @type {string} */
-  var last
+  let last
 
   for (key in props) {
     if (props[key] !== undefined && props[key] !== null) {
@@ -179,12 +175,10 @@ function serializeAttributes(ctx, props) {
  */
 // eslint-disable-next-line complexity
 function serializeAttribute(ctx, key, value) {
-  var info = find(ctx.schema, key)
-  var quote = ctx.quote
-  /** @type {string} */
-  var result
+  const info = find(ctx.schema, key)
+  let quote = ctx.quote
   /** @type {string} */
-  var name
+  let result
 
   if (info.overloadedBoolean && (value === info.attribute || value === '')) {
     value = true
@@ -204,7 +198,7 @@ function serializeAttribute(ctx, key, value) {
     return ''
   }
 
-  name = stringifyEntities(
+  const name = stringifyEntities(
     info.attribute,
     Object.assign({}, ctx.entities, {
       // Always encode without parse errors in non-HTML.

package.json

@@ -65,7 +65,7 @@
     "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
     "test-api": "node test/index.js",
     "test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov node test/index.js",
-    "test": "npm run format && npm run test-coverage"
+    "test": "npm run build && npm run format && npm run test-coverage"
   },
   "prettier": {
     "tabWidth": 2,
@@ -76,11 +76,7 @@
     "trailingComma": "none"
   },
   "xo": {
-    "prettier": true,
-    "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off"
-    }
+    "prettier": true
   },
   "remarkConfig": {
     "plugins": [