Refactor code-style

Author: wooorm

doc/options.md

@@ -187,7 +187,7 @@ import {engine} from 'unified-engine'
 import {remark} from 'remark'
 import remarkPresetLintRecommended from 'remark-preset-lint-recommended'
 
-var streamIn = new PassThrough()
+const streamIn = new PassThrough()
 
 engine(
   {
@@ -238,7 +238,7 @@ import {engine} from 'unified-engine'
 import {remark} from 'remark'
 import remarkPresetLintRecommended from 'remark-preset-lint-recommended'
 
-var streamIn = new PassThrough()
+const streamIn = new PassThrough()
 
 engine(
   {

lib/configuration.js

@@ -1,17 +1,17 @@
 import path from 'path'
-import yaml from 'js-yaml'
-import json from 'parse-json'
+import jsYaml from 'js-yaml'
+import parseJson from 'parse-json'
 import createDebug from 'debug'
 import loadPlugin from 'load-plugin'
-import plain from 'is-plain-obj'
+import isPlainObj from 'is-plain-obj'
 import fault from 'fault'
 import {FindUp} from './find-up.js'
 
-var debug = createDebug('unified-engine:configuration')
+const debug = createDebug('unified-engine:configuration')
 
-var own = {}.hasOwnProperty
+const own = {}.hasOwnProperty
 
-var loaders = {
+const loaders = {
   '.json': loadJson,
   '.cjs': loadScriptOrModule,
   '.mjs': loadScriptOrModule,
@@ -20,12 +20,12 @@ var loaders = {
   '.yml': loadYaml
 }
 
-var defaultLoader = loadJson
+const defaultLoader = loadJson
 
 Configuration.prototype.load = load
 
 export function Configuration(options) {
-  var names = []
+  const names = []
 
   this.cwd = options.cwd
   this.packageField = options.packageField
@@ -58,13 +58,13 @@ export function Configuration(options) {
     filePath: options.rcPath,
     cwd: options.cwd,
     detect: options.detectConfig,
-    names: names,
+    names,
     create: this.create
   })
 }
 
 function load(filePath, callback) {
-  var self = this
+  const self = this
 
   self.findUp.load(filePath || path.resolve(this.cwd, 'stdin.js'), done)
 
@@ -73,18 +73,18 @@ function load(filePath, callback) {
       return callback(error, file)
     }
 
-    self.create().then(function (result) {
+    self.create().then((result) => {
       callback(null, result)
     }, callback)
   }
 }
 
 async function create(buf, filePath) {
-  var self = this
-  var fn = (filePath && loaders[path.extname(filePath)]) || defaultLoader
-  var options = {prefix: self.pluginPrefix, cwd: self.cwd}
-  var result = {settings: {}, plugins: []}
-  var contents
+  const self = this
+  const fn = (filePath && loaders[path.extname(filePath)]) || defaultLoader
+  const options = {prefix: self.pluginPrefix, cwd: self.cwd}
+  const result = {settings: {}, plugins: []}
+  let contents
 
   if (filePath) {
     contents = await fn.apply(self, arguments)
@@ -129,11 +129,11 @@ function loadScriptOrModule(_, filePath) {
 }
 
 function loadYaml(buf, filePath) {
-  return yaml.safeLoad(buf, {filename: path.basename(filePath)})
+  return jsYaml.safeLoad(buf, {filename: path.basename(filePath)})
 }
 
 function loadJson(buf, filePath) {
-  var result = json(buf, filePath)
+  let result = parseJson(buf, filePath)
 
   if (path.basename(filePath) === 'package.json') {
     result = result[this.packageField]
@@ -152,7 +152,7 @@ async function merge(target, raw, options) {
   return target
 
   async function addPreset(result) {
-    var plugins = result.plugins
+    const plugins = result.plugins
 
     if (plugins === null || plugins === undefined) {
       // Empty.
@@ -168,11 +168,10 @@ async function merge(target, raw, options) {
   }
 
   async function addEach(result) {
-    var index = -1
-    var value
+    let index = -1
 
     while (++index < result.length) {
-      value = result[index]
+      const value = result[index]
 
       // Keep order sequential instead of parallel.
       // eslint-disable-next-line no-await-in-loop
@@ -183,12 +182,14 @@ async function merge(target, raw, options) {
   }
 
   async function addIn(result) {
-    var key
+    let key
 
     for (key in result) {
-      // Keep order sequential instead of parallel.
-      // eslint-disable-next-line no-await-in-loop
-      await use(key, result[key])
+      if (own.call(result, key)) {
+        // Keep order sequential instead of parallel.
+        // eslint-disable-next-line no-await-in-loop
+        await use(key, result[key])
+      }
     }
   }
 
@@ -203,8 +204,8 @@ async function merge(target, raw, options) {
   }
 
   async function addModule(id, value) {
-    var fp = loadPlugin.resolve(id, {cwd: options.root, prefix: options.prefix})
-    var result
+    let fp = loadPlugin.resolve(id, {cwd: options.root, prefix: options.prefix})
+    let result
 
     if (fp) {
       result = await loadFromAbsolutePath(fp, options.root)
@@ -219,7 +220,7 @@ async function merge(target, raw, options) {
             Object.assign({}, options, {root: path.dirname(fp)})
           )
         }
-      } catch (_) {
+      } catch {
         throw fault(
           'Error: Expected preset or plugin, not %s, at `%s`',
           result,
@@ -236,7 +237,7 @@ async function merge(target, raw, options) {
   }
 
   function addPlugin(result, value) {
-    var entry = find(target.plugins, result)
+    const entry = find(target.plugins, result)
 
     if (entry) {
       reconfigure(entry, value)
@@ -247,15 +248,15 @@ async function merge(target, raw, options) {
 }
 
 function reconfigure(entry, value) {
-  if (plain(entry[1]) && plain(value)) {
+  if (isPlainObj(entry[1]) && isPlainObj(value)) {
     value = Object.assign({}, entry[1], value)
   }
 
   entry[1] = value
 }
 
 function find(entries, plugin) {
-  var index = -1
+  let index = -1
 
   while (++index < entries.length) {
     if (entries[index][0] === plugin) {
@@ -265,8 +266,8 @@ function find(entries, plugin) {
 }
 
 function failingModule(id, error) {
-  var cache = failingModule.cache || (failingModule.cache = {})
-  var submodule = own.call(cache, id) ? cache[id] : (cache[id] = fail)
+  const cache = failingModule.cache || (failingModule.cache = {})
+  const submodule = own.call(cache, id) ? cache[id] : (cache[id] = fail)
   return submodule
   function fail() {
     throw error