np-audit 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/cli.js +2 -5
- package/src/scanner.js +66 -3
package/package.json
CHANGED
package/src/cli.js
CHANGED
|
@@ -35,10 +35,6 @@ const HELP = `
|
|
|
35
35
|
parallelFetches Concurrent downloads (default: ${DEFAULT_CONFIG.parallelFetches})
|
|
36
36
|
skipScopes Array of @scopes to skip
|
|
37
37
|
skipPackages Array of package names to skip
|
|
38
|
-
|
|
39
|
-
Install:
|
|
40
|
-
npm install -g np-audit
|
|
41
|
-
npx np-audit scan
|
|
42
38
|
`;
|
|
43
39
|
|
|
44
40
|
function parseArgs(argv) {
|
|
@@ -60,7 +56,8 @@ function parseArgs(argv) {
|
|
|
60
56
|
case '--json': flags.json = true; break;
|
|
61
57
|
case '--no-dev': flags.noDev = true; break;
|
|
62
58
|
case '--verbose': flags.verbose = true; break;
|
|
63
|
-
case '--version':
|
|
59
|
+
case '--version':
|
|
60
|
+
case '-v': flags.version = true; break;
|
|
64
61
|
case '--help':
|
|
65
62
|
case '-h': flags.help = true; break;
|
|
66
63
|
default:
|
package/src/scanner.js
CHANGED
|
@@ -26,9 +26,15 @@ async function scan(opts) {
|
|
|
26
26
|
if (singlePackage) {
|
|
27
27
|
packages = await resolveSinglePackage(singlePackage, config);
|
|
28
28
|
} else {
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
const lockPath = path.join(cwd, 'package-lock.json');
|
|
30
|
+
if (fs.existsSync(lockPath)) {
|
|
31
|
+
const parsed = parseLockfile(cwd);
|
|
32
|
+
packages = parsed.packages;
|
|
33
|
+
lockfileVersion = parsed.lockfileVersion;
|
|
34
|
+
} else {
|
|
35
|
+
// No lockfile — resolve from package.json
|
|
36
|
+
packages = await resolveFromPackageJson(cwd, config, noDev);
|
|
37
|
+
}
|
|
32
38
|
}
|
|
33
39
|
|
|
34
40
|
// Apply skip filters
|
|
@@ -253,6 +259,63 @@ function extractSemver(range) {
|
|
|
253
259
|
return null;
|
|
254
260
|
}
|
|
255
261
|
|
|
262
|
+
/**
|
|
263
|
+
* Resolve dependencies from package.json when no lockfile exists.
|
|
264
|
+
* @param {string} cwd
|
|
265
|
+
* @param {object} config
|
|
266
|
+
* @param {boolean} noDev
|
|
267
|
+
* @returns {Promise<PackageDescriptor[]>}
|
|
268
|
+
*/
|
|
269
|
+
async function resolveFromPackageJson(cwd, config, noDev) {
|
|
270
|
+
const pkgPath = path.join(cwd, 'package.json');
|
|
271
|
+
if (!fs.existsSync(pkgPath)) {
|
|
272
|
+
throw new Error(`package.json not found in ${cwd}`);
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
let pkgJson;
|
|
276
|
+
try {
|
|
277
|
+
pkgJson = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
|
|
278
|
+
} catch (err) {
|
|
279
|
+
throw new Error(`Failed to parse package.json: ${err.message}`);
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
const deps = { ...pkgJson.dependencies };
|
|
283
|
+
if (!noDev && pkgJson.devDependencies) {
|
|
284
|
+
Object.assign(deps, pkgJson.devDependencies);
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
const packages = [];
|
|
288
|
+
const { fetchJSON } = require('./fetcher');
|
|
289
|
+
|
|
290
|
+
for (const [name, range] of Object.entries(deps)) {
|
|
291
|
+
const version = extractSemver(range);
|
|
292
|
+
if (!version) continue;
|
|
293
|
+
|
|
294
|
+
try {
|
|
295
|
+
const meta = await fetchJSON(`${config.registry}/${encodeURIComponent(name)}`, { timeout: config.timeout });
|
|
296
|
+
const versionData = meta.versions && meta.versions[version];
|
|
297
|
+
if (!versionData) continue;
|
|
298
|
+
|
|
299
|
+
packages.push({
|
|
300
|
+
name,
|
|
301
|
+
version,
|
|
302
|
+
resolved: versionData.dist && versionData.dist.tarball,
|
|
303
|
+
integrity: versionData.dist && versionData.dist.integrity || '',
|
|
304
|
+
hasInstallScript: !!(versionData.scripts &&
|
|
305
|
+
(versionData.scripts.preinstall || versionData.scripts.postinstall || versionData.scripts.install)),
|
|
306
|
+
dev: !!(pkgJson.devDependencies && pkgJson.devDependencies[name]),
|
|
307
|
+
optional: false,
|
|
308
|
+
inBundle: false,
|
|
309
|
+
link: false,
|
|
310
|
+
});
|
|
311
|
+
} catch {
|
|
312
|
+
// Skip packages we can't fetch metadata for
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
return packages;
|
|
317
|
+
}
|
|
318
|
+
|
|
256
319
|
/**
|
|
257
320
|
* Resolve a single package's dependency tree via the npm registry.
|
|
258
321
|
* @param {string} packageSpec e.g. "express" or "express@4.18.0"
|