-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit introduces the `npm fund` command that lists all `funding` info provided by the installed dependencies of a given project. Notes on implementation: - `lib/utils/funding.js` Provides helpers to validate funding info and return a tree-shaped structure containing the funding data for all deps. - `lib/fund.js` Implements `npm fund <pkg>` command - Added tests - `npm install` mention of funding - `npm fund <pkg>` variations - unit tests for added `lib/utils` and `lib/install` helpers - Added docs for `npm fund`, `funding` `package.json` property - Fixed `lib/utils/open-url` to support `--json` config - Documented `unicode` on `npm install` docs - fix tests - fix planned tap tests - alternative solution to --no-browser arg - docs: moved fund docs to new location Refs: https://github.com/npm/rfcs/blob/2d2f00457ab19b3003eb6ac5ab3d250259fd5a81/accepted/0017-add-funding-support.md PR-URL: #273 Credit: @ruyadorno Close: #273 Reviewed-by: @darcyclarke
- Loading branch information
Showing
25 changed files
with
1,663 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
--- | ||
section: cli-commands | ||
title: npm-fund | ||
description: Retrieve funding information | ||
--- | ||
|
||
# npm-fund | ||
|
||
## Retrieve funding information | ||
|
||
### Synopsis | ||
|
||
```bash | ||
npm fund [<pkg>] | ||
``` | ||
|
||
### Description | ||
|
||
This command retrieves information on how to fund the dependencies of | ||
a given project. If no package name is provided, it will list all | ||
dependencies that are looking for funding in a tree-structure in which | ||
are listed the type of funding and the url to visit. If a package name | ||
is provided then it tries to open its funding url using the `--browser` | ||
config param. | ||
|
||
The list will avoid duplicated entries and will stack all packages | ||
that share the same type/url as a single entry. Given this nature the | ||
list is not going to have the same shape of the output from `npm ls`. | ||
|
||
### Configuration | ||
|
||
#### browser | ||
|
||
* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"` | ||
* Type: String | ||
|
||
The browser that is called by the `npm fund` command to open websites. | ||
|
||
#### json | ||
|
||
* Default: false | ||
* Type: Boolean | ||
|
||
Show information in JSON format. | ||
|
||
#### unicode | ||
|
||
* Type: Boolean | ||
* Default: true | ||
|
||
Whether to represent the tree structure using unicode characters. | ||
Set it to `false` in order to use all-ansi output. | ||
|
||
## See Also | ||
|
||
* [npm-docs](/cli-commands/npm-docs) | ||
* [npm-config](/cli-commands/npm-config) | ||
* [npm-install](/cli-commands/npm-install) | ||
* [npm-ls](/cli-commands/npm-ls) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -91,7 +91,7 @@ var cmdList = [ | |
'token', | ||
'profile', | ||
'audit', | ||
'support', | ||
'fund', | ||
'org', | ||
|
||
'help', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
'use strict' | ||
|
||
const path = require('path') | ||
|
||
const archy = require('archy') | ||
const figgyPudding = require('figgy-pudding') | ||
const readPackageTree = require('read-package-tree') | ||
|
||
const npm = require('./npm.js') | ||
const npmConfig = require('./config/figgy-config.js') | ||
const fetchPackageMetadata = require('./fetch-package-metadata.js') | ||
const computeMetadata = require('./install/deps.js').computeMetadata | ||
const readShrinkwrap = require('./install/read-shrinkwrap.js') | ||
const mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js') | ||
const output = require('./utils/output.js') | ||
const openUrl = require('./utils/open-url.js') | ||
const { getFundingInfo, validFundingUrl } = require('./utils/funding.js') | ||
|
||
const FundConfig = figgyPudding({ | ||
browser: {}, // used by ./utils/open-url | ||
global: {}, | ||
json: {}, | ||
unicode: {} | ||
}) | ||
|
||
module.exports = fundCmd | ||
|
||
const usage = require('./utils/usage') | ||
fundCmd.usage = usage( | ||
'fund', | ||
'npm fund [--json]', | ||
'npm fund [--browser] [[<@scope>/]<pkg>' | ||
) | ||
|
||
fundCmd.completion = function (opts, cb) { | ||
const argv = opts.conf.argv.remain | ||
switch (argv[2]) { | ||
case 'fund': | ||
return cb(null, []) | ||
default: | ||
return cb(new Error(argv[2] + ' not recognized')) | ||
} | ||
} | ||
|
||
function printJSON (fundingInfo) { | ||
return JSON.stringify(fundingInfo, null, 2) | ||
} | ||
|
||
// the human-printable version does some special things that turned out to | ||
// be very verbose but hopefully not hard to follow: we stack up items | ||
// that have a shared url/type and make sure they're printed at the highest | ||
// level possible, in that process they also carry their dependencies along | ||
// with them, moving those up in the visual tree | ||
function printHuman (fundingInfo, opts) { | ||
// mapping logic that keeps track of seen items in order to be able | ||
// to push all other items from the same type/url in the same place | ||
const seen = new Map() | ||
|
||
function seenKey ({ type, url } = {}) { | ||
return url ? String(type) + String(url) : null | ||
} | ||
|
||
function setStackedItem (funding, result) { | ||
const key = seenKey(funding) | ||
if (key && !seen.has(key)) seen.set(key, result) | ||
} | ||
|
||
function retrieveStackedItem (funding) { | ||
const key = seenKey(funding) | ||
if (key && seen.has(key)) return seen.get(key) | ||
} | ||
|
||
// --- | ||
|
||
const getFundingItems = (fundingItems) => | ||
Object.keys(fundingItems || {}).map((fundingItemName) => { | ||
// first-level loop, prepare the pretty-printed formatted data | ||
const fundingItem = fundingItems[fundingItemName] | ||
const { version, funding } = fundingItem | ||
const { type, url } = funding || {} | ||
|
||
const printableVersion = version ? `@${version}` : '' | ||
const printableType = type && { label: `type: ${funding.type}` } | ||
const printableUrl = url && { label: `url: ${funding.url}` } | ||
const result = { | ||
fundingItem, | ||
label: fundingItemName + printableVersion, | ||
nodes: [] | ||
} | ||
|
||
if (printableType) { | ||
result.nodes.push(printableType) | ||
} | ||
|
||
if (printableUrl) { | ||
result.nodes.push(printableUrl) | ||
} | ||
|
||
setStackedItem(funding, result) | ||
|
||
return result | ||
}).reduce((res, result) => { | ||
// recurse and exclude nodes that are going to be stacked together | ||
const { fundingItem } = result | ||
const { dependencies, funding } = fundingItem | ||
const items = getFundingItems(dependencies) | ||
const stackedResult = retrieveStackedItem(funding) | ||
items.forEach(i => result.nodes.push(i)) | ||
|
||
if (stackedResult && stackedResult !== result) { | ||
stackedResult.label += `, ${result.label}` | ||
items.forEach(i => stackedResult.nodes.push(i)) | ||
return res | ||
} | ||
|
||
res.push(result) | ||
|
||
return res | ||
}, []) | ||
|
||
const [ result ] = getFundingItems({ | ||
[fundingInfo.name]: { | ||
dependencies: fundingInfo.dependencies, | ||
funding: fundingInfo.funding, | ||
version: fundingInfo.version | ||
} | ||
}) | ||
|
||
return archy(result, '', { unicode: opts.unicode }) | ||
} | ||
|
||
function openFundingUrl (packageName, cb) { | ||
function getUrlAndOpen (packageMetadata) { | ||
const { funding } = packageMetadata | ||
const { type, url } = funding || {} | ||
const noFundingError = | ||
new Error(`No funding method available for: ${packageName}`) | ||
noFundingError.code = 'ENOFUND' | ||
const typePrefix = type ? `${type} funding` : 'Funding' | ||
const msg = `${typePrefix} available at the following URL` | ||
|
||
if (validFundingUrl(funding)) { | ||
openUrl(url, msg, cb) | ||
} else { | ||
throw noFundingError | ||
} | ||
} | ||
|
||
fetchPackageMetadata( | ||
packageName, | ||
'.', | ||
{ fullMetadata: true }, | ||
function (err, packageMetadata) { | ||
if (err) return cb(err) | ||
getUrlAndOpen(packageMetadata) | ||
} | ||
) | ||
} | ||
|
||
function fundCmd (args, cb) { | ||
const opts = FundConfig(npmConfig()) | ||
const dir = path.resolve(npm.dir, '..') | ||
const packageName = args[0] | ||
|
||
if (opts.global) { | ||
const err = new Error('`npm fund` does not support globals') | ||
err.code = 'EFUNDGLOBAL' | ||
throw err | ||
} | ||
|
||
if (packageName) { | ||
openFundingUrl(packageName, cb) | ||
return | ||
} | ||
|
||
readPackageTree(dir, function (err, tree) { | ||
if (err) { | ||
process.exitCode = 1 | ||
return cb(err) | ||
} | ||
|
||
readShrinkwrap.andInflate(tree, function () { | ||
const fundingInfo = getFundingInfo( | ||
mutateIntoLogicalTree.asReadInstalled( | ||
computeMetadata(tree) | ||
) | ||
) | ||
|
||
const print = opts.json | ||
? printJSON | ||
: printHuman | ||
|
||
output( | ||
print( | ||
fundingInfo, | ||
opts | ||
) | ||
) | ||
cb(err, tree) | ||
}) | ||
}) | ||
} |
Oops, something went wrong.