Refactor code-style

Author: wooorm

lib/index.js

@@ -73,16 +73,16 @@ import {htmlVoidElements} from 'html-void-elements'
 import {webNamespaces} from 'web-namespaces'
 import {zwitch} from 'zwitch'
 
-var inTemplateMode = 'IN_TEMPLATE_MODE'
-var dataState = 'DATA_STATE'
-var characterToken = 'CHARACTER_TOKEN'
-var startTagToken = 'START_TAG_TOKEN'
-var endTagToken = 'END_TAG_TOKEN'
-var commentToken = 'COMMENT_TOKEN'
-var doctypeToken = 'DOCTYPE_TOKEN'
+const inTemplateMode = 'IN_TEMPLATE_MODE'
+const dataState = 'DATA_STATE'
+const characterToken = 'CHARACTER_TOKEN'
+const startTagToken = 'START_TAG_TOKEN'
+const endTagToken = 'END_TAG_TOKEN'
+const commentToken = 'COMMENT_TOKEN'
+const doctypeToken = 'DOCTYPE_TOKEN'
 
 /** @type {P5ParserOptions} */
-var parseOptions = {sourceCodeLocationInfo: true, scriptingEnabled: false}
+const parseOptions = {sourceCodeLocationInfo: true, scriptingEnabled: false}
 
 /**
  * Given a hast tree and an optional vfile (for positional info), return a new
@@ -93,24 +93,22 @@ var parseOptions = {sourceCodeLocationInfo: true, scriptingEnabled: false}
  * @param {Options} [options] Configuration
  */
 export function raw(tree, file, options) {
-  var index = -1
-  var parser = new Parser(parseOptions)
-  var one = zwitch('type', {
+  let index = -1
+  const parser = new Parser(parseOptions)
+  const one = zwitch('type', {
     handlers: {root, element, text, comment, doctype, raw: handleRaw},
     unknown
   })
   /** @type {boolean} */
-  var stitches
+  let stitches
   /** @type {HiddenTokenizer} */
-  var tokenizer
+  let tokenizer
   /** @type {HiddenPreprocessor} */
-  var preprocessor
+  let preprocessor
   /** @type {HiddenPosTracker} */
-  var posTracker
+  let posTracker
   /** @type {HiddenLocationTracker} */
-  var locationTracker
-  /** @type {Node} */
-  var result
+  let locationTracker
 
   if (isOptions(file)) {
     options = file
@@ -124,7 +122,7 @@ export function raw(tree, file, options) {
   }
 
   // @ts-expect-error: update `vfile`.
-  result = fromParse5(documentMode(tree) ? document() : fragment(), file)
+  const result = fromParse5(documentMode(tree) ? document() : fragment(), file)
 
   if (stitches) {
     visit(result, 'comment', mend)
@@ -156,7 +154,7 @@ export function raw(tree, file, options) {
    */
   function fragment() {
     /** @type {P5Element} */
-    var context = {
+    const context = {
       nodeName: 'template',
       tagName: 'template',
       attrs: [],
@@ -165,7 +163,7 @@ export function raw(tree, file, options) {
       parentNode: undefined
     }
     /** @type {P5Element} */
-    var mock = {
+    const mock = {
       nodeName: 'documentmock',
       tagName: 'documentmock',
       attrs: [],
@@ -174,7 +172,7 @@ export function raw(tree, file, options) {
       parentNode: undefined
     }
     /** @type {P5Fragment} */
-    var doc = {nodeName: '#document-fragment', childNodes: []}
+    const doc = {nodeName: '#document-fragment', childNodes: []}
 
     parser._bootstrap(mock, context)
     parser._pushTmplInsertionMode(inTemplateMode)
@@ -200,7 +198,7 @@ export function raw(tree, file, options) {
    */
   function document() {
     /** @type {P5Document} */
-    var doc = parser.treeAdapter.createDocument()
+    const doc = parser.treeAdapter.createDocument()
 
     parser._bootstrap(doc, null)
     tokenizer = parser.tokenizer
@@ -218,7 +216,7 @@ export function raw(tree, file, options) {
    * @returns {void}
    */
   function all(nodes) {
-    var index = -1
+    let index = -1
 
     /* istanbul ignore else - invalid nodes, see rehypejs/rehype-raw#7. */
     if (nodes) {
@@ -299,12 +297,10 @@ export function raw(tree, file, options) {
    * @returns {void}
    */
   function handleRaw(node) {
-    var start = pointStart(node)
-    var line = start.line || 1
-    var column = start.column || 1
-    var offset = start.offset || 0
-    /** @type {HiddenToken} */
-    var token
+    const start = pointStart(node)
+    const line = start.line || 1
+    const column = start.column || 1
+    const offset = start.offset || 0
 
     // Reset preprocessor:
     // See: <https://github.com/inikulin/parse5/blob/9c683e1/packages/parse5/lib/tokenizer/preprocessor.js>.
@@ -339,7 +335,7 @@ export function raw(tree, file, options) {
     // Process final characters if they’re still there after hibernating.
     // Similar to:
     // See: <https://github.com/inikulin/parse5/blob/9c683e1/packages/parse5/lib/extensions/location-info/tokenizer-mixin.js#L95>.
-    token = tokenizer.currentCharacterToken
+    const token = tokenizer.currentCharacterToken
 
     if (token) {
       token.location.endLine = posTracker.line
@@ -353,7 +349,7 @@ export function raw(tree, file, options) {
    * @param {UnistNode} node
    */
   function stitch(node) {
-    var clone = Object.assign({}, node)
+    const clone = Object.assign({}, node)
 
     stitches = true
 
@@ -404,10 +400,10 @@ export function raw(tree, file, options) {
  * @returns {HiddenToken}
  */
 function startTag(node) {
-  /** @type {unknown} */
-  var location = Object.assign(createParse5Location(node), {
-    startTag: Object.assign({}, location)
-  })
+  /** @type {P5Location} */
+  const location = Object.assign(createParse5Location(node))
+  // @ts-ignore extra positional info.
+  location.startTag = Object.assign({}, location)
 
   // Untyped token.
   return {
@@ -439,10 +435,10 @@ function attributes(node) {
  * @returns {HiddenToken}
  */
 function endTag(node) {
-  /** @type {unknown} */
-  var location = Object.assign(createParse5Location(node), {
-    endTag: Object.assign({}, location)
-  })
+  /** @type {P5Location} */
+  const location = Object.assign(createParse5Location(node))
+  // @ts-ignore extra positional info.
+  location.startTag = Object.assign({}, location)
 
   // Untyped token.
   return {
@@ -466,7 +462,7 @@ function unknown(node) {
  * @returns {boolean}
  */
 function documentMode(node) {
-  var head = node.type === 'root' ? node.children[0] : node
+  const head = node.type === 'root' ? node.children[0] : node
   return Boolean(
     head &&
       (head.type === 'doctype' ||
@@ -479,8 +475,8 @@ function documentMode(node) {
  * @returns {P5Location}
  */
 function createParse5Location(node) {
-  var start = pointStart(node)
-  var end = pointEnd(node)
+  const start = pointStart(node)
+  const end = pointEnd(node)
 
   return {
     startLine: start.line,

package.json

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

readme.md

@@ -37,11 +37,11 @@ npm install hast-util-raw
 import {h} from 'hastscript'
 import {raw} from 'hast-util-raw'
 
-var tree = h('div', [h('h1', ['Foo ', h('h2', 'Bar'), ' Baz'])])
+const tree = h('div', [h('h1', ['Foo ', h('h2', 'Bar'), ' Baz'])])
 
-var clean = raw(tree)
+const reformatted = raw(tree)
 
-console.log(clean)
+console.log(reformatted)
 ```
 
 Yields:

test.js

@@ -7,9 +7,9 @@ import remarkRehype from 'remark-rehype'
 import rehypeStringify from 'rehype-stringify'
 import {raw} from './index.js'
 
-test('raw', function (t) {
+test('raw', (t) => {
   t.throws(
-    function () {
+    () => {
       // @ts-ignore runtime.
       raw(u('unknown'))
     },
@@ -284,15 +284,15 @@ test('raw', function (t) {
   t.end()
 })
 
-test('integration', function (t) {
+test('integration', (t) => {
   unified()
     .use(remarkParse)
     .use(remarkRehype, {allowDangerousHtml: true})
-    .use(function () {
+    .use(() => {
       // @ts-ignore hast is more specific than unist.
       return (tree, file) => raw(tree, file)
     })
-    .use(function () {
+    .use(() => {
       return transformer
       function transformer(/** @type {import('unist').Node} */ tree) {
         t.deepEqual(
@@ -672,7 +672,7 @@ test('integration', function (t) {
         '<p>Hello, world!',
         ''
       ].join('\n'),
-      function (error, file) {
+      (error, file) => {
         t.ifErr(error, 'should not fail')
 
         t.equal(