Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorForrest L Norvell <forrest@npmjs.com>2015-06-23 08:18:52 +0300
committerRebecca Turner <me@re-becca.org>2015-06-26 03:27:33 +0300
commitb50be6aff34a739ca43de65f546e743d1a9975b9 (patch)
tree3153fd3a271245b8a05a9be196286fbe31fc9d44 /lib/utils/completion/installed-shallow.js
parent7c5ebe0552b7b5d0cdca34d28c4f16fe794ff2ff (diff)
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
Diffstat (limited to 'lib/utils/completion/installed-shallow.js')
-rw-r--r--lib/utils/completion/installed-shallow.js54
1 files changed, 31 insertions, 23 deletions
diff --git a/lib/utils/completion/installed-shallow.js b/lib/utils/completion/installed-shallow.js
index 8d64649d5..bf692fede 100644
--- a/lib/utils/completion/installed-shallow.js
+++ b/lib/utils/completion/installed-shallow.js
@@ -1,31 +1,39 @@
module.exports = installedShallow
-var npm = require("../../npm.js")
- , fs = require("graceful-fs")
- , path = require("path")
- , readJson = require("read-package-json")
- , asyncMap = require("slide").asyncMap
+var npm = require('../../npm.js')
+var fs = require('graceful-fs')
+var path = require('path')
+var readJson = require('read-package-json')
+var asyncMap = require('slide').asyncMap
function installedShallow (opts, filter, cb) {
- if (typeof cb !== "function") cb = filter, filter = null
+ if (typeof cb !== 'function') {
+ cb = filter
+ filter = null
+ }
var conf = opts.conf
- , args = conf.argv.remain
+ var args = conf.argv.remain
if (args.length > 3) return cb()
var local
- , global
- , localDir = npm.dir
- , globalDir = npm.globalDir
- if (npm.config.get("global")) local = [], next()
- else fs.readdir(localDir, function (er, pkgs) {
- local = (pkgs || []).filter(function (p) {
- return p.charAt(0) !== "."
- })
+ var global
+ var localDir = npm.dir
+ var globalDir = npm.globalDir
+ if (npm.config.get('global')) {
+ local = []
next()
- })
+ } else {
+ fs.readdir(localDir, function (er, pkgs) {
+ local = (pkgs || []).filter(function (p) {
+ return p.charAt(0) !== '.'
+ })
+ next()
+ })
+ }
+
fs.readdir(globalDir, function (er, pkgs) {
global = (pkgs || []).filter(function (p) {
- return p.charAt(0) !== "."
+ return p.charAt(0) !== '.'
})
next()
})
@@ -37,7 +45,7 @@ function installedShallow (opts, filter, cb) {
function filterInstalled (local, global, filter, cb) {
var fl
- , fg
+ var fg
if (!filter) {
fl = local
@@ -46,7 +54,7 @@ function filterInstalled (local, global, filter, cb) {
}
asyncMap(local, function (p, cb) {
- readJson(path.join(npm.dir, p, "package.json"), function (er, d) {
+ readJson(path.join(npm.dir, p, 'package.json'), function (er, d) {
if (!d || !filter(d)) return cb(null, [])
return cb(null, d.name)
})
@@ -57,7 +65,7 @@ function filterInstalled (local, global, filter, cb) {
var globalDir = npm.globalDir
asyncMap(global, function (p, cb) {
- readJson(path.join(globalDir, p, "package.json"), function (er, d) {
+ readJson(path.join(globalDir, p, 'package.json'), function (er, d) {
if (!d || !filter(d)) return cb(null, [])
return cb(null, d.name)
})
@@ -68,12 +76,12 @@ function filterInstalled (local, global, filter, cb) {
function next () {
if (!fg || !fl) return
- if (!npm.config.get("global")) {
+ if (!npm.config.get('global')) {
fg = fg.map(function (g) {
- return [g, "-g"]
+ return [g, '-g']
})
}
- console.error("filtered", fl, fg)
+ console.error('filtered', fl, fg)
return cb(null, fl.concat(fg))
}
}