Refactor code-style

Author: wooorm

index.js

@@ -1,2 +1,2 @@
 'use strict'
-module.exports = require('./lib')
+module.exports = require('./lib/index.js')

lib/index.js

@@ -4,7 +4,7 @@ var stream = require('stream')
 var engine = require('unified-engine')
 var chalk = require('chalk')
 var chokidar = require('chokidar')
-var options = require('./options')
+var options = require('./options.js')
 
 module.exports = start
 
@@ -88,10 +88,10 @@ function start(cliConfig) {
   engine(config, done)
 
   // Handle complete run.
-  function done(err, code, context) {
-    if (err) {
+  function done(error, code, context) {
+    if (error) {
       clean()
-      fail(err)
+      fail(error)
     } else {
       exitStatus = code
 
@@ -141,10 +141,10 @@ function start(cliConfig) {
 }
 
 // Print an error, optionally with stack.
-function fail(err, pretty) {
+function fail(error, pretty) {
   var message =
-    (pretty ? String(err).trim() : err.stack) ||
-    /* istanbul ignore next - Old versions of Node */ err
+    (pretty ? String(error).trim() : error.stack) ||
+    /* istanbul ignore next - Old versions of Node */ error
 
   exitStatus = 1
 

lib/options.js

@@ -5,7 +5,7 @@ var camelcase = require('camelcase')
 var minimist = require('minimist')
 var json5 = require('json5')
 var fault = require('fault')
-var schema = require('./schema')
+var schema = require('./schema.json')
 
 module.exports = options
 
@@ -18,7 +18,10 @@ var minischema = {
   boolean: []
 }
 
-schema.forEach(addEach)
+let index = -1
+while (++index < schema.length) {
+  addEach(schema[index])
+}
 
 // Parse CLI options.
 function options(flags, configuration) {
@@ -28,12 +31,14 @@ function options(flags, configuration) {
   var help
   var ext
   var report
+  let index = -1
 
-  schema.forEach(function (option) {
+  while (++index < schema.length) {
+    const option = schema[index]
     if (option.type === 'string' && config[option.long] === '') {
       throw fault('Missing value:%s', inspect(option).join(' '))
     }
-  })
+  }
 
   ext = commaSeparated(config.ext)
   report = reporter(config.report)
@@ -108,26 +113,27 @@ function addEach(option) {
 
 // Parse `extensions`.
 function commaSeparated(value) {
-  return flatten(normalize(value).map(splitList))
+  return flatten(normalize(value).map((d) => splitList(d)))
 }
 
 // Parse `plugins`.
 function plugins(value) {
   var result = {}
+  const normalized = normalize(value).map((d) => splitOptions(d))
+  let index = -1
 
-  normalize(value)
-    .map(splitOptions)
-    .forEach(function (value) {
-      result[value[0]] = value[1] ? parseConfig(value[1], {}) : null
-    })
+  while (++index < normalized.length) {
+    const value = normalized[index]
+    result[value[0]] = value[1] ? parseConfig(value[1], {}) : null
+  }
 
   return result
 }
 
 // Parse `reporter`: only one is accepted.
 function reporter(value) {
   var all = normalize(value)
-    .map(splitOptions)
+    .map((d) => splitOptions(d))
     .map(function (value) {
       return [value[0], value[1] ? parseConfig(value[1], {}) : null]
     })
@@ -138,10 +144,12 @@ function reporter(value) {
 // Parse `settings`.
 function settings(value) {
   var cache = {}
+  const normalized = normalize(value)
+  let index = -1
 
-  normalize(value).forEach(function (value) {
-    parseConfig(value, cache)
-  })
+  while (++index < normalized.length) {
+    parseConfig(normalized[index], cache)
+  }
 
   return cache
 }
@@ -180,36 +188,26 @@ function handleUnknownArgument(flag) {
   }
 
   // Short options, can be grouped.
-  flag.slice(1).split('').forEach(each)
-
-  function each(key) {
-    var length = schema.length
-    var index = -1
-    var option
-
-    while (++index < length) {
-      option = schema[index]
-
-      if (option.short === key) {
-        return
-      }
+  const found = flag.slice(1).split('')
+  const known = schema.filter((d) => d.short)
+  const knownKeys = new Set(known.map((d) => d.short))
+  let index = -1
+
+  while (++index < found.length) {
+    const key = found[index]
+    if (!knownKeys.has(key)) {
+      throw fault(
+        'Unknown short option `-%s`, expected:\n%s',
+        key,
+        inspectAll(known)
+      )
     }
-
-    throw fault(
-      'Unknown short option `-%s`, expected:\n%s',
-      key,
-      inspectAll(schema.filter(short))
-    )
-  }
-
-  function short(option) {
-    return option.short
   }
 }
 
 // Inspect all `options`.
 function inspectAll(options) {
-  return table(options.map(inspect))
+  return table(options.map((d) => inspect(d)))
 }
 
 // Inspect one `option`.
@@ -240,7 +238,7 @@ function normalize(value) {
     return [value]
   }
 
-  return flatten(value.map(normalize))
+  return flatten(value.map((d) => normalize(d)))
 }
 
 // Flatten `values`.

package.json

@@ -52,7 +52,7 @@
     "touch": "^3.0.0",
     "unified": "^9.0.0",
     "vfile-reporter-json": "^2.0.0",
-    "xo": "^0.36.0"
+    "xo": "^0.38.0"
   },
   "scripts": {
     "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",

test/fixtures/example/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 'use strict'
 
-var start = require('../../..')
-var config = require('../config')
-var processor = require('../processor')
+var start = require('../../../index.js')
+var config = require('../config.json')
+var processor = require('../processor.js')
 
 start(Object.assign({}, config, {cwd: __dirname, processor: processor}))

test/fixtures/plugins/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 'use strict'
 
-var start = require('../../..')
-var config = require('../config')
-var processor = require('../processor')
+var start = require('../../../index.js')
+var config = require('../config.json')
+var processor = require('../processor.js')
 
 start(
   Object.assign({}, config, {

test/fixtures/settings/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 'use strict'
 
-var start = require('../../..')
-var config = require('../config')
-var processor = require('../processor')
+var start = require('../../../index.js')
+var config = require('../config.json')
+var processor = require('../processor.js')
 
 start(
   Object.assign({}, config, {

test/fixtures/uncaught-errors/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 'use strict'
 
-var start = require('../../..')
-var config = require('../config')
-var processor = require('../processor')
+var start = require('../../../index.js')
+var processor = require('../processor.js')
+var config = require('../config.json')
 
 start(
   Object.assign({}, config, {

test/index.js

@@ -16,12 +16,6 @@ var unlink = fs.unlinkSync
 
 var fixtures = join(__dirname, 'fixtures')
 
-var helpFlags = ['-h', '--help']
-var versionFlags = ['-v', '--version']
-var extFlags = ['-e', '--ext']
-var settingsFlags = ['-s', '--setting']
-var useFlags = ['-u', '--use']
-
 var cwd = join(fixtures, 'example')
 var bin = join(cwd, 'cli.js')
 
@@ -176,7 +170,10 @@ test('unified-args', function (t) {
     }
   })
 
-  helpFlags.forEach(function (flag) {
+  helpFlag('-h')
+  helpFlag('--help')
+
+  function helpFlag(flag) {
     t.test('should show help on `' + flag + '`', function (t) {
       var expected = read(join(cwd, 'HELP'), 'utf8').replace(/\r/g, '').trim()
 
@@ -192,9 +189,12 @@ test('unified-args', function (t) {
         )
       }
     })
-  })
+  }
 
-  versionFlags.forEach(function (flag) {
+  versionFlag('-v')
+  versionFlag('--version')
+
+  function versionFlag(flag) {
     t.test('should show help on `' + flag + '`', function (t) {
       t.plan(1)
 
@@ -208,7 +208,7 @@ test('unified-args', function (t) {
         )
       }
     })
-  })
+  }
 
   t.test('should honour `--color`', function (t) {
     var expected =
@@ -243,7 +243,10 @@ test('unified-args', function (t) {
     }
   })
 
-  extFlags.forEach(function (flag) {
+  extFlag('-e')
+  extFlag('--ext')
+
+  function extFlag(flag) {
     t.test('should honour `' + flag + '`', function (t) {
       var expected = [
         'alpha.text: no issues found',
@@ -304,9 +307,12 @@ test('unified-args', function (t) {
         )
       }
     })
-  })
+  }
+
+  settingsFlag('-s')
+  settingsFlag('--setting')
 
-  settingsFlags.forEach(function (flag) {
+  function settingsFlag(flag) {
     t.test('should catch syntax errors in `' + flag + '`', function (t) {
       var expected =
         "Error: Cannot parse `foo:bar` as JSON: JSON5: invalid character 'b' at 1:6"
@@ -341,7 +347,7 @@ test('unified-args', function (t) {
         )
       }
     })
-  })
+  }
 
   t.test('shouldn’t fail on property-like settings', function (t) {
     var expected = '{"foo":"https://example.com"}'
@@ -361,7 +367,10 @@ test('unified-args', function (t) {
     }
   })
 
-  useFlags.forEach(function (flag) {
+  useFlag('-u')
+  useFlag('--use')
+
+  function useFlag(flag) {
     t.test('should load a plugin with `' + flag + '`', function (t) {
       var bin = join(fixtures, 'plugins', 'cli.js')
 
@@ -416,7 +425,7 @@ test('unified-args', function (t) {
         )
       }
     })
-  })
+  }
 
   t.test('should honour `--report`', function (t) {
     var expected = JSON.stringify([