Refactor code-style

Author: wooorm

lib/index.js

@@ -4,14 +4,14 @@ import chalk from 'chalk'
 import chokidar from 'chokidar'
 import {options} from './options.js'
 
-var noop = Function.prototype
+const noop = Function.prototype
 
 // Fake TTY stream.
-var ttyStream = new stream.Readable()
+const ttyStream = new stream.Readable()
 ttyStream.isTTY = true
 
 // Exit, lazily, with the correct exit status code.
-var exitStatus = 0
+let exitStatus = 0
 
 process.on('exit', onexit)
 
@@ -20,9 +20,9 @@ process.on('uncaughtException', fail)
 
 // Start the CLI.
 export function args(cliConfig) {
-  var config
-  var output
-  var watcher
+  let config
+  let output
+  let watcher
 
   try {
     config = options(process.argv.slice(2), cliConfig)
@@ -140,7 +140,7 @@ export function args(cliConfig) {
 function fail(error, pretty) {
   // Old versions of Node
   /* c8 ignore next 1 */
-  var message = (pretty ? String(error).trim() : error.stack) || error
+  const message = (pretty ? String(error).trim() : error.stack) || error
 
   exitStatus = 1
 

lib/options.js

@@ -5,8 +5,10 @@ import json5 from 'json5'
 import fault from 'fault'
 import {schema} from './schema.js'
 
+const own = {}.hasOwnProperty
+
 // Schema for `minimist`.
-var minischema = {
+const minischema = {
   unknown: handleUnknownArgument,
   default: {},
   alias: {},
@@ -21,12 +23,9 @@ while (++index < schema.length) {
 
 // Parse CLI options.
 export function options(flags, configuration) {
-  var extension = configuration.extensions[0]
-  var name = configuration.name
-  var config = toCamelCase(minimist(flags, minischema))
-  var help
-  var ext
-  var report
+  const extension = configuration.extensions[0]
+  const name = configuration.name
+  const config = toCamelCase(minimist(flags, minischema))
   let index = -1
 
   while (++index < schema.length) {
@@ -36,10 +35,9 @@ export function options(flags, configuration) {
     }
   }
 
-  ext = commaSeparated(config.ext)
-  report = reporter(config.report)
-
-  help = [
+  const ext = commaSeparated(config.ext)
+  const report = reporter(config.report)
+  const help = [
     inspectAll(schema),
     '',
     'Examples:',
@@ -94,7 +92,7 @@ export function options(flags, configuration) {
 }
 
 function addEach(option) {
-  var value = option.default
+  const value = option.default
 
   minischema.default[option.long] = value === undefined ? null : value
 
@@ -114,7 +112,7 @@ function commaSeparated(value) {
 
 // Parse `plugins`.
 function plugins(value) {
-  var result = {}
+  const result = {}
   const normalized = normalize(value).map((d) => splitOptions(d))
   let index = -1
 
@@ -128,9 +126,9 @@ function plugins(value) {
 
 // Parse `reporter`: only one is accepted.
 function reporter(value) {
-  var all = normalize(value)
+  const all = normalize(value)
     .map((d) => splitOptions(d))
-    .map(function (value) {
+    .map((value) => {
       return [value[0], value[1] ? parseConfig(value[1], {}) : null]
     })
 
@@ -139,7 +137,7 @@ function reporter(value) {
 
 // Parse `settings`.
 function settings(value) {
-  var cache = {}
+  const cache = {}
   const normalized = normalize(value)
   let index = -1
 
@@ -152,8 +150,8 @@ function settings(value) {
 
 // Parse configuration.
 function parseConfig(flags, cache) {
-  var flag
-  var message
+  let flag
+  let message
 
   try {
     flags = toCamelCase(parseJSON(flags))
@@ -165,7 +163,9 @@ function parseConfig(flags, cache) {
   }
 
   for (flag in flags) {
-    cache[flag] = flags[flag]
+    if (own.call(flags, flag)) {
+      cache[flag] = flags[flag]
+    }
   }
 
   return cache
@@ -208,8 +208,8 @@ function inspectAll(options) {
 
 // Inspect one `option`.
 function inspect(option) {
-  var description = option.description
-  var long = option.long
+  let description = option.description
+  let long = option.long
 
   if (option.default === true || option.truelike) {
     description += ' (on by default)'
@@ -253,18 +253,20 @@ function splitList(value) {
 
 // Transform the keys on an object to camel-case, recursivly.
 function toCamelCase(object) {
-  var result = {}
-  var value
-  var key
+  const result = {}
+  let value
+  let key
 
   for (key in object) {
-    value = object[key]
+    if (own.call(object, key)) {
+      value = object[key]
 
-    if (value && typeof value === 'object' && !('length' in value)) {
-      value = toCamelCase(value)
-    }
+      if (value && typeof value === 'object' && !('length' in value)) {
+        value = toCamelCase(value)
+      }
 
-    result[camelcase(key)] = value
+      result[camelcase(key)] = value
+    }
   }
 
   return result

package.json

@@ -71,12 +71,6 @@
   },
   "xo": {
     "prettier": true,
-    "rules": {
-      "no-var": "off",
-      "prefer-arrow-callback": "off",
-      "unicorn/no-fn-reference-in-iterator": "off",
-      "guard-for-in": "off"
-    },
     "ignores": [
       "**/*.ts"
     ]