fix lintfix script, use flat ternaries

PR-URL: #1543
Credit: @isaacs
Close: #1543
Reviewed-by: @ruyadorno

Author: isaacs

.eslintrc.json

@@ -62,7 +62,7 @@
       "ArrayExpression": 1,
       "ObjectExpression": 1,
       "ImportDeclaration": 1,
-      "flatTernaryExpressions": false,
+      "flatTernaryExpressions": true,
       "ignoreComments": false,
       "ignoredNodes": ["TemplateLiteral *"]
     }],

lib/config/defaults.js

@@ -158,7 +158,7 @@ Object.defineProperty(exports, 'defaults', {
       globalconfig: path.resolve(globalPrefix, 'etc', 'npmrc'),
       'global-style': false,
       group: process.platform === 'win32' ? 0
-        : process.env.SUDO_GID || (process.getgid && process.getgid()),
+      : process.env.SUDO_GID || (process.getgid && process.getgid()),
       'ham-it-up': false,
       heading: 'npm',
       'if-present': false,

lib/config/flat-options.js

@@ -175,12 +175,12 @@ const flatOptions = npm => npm.flatOptions || Object.freeze({
   saveType: npm.config.get('save-optional') && npm.config.get('save-peer')
     ? 'peerOptional'
     : npm.config.get('save-optional') ? 'optional'
-      : npm.config.get('save-dev') ? 'dev'
-        : npm.config.get('save-peer') ? 'peer'
-          : npm.config.get('save-prod') ? 'prod'
-            : null,
+    : npm.config.get('save-dev') ? 'dev'
+    : npm.config.get('save-peer') ? 'peer'
+    : npm.config.get('save-prod') ? 'prod'
+    : null,
   savePrefix: npm.config.get('save-exact') ? ''
-    : npm.config.get('save-prefix'),
+  : npm.config.get('save-prefix'),
 
   // configs for npm-registry-fetch
   otp: npm.config.get('otp'),

lib/config/set-envs.js

@@ -16,7 +16,7 @@ const envVal = val => Array.isArray(val) ? val.join('\n\n') : val
 
 const sameConfigValue = (def, val) =>
   !Array.isArray(val) || !Array.isArray(def) ? def === val
-    : sameArrayValue(def, val)
+  : sameArrayValue(def, val)
 
 const sameArrayValue = (def, val) => {
   if (def.length !== val.length) {

lib/explore.js

@@ -51,7 +51,7 @@ const explore = async args => {
     output(`\nExploring ${cwd}\nType 'exit' or ^D when finished\n`)
   }
 
-  log.silly('explore', {sh, shellArgs, opts})
+  log.silly('explore', { sh, shellArgs, opts })
 
   // only noisily fail if non-interactive, but still keep exit code intact
   const proc = spawn(sh, shellArgs, opts)

lib/help-search.js

@@ -145,11 +145,11 @@ function searchFiles (args, files, cb) {
   results = results.sort(function (a, b) {
     return a.found.length > b.found.length ? -1
       : a.found.length < b.found.length ? 1
-        : a.totalHits > b.totalHits ? -1
-          : a.totalHits < b.totalHits ? 1
-            : a.lines.length > b.lines.length ? -1
-              : a.lines.length < b.lines.length ? 1
-                : 0
+      : a.totalHits > b.totalHits ? -1
+      : a.totalHits < b.totalHits ? 1
+      : a.lines.length > b.lines.length ? -1
+      : a.lines.length < b.lines.length ? 1
+      : 0
   })
 
   cb(null, results)

lib/help.js

@@ -102,7 +102,7 @@ function pickMan (mans, pref_) {
     var bn = b.match(nre)[1]
     return an === bn ? (a > b ? -1 : 1)
       : pref[an] < pref[bn] ? -1
-        : 1
+      : 1
   })
   return mans[0]
 }

lib/outdated.js

@@ -134,8 +134,8 @@ async function outdated_ (tree, deps, opts) {
 
     const type = edge.optional ? 'optionalDependencies'
       : edge.peer ? 'peerDependencies'
-        : edge.dev ? 'devDependencies'
-          : 'dependencies'
+      : edge.dev ? 'devDependencies'
+      : 'dependencies'
 
     // deps different from prod not currently
     // on disk are not included in the output

lib/repo.js

@@ -26,8 +26,8 @@ const getRepo = async pkg => {
   const r = mani.repository
   const rurl = !r ? null
     : typeof r === 'string' ? r
-      : typeof r === 'object' && typeof r.url === 'string' ? r.url
-        : null
+    : typeof r === 'object' && typeof r.url === 'string' ? r.url
+    : null
 
   if (!rurl) {
     throw Object.assign(new Error('no repository'), {

lib/utils/escape-arg.js

@@ -14,5 +14,5 @@ block, creates a new " quoted string with ' in it.  So, `foo'bar` becomes
 */
 
 module.exports = str => isWindows ? '"' + normalize(str) + '"'
-  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, `'"'"'`) + "'"
+  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, '\'"\'"\'') + "'"
   : str

lib/utils/escape-exec-path.js

@@ -17,5 +17,5 @@ const winQuote = str => !/ /.test(str) ? str : '"' + str + '"'
 const winEsc = str => normalize(str).split(/\\/).map(winQuote).join('\\')
 
 module.exports = str => isWindows ? winEsc(str)
-  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, `'"'"'`) + "'"
+  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, '\'"\'"\'') + "'"
   : str

lib/utils/hosted-git-info-from-manifest.js

@@ -6,8 +6,8 @@ module.exports = mani => {
   const r = mani.repository
   const rurl = !r ? null
     : typeof r === 'string' ? r
-      : typeof r === 'object' && typeof r.url === 'string' ? r.url
-        : null
+    : typeof r === 'object' && typeof r.url === 'string' ? r.url
+    : null
 
   // hgi returns undefined sometimes, but let's always return null here
   return (rurl && hostedGitInfo.fromUrl(rurl.replace(/^git\+/, ''))) || null

lib/utils/setup-log.js

@@ -19,11 +19,11 @@ module.exports = (config) => {
 
   const enableColorStderr = color === 'always' ? true
     : color === false ? false
-      : stderrTTY
+    : stderrTTY
 
   const enableColorStdout = color === 'always' ? true
     : color === false ? false
-      : stdoutTTY
+    : stdoutTTY
 
   if (enableColorStderr) {
     log.enableColor()

lib/utils/update-notifier.js

@@ -32,8 +32,8 @@ module.exports = (npm) => {
     const type = notifier.update.type
     const typec = !useColor ? type
       : type === 'major' ? chalk.red(type)
-        : type === 'minor' ? chalk.yellow(type)
-          : chalk.green(type)
+      : type === 'minor' ? chalk.yellow(type)
+      : chalk.green(type)
 
     const changelog = `https://github.com/npm/cli/releases/tag/v${latest}`
     notifier.notify({

package.json

@@ -286,7 +286,7 @@
     "sudotest": "sudo npm run test --",
     "sudotest:nocleanup": "sudo NO_TEST_CLEANUP=1 npm run test --",
     "posttest": "npm run lint",
-    "eslint": "eslint --",
+    "eslint": "eslint",
     "lint": "npm run eslint -- \"lib/**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "prelint": "rimraf test/npm_cache*"