Refactor code-style

Author: wooorm

lib/index.js

@@ -1,6 +1,7 @@
 /**
  * @typedef {import('hast').Parent} Parent
  * @typedef {import('hast').Root} Root
+ * @typedef {import('hast').Element} Element
  * @typedef {import('hast').Properties} Properties
  * @typedef {Parent['children'][number]|Root} Node
  *
@@ -29,11 +30,10 @@
 
 import {defaultSchema} from './schema.js'
 
-var own = {}.hasOwnProperty
-var push = [].push
+const own = {}.hasOwnProperty
 
 /** @type {NodeSchema} */
-var nodeSchema = {
+const nodeSchema = {
   root: {children: all},
   doctype: handleDoctype,
   comment: handleComment,
@@ -54,12 +54,14 @@ var nodeSchema = {
  */
 export function sanitize(node, schema) {
   /** @type {Node} */
-  var ctx = {type: 'root', children: []}
-  /** @type {Node|Array.<Node>} */
-  var replace
+  let ctx = {type: 'root', children: []}
 
   if (node && typeof node === 'object' && node.type) {
-    replace = one(Object.assign({}, defaultSchema, schema || {}), node, [])
+    const replace = one(
+      Object.assign({}, defaultSchema, schema || {}),
+      node,
+      []
+    )
 
     if (replace) {
       if (Array.isArray(replace)) {
@@ -87,35 +89,30 @@ export function sanitize(node, schema) {
  * @returns {Node|Array.<Node>|null}
  */
 function one(schema, node, stack) {
-  var type = node && node.type
+  const type = node && node.type
   /** @type {Node} */
   // @ts-ignore rest of props added later.
-  var replacement = {type: node.type}
+  const replacement = {type: node.type}
   /** @type {boolean} */
-  var replace
-  /** @type {NodeDefinition|NodeDefinitionGetter} */
-  var definition
-  /** @type {NodeDefinition} */
-  var allowed
-  /** @type {unknown} */
-  var result
-  /** @type {string} */
-  var key
+  let replace
 
   if (own.call(nodeSchema, type)) {
-    definition = nodeSchema[type]
+    let definition = nodeSchema[type]
 
     if (typeof definition === 'function') {
       definition = definition(schema, node)
     }
 
     if (definition) {
+      const allowed = Object.assign({}, definition, nodeSchema['*'])
+      /** @type {string} */
+      let key
+
       replace = true
-      allowed = Object.assign({}, definition, nodeSchema['*'])
 
       for (key in allowed) {
         if (own.call(allowed, key)) {
-          result = allowed[key](schema, node[key], node, stack)
+          const result = allowed[key](schema, node[key], node, stack)
 
           // eslint-disable-next-line max-depth
           if (result === false) {
@@ -149,22 +146,21 @@ function one(schema, node, stack) {
  */
 function all(schema, children, node, stack) {
   /** @type {Array.<Node>} */
-  var results = []
-  var index = -1
-  /** @type {Node|Array.<Node>} */
-  var value
+  const results = []
 
   if (Array.isArray(children)) {
+    let index = -1
+
     if (node.type === 'element') {
       stack.push(node.tagName)
     }
 
     while (++index < children.length) {
-      value = one(schema, children[index], stack)
+      const value = one(schema, children[index], stack)
 
       if (value) {
-        if ('length' in value) {
-          push.apply(results, value)
+        if (Array.isArray(value)) {
+          results.push(...value)
         } else {
           results.push(value)
         }
@@ -194,34 +190,32 @@ function handleComment(schema) {
  *
  * @type {Handler}
  * @param {Properties} properties
+ * @param {Element} node
  * @returns {Properties}
  */
 function handleProperties(schema, properties, node, stack) {
-  var name =
-    node.type === 'element'
-      ? handleTagName(schema, node.tagName, node, stack)
-      : false
+  const name = handleTagName(schema, node.tagName, node, stack)
   /* c8 ignore next */
-  var reqs = schema.required || {}
-  var props = properties || {}
-  var allowed = Object.assign(
+  const reqs = schema.required || {}
+  const props = properties || {}
+  const allowed = Object.assign(
     {},
     toPropertyValueMap(schema.attributes['*']),
     toPropertyValueMap(
       name && own.call(schema.attributes, name) ? schema.attributes[name] : []
     )
   )
   /** @type {Properties} */
-  var result = {}
-  /** @type {Array.<PrimitivePropertyValue>} */
-  var definition
-  /** @type {PropertyValue} */
-  var value
+  const result = {}
   /** @type {string} */
-  var key
+  let key
 
   for (key in props) {
     if (own.call(props, key)) {
+      let value = props[key]
+      /** @type {Array.<PrimitivePropertyValue>} */
+      let definition
+
       if (own.call(allowed, key)) {
         definition = allowed[key]
       } else if (data(key) && own.call(allowed, 'data*')) {
@@ -230,7 +224,6 @@ function handleProperties(schema, properties, node, stack) {
         continue
       }
 
-      value = props[key]
       value = Array.isArray(value)
         ? handlePropertyValues(schema, value, key, definition)
         : handlePropertyValue(schema, value, key, definition)
@@ -269,8 +262,8 @@ function handleDoctypeName() {
  * @returns {string|false}
  */
 function handleTagName(schema, tagName, _, stack) {
-  var name = typeof tagName === 'string' ? tagName : ''
-  var index = -1
+  const name = typeof tagName === 'string' ? tagName : ''
+  let index = -1
 
   if (!name || name === '*' || !schema.tagNames.includes(name)) {
     return false
@@ -299,8 +292,8 @@ function handleTagName(schema, tagName, _, stack) {
  */
 function handleCommentValue(_, value) {
   /** @type {string} */
-  var result = typeof value === 'string' ? value : ''
-  var index = result.indexOf('-->')
+  const result = typeof value === 'string' ? value : ''
+  const index = result.indexOf('-->')
   return index < 0 ? result : result.slice(0, index)
 }
 
@@ -333,14 +326,12 @@ function allow(_, value) {
  * @returns {Array.<string|number>}
  */
 function handlePropertyValues(schema, values, prop, definition) {
-  var index = -1
+  let index = -1
   /** @type {Array.<string|number>} */
-  var result = []
-  /** @type {PropertyValue} */
-  var value
+  const result = []
 
   while (++index < values.length) {
-    value = handlePropertyValue(schema, values[index], prop, definition)
+    const value = handlePropertyValue(schema, values[index], prop, definition)
 
     if (value !== undefined && value !== null) {
       // @ts-ignore Assume no booleans were in arrays.
@@ -381,15 +372,15 @@ function handlePropertyValue(schema, value, prop, definition) {
  * @returns {boolean}
  */
 function safeProtocol(schema, value, prop) {
-  var url = String(value)
-  var colon = url.indexOf(':')
-  var questionMark = url.indexOf('?')
-  var numberSign = url.indexOf('#')
-  var slash = url.indexOf('/')
-  var protocols = own.call(schema.protocols, prop)
+  const url = String(value)
+  const colon = url.indexOf(':')
+  const questionMark = url.indexOf('?')
+  const numberSign = url.indexOf('#')
+  const slash = url.indexOf('/')
+  const protocols = own.call(schema.protocols, prop)
     ? schema.protocols[prop].concat()
     : []
-  var index = -1
+  let index = -1
 
   if (
     protocols.length === 0 ||
@@ -422,13 +413,11 @@ function safeProtocol(schema, value, prop) {
  */
 function toPropertyValueMap(values) {
   /** @type {AttributeMap} */
-  var result = {}
-  var index = -1
-  /** @type {AttributeValue} */
-  var value
+  const result = {}
+  let index = -1
 
   while (++index < values.length) {
-    value = values[index]
+    const value = values[index]
 
     if (Array.isArray(value)) {
       result[value[0]] = value.slice(1)

package.json

@@ -71,12 +71,7 @@
     "trailingComma": "none"
   },
   "xo": {
-    "prettier": true,
-    "rules": {
-      "unicorn/no-array-for-each": "off",
-      "no-var": "off",
-      "prefer-arrow-callback": "off"
-    }
+    "prettier": true
   },
   "remarkConfig": {
     "plugins": [

readme.md

@@ -29,7 +29,7 @@ import {h} from 'hastscript'
 import {sanitize} from 'hast-util-sanitize'
 import {toHtml} from 'hast-util-to-html'
 
-var tree = h('div', {onmouseover: 'alert("alpha")'}, [
+const tree = h('div', {onmouseover: 'alert("alpha")'}, [
   h(
     'a',
     {href: 'jAva script:alert("bravo")', onclick: 'alert("charlie")'},
@@ -45,8 +45,8 @@ var tree = h('div', {onmouseover: 'alert("alpha")'}, [
   h('math', h('mi', {'xlink:href': 'data:x,<script>alert("foxtrot")</script>'}))
 ])
 
-var unsanitized = toHtml(tree)
-var sanitized = toHtml(sanitize(tree))
+const unsanitized = toHtml(tree)
+const sanitized = toHtml(sanitize(tree))
 
 console.log(unsanitized)
 console.log(sanitized)