From b50be6aff34a739ca43de65f546e743d1a9975b9 Mon Sep 17 00:00:00 2001 From: Forrest L Norvell Date: Mon, 22 Jun 2015 22:18:52 -0700 Subject: src: make the npm source comply with `standard` This is a huge set of mostly mechanical changes. Going forward, all changes to the npm source base are expected to comply with `standard`, and it's been integrated into the test suite to enforce that. There are a few notes below about specific classes of changes that need to be handled specially for npm's code base. standard: "Expected error to be handled." `standard` only expects errors spelled "err" to be handled. `npm-registry-mock` never actually invokes its callback with an error, so in some cases I just changed it to be spelled "er" and called it good. standard: "Expected a "break" statement before 'case'." This behavior is actually on purpose, and I don't feel like rewriting the affected code right now (or, you know, ever). So I added code comments disabling the checks in the three applicable changes. standard: "x is a function." Rebinding functions created via declarations (as opposed to expressions) is a no-no? PR-URL: https://github.com/npm/npm/pull/8668 --- lib/prune.js | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'lib/prune.js') diff --git a/lib/prune.js b/lib/prune.js index 2f27fdf32..46373742f 100644 --- a/lib/prune.js +++ b/lib/prune.js @@ -2,28 +2,28 @@ module.exports = prune -prune.usage = "npm prune [[<@scope>/]...] [--production]" +prune.usage = 'npm prune [[<@scope>/]...] [--production]' -var readInstalled = require("read-installed") - , npm = require("./npm.js") - , path = require("path") - , readJson = require("read-package-json") - , log = require("npmlog") +var readInstalled = require('read-installed') +var npm = require('./npm.js') +var path = require('path') +var readJson = require('read-package-json') +var log = require('npmlog') -prune.completion = require("./utils/completion/installed-deep.js") +prune.completion = require('./utils/completion/installed-deep.js') function prune (args, cb) { - //check if is a valid package.json file - var jsonFile = path.resolve(npm.dir, "..", "package.json" ) + // check if is a valid package.json file + var jsonFile = path.resolve(npm.dir, '..', 'package.json') readJson(jsonFile, log.warn, function (er) { if (er) return cb(er) next() }) - function next() { + function next () { var opt = { - depth: npm.config.get("depth"), - dev: !npm.config.get("production") || npm.config.get("dev") + depth: npm.config.get('depth'), + dev: !npm.config.get('production') || npm.config.get('dev') } readInstalled(npm.prefix, opt, function (er, data) { if (er) return cb(er) @@ -39,11 +39,9 @@ function prune_ (args, data, cb) { function prunables (args, data, seen) { var deps = data.dependencies || {} return Object.keys(deps).map(function (d) { - if (typeof deps[d] !== "object" - || seen.indexOf(deps[d]) !== -1) return null + if (typeof deps[d] !== 'object' || seen.indexOf(deps[d]) !== -1) return null seen.push(deps[d]) - if (deps[d].extraneous - && (args.length === 0 || args.indexOf(d) !== -1)) { + if (deps[d].extraneous && (args.length === 0 || args.indexOf(d) !== -1)) { var extra = deps[d] delete deps[d] return extra.path @@ -51,6 +49,6 @@ function prunables (args, data, seen) { return prunables(args, deps[d], seen) }).filter(function (d) { return d !== null }) .reduce(function FLAT (l, r) { - return l.concat(Array.isArray(r) ? r.reduce(FLAT,[]) : r) + return l.concat(Array.isArray(r) ? r.reduce(FLAT, []) : r) }, []) } -- cgit v1.2.3