retire 4.3.2 → 4.3.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.3.4]
+
+### Bugfix
+
+- Bug: `--jspath` is not being honoured
+
+## [4.3.3]
+
+### Bugfix
+
+- Fixes #420 where ignore was not honoured
+
 ## [4.3.2]
 
 ### Bugfix

package/lib/cli.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils = __importStar(require("./utils"));
 const commander_1 = require("commander");
@@ -56,8 +56,8 @@ const prg = commander_1.program
     .version(retire.version)
     .option('-v, --verbose', 'Show identified files (by default only vulnerable files are shown)')
     .option('-c, --nocache', "Don't use local cache")
-    .option('--jspath <path>', 'Folder to scan for javascript files')
-    .option('--path <path>', 'Folder to scan for both')
+    .option('--jspath <path>', 'Folder to scan for javascript files (deprecated)')
+    .option('--path <path>', 'Folder to scan for javascript files')
     .option('--jsrepo <path|url>', "Local or internal version of repo. Can be multiple comma separated. Default: 'central')")
     .option('--cachedir <path>', 'Path to use for local cache instead of /tmp/.retire-cache')
     .option('--proxy <url>', 'Proxy url (http://some.host:8080)')
@@ -79,7 +79,7 @@ const jsrepolocation = ((_a = prg.jsrepo) !== null && _a !== void 0 ? _a : "'cen
     .split(',')
     .map((x) => x === "'central'" ? 'https://raw.githubusercontent.com/RetireJS/retire.js/master/repository/jsrepository.json' : x);
 const ignorefile = (_b = prg.ignoreFile) !== null && _b !== void 0 ? _b : defaultIgnoreFiles.filter((x) => fs_1.default.existsSync(x))[0];
-const scanpath = (_c = prg.path) !== null && _c !== void 0 ? _c : '.';
+const scanpath = (_d = (_c = prg.path) !== null && _c !== void 0 ? _c : prg.jspath) !== null && _d !== void 0 ? _d : '.';
 const log = reporting.open({
     colors: !!prg.colors,
     colorwarn,
@@ -89,23 +89,23 @@ const log = reporting.open({
     path: scanpath,
     verbose: !!prg.verbose,
 });
-const severity = (_d = prg.severity) !== null && _d !== void 0 ? _d : 'none';
+const severity = (_e = prg.severity) !== null && _e !== void 0 ? _e : 'none';
 if (!(severity in types_1.severityLevels)) {
     exitWithError(`Error: Invalid severity level (${severity}). Valid levels are: ${Object.keys(types_1.severityLevels).join(', ')}`);
 }
 const config = {
     path: scanpath,
     ignore: {
-        paths: (_g = (_f = (_e = prg.ignore) === null || _e === void 0 ? void 0 : _e.split(',')) === null || _f === void 0 ? void 0 : _f.map((x) => path_1.default.resolve(x))) !== null && _g !== void 0 ? _g : [],
-        pathsAsString: [],
+        paths: [],
+        pathsAsString: (_h = (_g = (_f = prg.ignore) === null || _f === void 0 ? void 0 : _f.split(',')) === null || _g === void 0 ? void 0 : _g.map((x) => path_1.default.resolve(x))) !== null && _h !== void 0 ? _h : [],
         descriptors: [],
     },
     colorwarn,
     nocache: prg.nocache ? true : false,
-    cachedir: (_h = prg.cachedir) !== null && _h !== void 0 ? _h : path_1.default.resolve(os_1.default.tmpdir(), '.retire-cache/'),
+    cachedir: (_j = prg.cachedir) !== null && _j !== void 0 ? _j : path_1.default.resolve(os_1.default.tmpdir(), '.retire-cache/'),
     log: log,
     severity: severity,
-    exitwith: (_j = prg.exitwith) !== null && _j !== void 0 ? _j : 13,
+    exitwith: (_k = prg.exitwith) !== null && _k !== void 0 ? _k : 13,
     includeOsv: !!prg.includeOsv,
     verbose: !!prg.verbose,
     proxy: prg.proxy,
@@ -146,7 +146,7 @@ if (ignorefile) {
         catch (e) {
             exitWithError(`Error: Invalid ignore file: ${ignorefile}`);
         }
-        const ignoredPaths = (_m = (_l = (_k = config.ignore.descriptors) === null || _k === void 0 ? void 0 : _k.map((x) => ('path' in x ? x.path : undefined))) === null || _l === void 0 ? void 0 : _l.filter((x) => x != undefined)) !== null && _m !== void 0 ? _m : [];
+        const ignoredPaths = (_o = (_m = (_l = config.ignore.descriptors) === null || _l === void 0 ? void 0 : _l.map((x) => ('path' in x ? x.path : undefined))) === null || _m === void 0 ? void 0 : _m.filter((x) => x != undefined)) !== null && _o !== void 0 ? _o : [];
         config.ignore.pathsAsString = config.ignore.pathsAsString.concat(ignoredPaths);
     }
     else {

package/lib/retire.js

@@ -4,7 +4,7 @@
  */
 
 var exports = exports || {};
-exports.version = '4.3.2';
+exports.version = '4.3.4';
 
 function isDefined(o) {
   return typeof o !== 'undefined';

package/package.json

@@ -2,7 +2,7 @@
   "author": "Erlend Oftedal <erlend@oftedal.no>",
   "name": "retire",
   "description": "Retire is a tool for detecting use of vulnerable libraries",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",