Refactor code-style

Author: wooorm

Diff for: lib/core.js

@@ -25,17 +25,17 @@ import {parseSelector} from 'hast-util-parse-selector'
 import {parse as spaces} from 'space-separated-tokens'
 import {parse as commas} from 'comma-separated-tokens'
 
-var buttonTypes = new Set(['menu', 'submit', 'reset', 'button'])
+const buttonTypes = new Set(['menu', 'submit', 'reset', 'button'])
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
 /**
  * @param {Schema} schema
  * @param {string} defaultTagName
  * @param {Array.<string>} [caseSensitive]
  */
 export function core(schema, defaultTagName, caseSensitive) {
-  var adjust = caseSensitive && createAdjustMap(caseSensitive)
+  const adjust = caseSensitive && createAdjustMap(caseSensitive)
 
   const h =
     /**
@@ -56,11 +56,9 @@ export function core(schema, defaultTagName, caseSensitive) {
        * @returns {HResult}
        */
       function (selector, properties, ...children) {
-        var index = -1
+        let index = -1
         /** @type {HResult} */
-        var node
-        /** @type {string} */
-        var key
+        let node
 
         if (selector === undefined || selector === null) {
           node = {type: 'root', children: []}
@@ -76,6 +74,9 @@ export function core(schema, defaultTagName, caseSensitive) {
 
           // Handle props.
           if (isProperties(properties, node.tagName)) {
+            /** @type {string} */
+            let key
+
             for (key in properties) {
               if (own.call(properties, key)) {
                 // @ts-ignore `node.properties` is set.
@@ -142,12 +143,10 @@ function isProperties(value, name) {
  * @returns {void}
  */
 function addProperty(schema, properties, key, value) {
-  var info = find(schema, key)
-  var index = -1
+  const info = find(schema, key)
+  let index = -1
   /** @type {HPropertyValue} */
-  var result
-  /** @type {Array.<string|number>} */
-  var finalResult
+  let result
 
   // Ignore nullish and NaN values.
   if (value === undefined || value === null) return
@@ -180,7 +179,8 @@ function addProperty(schema, properties, key, value) {
   }
 
   if (Array.isArray(result)) {
-    finalResult = []
+    /** @type {Array.<string|number>} */
+    const finalResult = []
 
     while (++index < result.length) {
       // @ts-ignore Assume no booleans in array.
@@ -205,7 +205,7 @@ function addProperty(schema, properties, key, value) {
  * @returns {void}
  */
 function addChild(nodes, value) {
-  var index = -1
+  let index = -1
 
   if (value === undefined || value === null) {
     // Empty.
@@ -258,9 +258,9 @@ function parsePrimitive(info, name, value) {
  */
 function style(value) {
   /** @type {Array.<string>} */
-  var result = []
+  const result = []
   /** @type {string} */
-  var key
+  let key
 
   for (key in value) {
     if (own.call(value, key)) {
@@ -277,8 +277,8 @@ function style(value) {
  */
 function createAdjustMap(values) {
   /** @type {Object.<string, string>} */
-  var result = {}
-  var index = -1
+  const result = {}
+  let index = -1
 
   while (++index < values.length) {
     result[values[index].toLowerCase()] = values[index]

Diff for: lib/runtime.js

@@ -29,7 +29,7 @@ export function runtime(f) {
        * @returns {HResult}
        */
       function (type, props) {
-        var {children, ...properties} = props
+        const {children, ...properties} = props
         return type === null ? f(type, children) : f(type, properties, children)
       }
     )

Diff for: package.json

@@ -101,11 +101,7 @@
     "trailingComma": "none"
   },
   "xo": {
-    "prettier": true,
-    "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off"
-    }
+    "prettier": true
   },
   "remarkConfig": {
     "plugins": [

Diff for: readme.md

@@ -268,7 +268,7 @@ The following example shows how a script is injected that runs when loaded in a
 browser.
 
 ```js
-var tree = {type: 'root', children: []}
+const tree = {type: 'root', children: []}
 
 tree.children.push(h('script', 'alert(1)'))
 ```
@@ -283,11 +283,11 @@ The following example shows how an image is injected that fails loading and
 therefore runs code in a browser.
 
 ```js
-var tree = {type: 'root', children: []}
+const tree = {type: 'root', children: []}
 
 // Somehow someone injected these properties instead of an expected `src` and
 // `alt`:
-var otherProps = {src: 'x', onError: 'alert(2)'}
+const otherProps = {src: 'x', onError: 'alert(2)'}
 
 tree.children.push(h('img', {src: 'default.png', ...otherProps}))
 ```
@@ -302,10 +302,10 @@ The following example shows how code can run in a browser because someone stored
 an object in a database instead of the expected string.
 
 ```js
-var tree = {type: 'root', children: []}
+const tree = {type: 'root', children: []}
 
 // Somehow this isn’t the expected `'wooorm'`.
-var username = {
+const username = {
   type: 'element',
   tagName: 'script',
   children: [{type: 'text', value: 'alert(3)'}]

Diff for: script/build.js

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import {svgTagNames} from 'svg-tag-names'
 
-var casing = svgTagNames.filter((d) => d !== d.toLowerCase())
+const casing = svgTagNames.filter((d) => d !== d.toLowerCase())
 
 fs.writeFileSync(
   path.join('lib', 'svg-case-sensitive-tag-names.js'),

Diff for: script/generate-jsx.js

@@ -6,7 +6,7 @@ import acornJsx from 'acorn-jsx'
 import {generate} from 'astring'
 import {buildJsx} from 'estree-util-build-jsx'
 
-var doc = String(fs.readFileSync(path.join('test', 'jsx.jsx')))
+const doc = String(fs.readFileSync(path.join('test', 'jsx.jsx')))
 
 fs.writeFileSync(
   path.join('test', 'jsx-build-jsx-classic.js'),

Diff for: test/core.js

@@ -3,13 +3,13 @@ import {h, s} from '../index.js'
 import {h as hFromRoot} from '../html.js'
 import {s as sFromRoot} from '../svg.js'
 
-test('hastscript', function (t) {
+test('hastscript', (t) => {
   t.equal(h, hFromRoot, '`h` should be exposed from `/html.js`')
   t.equal(s, sFromRoot, '`s` should be exposed from `/svg.js`')
 
   t.equal(typeof h, 'function', 'should expose a function')
 
-  t.test('selector', function (t) {
+  t.test('selector', (t) => {
     t.deepEqual(
       h(),
       {type: 'root', children: []},
@@ -118,8 +118,8 @@ test('hastscript', function (t) {
     t.end()
   })
 
-  t.test('properties', function (t) {
-    t.test('known property names', function (t) {
+  t.test('properties', (t) => {
+    t.test('known property names', (t) => {
       t.deepEqual(
         h('', {className: 'foo'}),
         {
@@ -167,7 +167,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('unknown property names', function (t) {
+    t.test('unknown property names', (t) => {
       t.deepEqual(
         h('', {allowbigscreen: true}),
         {
@@ -204,7 +204,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('other namespaces', function (t) {
+    t.test('other namespaces', (t) => {
       t.deepEqual(
         h('', {'aria-valuenow': 1}),
         {
@@ -318,7 +318,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('data property names', function (t) {
+    t.test('data property names', (t) => {
       t.deepEqual(
         h('', {'data-foo': true}),
         {
@@ -410,7 +410,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('unknown property values', function (t) {
+    t.test('unknown property values', (t) => {
       t.deepEqual(
         h('', {foo: 'bar'}),
         {
@@ -491,7 +491,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('known booleans', function (t) {
+    t.test('known booleans', (t) => {
       t.deepEqual(
         h('', {allowFullScreen: ''}),
         {
@@ -528,7 +528,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('known overloaded booleans', function (t) {
+    t.test('known overloaded booleans', (t) => {
       t.deepEqual(
         h('', {download: ''}),
         {
@@ -565,7 +565,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('known numbers', function (t) {
+    t.test('known numbers', (t) => {
       t.deepEqual(
         h('textarea', {cols: '3'}),
         {
@@ -602,7 +602,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('known lists', function (t) {
+    t.test('known lists', (t) => {
       t.deepEqual(
         h('', {class: 'foo bar baz'}),
         {
@@ -639,7 +639,7 @@ test('hastscript', function (t) {
       t.end()
     })
 
-    t.test('style', function (t) {
+    t.test('style', (t) => {
       t.deepEqual(
         h('', {style: {color: 'red', '-webkit-border-radius': '3px'}}),
         {
@@ -672,7 +672,7 @@ test('hastscript', function (t) {
     t.end()
   })
 
-  t.test('children', function (t) {
+  t.test('children', (t) => {
     t.deepEqual(
       h('div', {}, []),
       {
@@ -949,7 +949,7 @@ test('hastscript', function (t) {
     )
 
     t.throws(
-      function () {
+      () => {
         // @ts-ignore runtime.
         h('foo', {}, true)
       },
@@ -960,7 +960,7 @@ test('hastscript', function (t) {
     t.end()
   })
 
-  t.test('<template>', function (t) {
+  t.test('<template>', (t) => {
     t.deepEqual(
       h('template'),
       {
@@ -1018,7 +1018,7 @@ test('hastscript', function (t) {
     t.end()
   })
 
-  t.test('svg', function (t) {
+  t.test('svg', (t) => {
     t.deepEqual(
       s(),
       {type: 'root', children: []},
@@ -1146,7 +1146,7 @@ test('hastscript', function (t) {
     t.end()
   })
 
-  t.test('tag names', function (t) {
+  t.test('tag names', (t) => {
     t.deepEqual(
       h('', [h('DIV'), h('dIv'), h('div')]),
       {

Diff for: test/jsx.jsx

@@ -2,12 +2,12 @@ import test from 'tape'
 import {u} from 'unist-builder'
 import {h} from '../index.js'
 
-test('name', function (t) {
+test('name', (t) => {
   t.deepEqual(<a />, h('a'), 'should support a self-closing element')
 
   t.deepEqual(<a>b</a>, h('a', 'b'), 'should support a value as a child')
 
-  var A = 'a'
+  const A = 'a'
 
   t.deepEqual(<A />, h(A), 'should support an uppercase tag name')
 
@@ -39,7 +39,7 @@ test('name', function (t) {
     'should support a fragment with an expression'
   )
 
-  var com = {acme: {a: 'A', b: 'B'}}
+  const com = {acme: {a: 'A', b: 'B'}}
 
   t.deepEqual(
     <com.acme.a />,
@@ -67,7 +67,7 @@ test('name', function (t) {
     'should support expression value attributes'
   )
 
-  var props = {a: 1, b: 2}
+  const props = {a: 1, b: 2}
 
   t.deepEqual(
     <a {...props} />,
@@ -92,7 +92,7 @@ test('name', function (t) {
     'should support a fragment in an element (#1)'
   )
 
-  var dl = [
+  const dl = [
     ['Firefox', 'A red panda.'],
     ['Chrome', 'A chemical element.']
   ]