snyk 1.1216.0 → 1.1217.0

package/dist/cli/245.index.js

@@ -10737,7 +10737,7 @@ function getConnectionOptions(connectionOptions) {
     return {
         ...connectionOptions,
         // Ensure requestId is set.
-        requestId: (_a = connectionOptions.requestId) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(),
+        requestId: (_a = connectionOptions.requestId) !== null && _a !== void 0 ? _a : uuid_1.v4(),
     };
 }
 function getAnalysisContext(analysisContext) {
@@ -10752,7 +10752,7 @@ async function pollAnalysis(options) {
     });
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        analysisResponse = await (0, http_1.getAnalysis)(options);
+        analysisResponse = await http_1.getAnalysis(options);
         if (analysisResponse.type === 'error') {
             return analysisResponse;
         }
@@ -10790,7 +10790,7 @@ async function analyzeBundle(options) {
 exports.analyzeBundle = analyzeBundle;
 function normalizeResultFiles(files, baseDir) {
     return Object.entries(files).reduce((obj, [path, positions]) => {
-        const filePath = (0, files_1.resolveBundleFilePath)(baseDir, path);
+        const filePath = files_1.resolveBundleFilePath(baseDir, path);
         obj[filePath] = positions;
         return obj;
     }, {});
@@ -10803,7 +10803,7 @@ async function analyzeFolders(options) {
     var _a, _b;
     const connectionOptions = getConnectionOptions(options.connection);
     const analysisContext = getAnalysisContext(options.analysisContext);
-    const fileBundle = await (0, bundles_1.createBundleFromFolders)({
+    const fileBundle = await bundles_1.createBundleFromFolders({
         ...connectionOptions,
         ...options.fileOptions,
         languages: options.languages,
@@ -10814,7 +10814,7 @@ async function analyzeFolders(options) {
         bundleHash: fileBundle.bundleHash,
         ...connectionOptions,
         ...options.analysisOptions,
-        shard: (0, files_1.calcHash)(fileBundle.baseDir),
+        shard: files_1.calcHash(fileBundle.baseDir),
         ...analysisContext,
     };
     let analysisResults;
@@ -10823,7 +10823,7 @@ async function analyzeFolders(options) {
     let reportResults;
     if (isReport && options.reportOptions) {
         // Analyze and upload bundle results.
-        const reportRes = await (0, report_1.reportBundle)({
+        const reportRes = await report_1.reportBundle({
             ...config,
             report: options.reportOptions,
         });
@@ -10931,9 +10931,9 @@ function mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles
         return obj;
     }, {});
     // expand relative file names to absolute ones only for legacy results
-    const changedFiles = [...limitToFiles, ...removedFiles].map(path => (0, files_1.resolveBundleFilePath)(baseDir, path));
+    const changedFiles = [...limitToFiles, ...removedFiles].map(path => files_1.resolveBundleFilePath(baseDir, path));
     const files = {
-        ...(0, lodash_omit_1.default)(oldAnalysisResults.files, changedFiles),
+        ...lodash_omit_1.default(oldAnalysisResults.files, changedFiles),
         ...newFiles,
     };
     return {
@@ -10943,12 +10943,12 @@ function mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles
     };
 }
 async function extendAnalysis(options) {
-    const { files, removedFiles } = await (0, files_1.prepareExtendingBundle)(options.fileBundle.baseDir, options.fileBundle.supportedFiles, options.fileBundle.fileIgnores, options.files, options.fileOptions.symlinksEnabled);
+    const { files, removedFiles } = await files_1.prepareExtendingBundle(options.fileBundle.baseDir, options.fileBundle.supportedFiles, options.fileBundle.fileIgnores, options.files, options.fileOptions.symlinksEnabled);
     if (!files.length && !removedFiles.length) {
         return null; // nothing to extend, just return null
     }
     // Extend remote bundle
-    const remoteBundle = await (0, bundles_1.remoteBundleFactory)({
+    const remoteBundle = await bundles_1.remoteBundleFactory({
         ...options.connection,
         bundleHash: options.fileBundle.bundleHash,
         baseDir: options.fileBundle.baseDir,
@@ -10966,7 +10966,7 @@ async function extendAnalysis(options) {
         bundleHash: remoteBundle.bundleHash,
         ...options.connection,
         ...options.analysisOptions,
-        shard: (0, files_1.calcHash)(fileBundle.baseDir),
+        shard: files_1.calcHash(fileBundle.baseDir),
         limitToFiles,
     });
     analysisResults = mergeBundleResults(options.analysisResults, analysisResults, limitToFiles, removedFiles, options.fileBundle.baseDir);
@@ -10980,7 +10980,7 @@ exports.extendAnalysis = extendAnalysis;
 async function analyzeScmProject(options) {
     const connectionOptions = getConnectionOptions(options.connection);
     const analysisContext = getAnalysisContext(options.analysisContext);
-    const { analysisResult: analysisResults, uploadResult: reportResults } = await (0, report_1.reportScm)({
+    const { analysisResult: analysisResults, uploadResult: reportResults } = await report_1.reportScm({
         ...connectionOptions,
         ...options.analysisOptions,
         ...options.reportOptions,
@@ -11016,9 +11016,9 @@ async function* prepareRemoteBundle(options) {
     let { bundleHash } = options;
     let cumulativeProgress = 0;
     emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
-    for (const chunkedFiles of (0, files_1.composeFilePayloads)(options.files)) {
+    for (const chunkedFiles of files_1.composeFilePayloads(options.files)) {
         const apiParams = {
-            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'extraHeaders', 'removedFiles', 'requestId', 'org']),
+            ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'extraHeaders', 'removedFiles', 'requestId', 'org']),
             files: chunkedFiles.reduce((d, f) => {
                 // deepcode ignore PrototypePollution: FP this is an internal code
                 d[f.bundlePath] = f.hash;
@@ -11027,11 +11027,11 @@ async function* prepareRemoteBundle(options) {
         };
         if (!bundleHash) {
             // eslint-disable-next-line no-await-in-loop
-            response = await (0, http_1.createBundle)(apiParams);
+            response = await http_1.createBundle(apiParams);
         }
         else {
             // eslint-disable-next-line no-await-in-loop
-            response = await (0, http_1.extendBundle)({ bundleHash, ...apiParams });
+            response = await http_1.extendBundle({ bundleHash, ...apiParams });
         }
         cumulativeProgress += chunkedFiles.length;
         emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
@@ -11053,7 +11053,7 @@ async function* prepareRemoteBundle(options) {
 async function uploadRemoteBundle(options) {
     let uploadedFiles = 0;
     emitter_1.emitter.uploadBundleProgress(0, options.files.length);
-    const apiParams = (0, lodash_pick_1.default)(options, [
+    const apiParams = lodash_pick_1.default(options, [
         'baseURL',
         'sessionToken',
         'source',
@@ -11064,10 +11064,10 @@ async function uploadRemoteBundle(options) {
     ]);
     const uploadFileChunks = async (bucketFiles) => {
         // Note: we specifically create __new__ isolated bundles here to faster files upload
-        const resp = await (0, http_1.createBundle)({
+        const resp = await http_1.createBundle({
             ...apiParams,
             files: bucketFiles.reduce((d, f) => {
-                d[f.bundlePath] = (0, lodash_pick_1.default)(f, ['hash', 'content']);
+                d[f.bundlePath] = lodash_pick_1.default(f, ['hash', 'content']);
                 return d;
             }, {}),
         });
@@ -11077,10 +11077,10 @@ async function uploadRemoteBundle(options) {
         }
     };
     const files = [];
-    for (const bucketFiles of (0, files_1.composeFilePayloads)(options.files)) {
+    for (const bucketFiles of files_1.composeFilePayloads(options.files)) {
         files.push(bucketFiles);
     }
-    await (0, p_map_1.default)(files, async (task) => await uploadFileChunks(task), {
+    await p_map_1.default(files, async (task) => await uploadFileChunks(task), {
         concurrency: constants_1.UPLOAD_CONCURRENCY,
     });
 }
@@ -11090,15 +11090,15 @@ async function fullfillRemoteBundle(options) {
     // Check remove bundle to make sure no missing files left
     let attempts = 0;
     let { remoteBundle } = options;
-    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']);
+    const connectionOptions = lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']);
     while (remoteBundle.missingFiles.length && attempts < (options.maxAttempts || constants_1.MAX_UPLOAD_ATTEMPTS)) {
-        const missingFiles = await (0, files_1.resolveBundleFiles)(options.baseDir, remoteBundle.missingFiles);
+        const missingFiles = await files_1.resolveBundleFiles(options.baseDir, remoteBundle.missingFiles);
         await uploadRemoteBundle({
             ...connectionOptions,
             bundleHash: remoteBundle.bundleHash,
             files: missingFiles,
         });
-        const bundleResponse = await (0, http_1.checkBundle)({ ...connectionOptions, bundleHash: remoteBundle.bundleHash });
+        const bundleResponse = await http_1.checkBundle({ ...connectionOptions, bundleHash: remoteBundle.bundleHash });
         if (bundleResponse.type === 'error') {
             throw new Error('Failed to get remote bundle');
         }
@@ -11110,7 +11110,7 @@ async function fullfillRemoteBundle(options) {
 }
 async function remoteBundleFactory(options) {
     let remoteBundle = null;
-    const baseOptions = (0, lodash_pick_1.default)(options, [
+    const baseOptions = lodash_pick_1.default(options, [
         'baseURL',
         'sessionToken',
         'source',
@@ -11119,7 +11119,7 @@ async function remoteBundleFactory(options) {
         'org',
         'extraHeaders',
     ]);
-    const bundleFactory = prepareRemoteBundle((0, lodash_omit_1.default)(options, ['baseDir']));
+    const bundleFactory = prepareRemoteBundle(lodash_omit_1.default(options, ['baseDir']));
     for await (const response of bundleFactory) {
         if (response.type === 'error') {
             throw response.error;
@@ -11141,7 +11141,7 @@ exports.remoteBundleFactory = remoteBundleFactory;
  */
 async function getSupportedFiles(baseURL, source, requestId, languages) {
     emitter_1.emitter.supportedFilesLoaded(null);
-    const resp = await (0, http_1.getFilters)(baseURL, source, undefined, requestId);
+    const resp = await http_1.getFilters(baseURL, source, undefined, requestId);
     if (resp.type === 'error') {
         throw resp.error;
     }
@@ -11186,16 +11186,16 @@ exports.createBundleFromFolders = createBundleFromFolders;
  */
 async function createBundleWithCustomFiles(options, supportedFiles) {
     // Scan for custom ignore rules
-    const fileIgnores = await (0, files_1.collectIgnoreRules)(options.paths, options.symlinksEnabled, options.defaultFileIgnores);
-    const baseDir = (0, files_1.determineBaseDir)(options.paths);
+    const filePolicies = await files_1.collectFilePolicies(options.paths, options.symlinksEnabled, options.defaultFileIgnores);
+    const baseDir = files_1.determineBaseDir(options.paths);
     emitter_1.emitter.scanFilesProgress(0);
     const bundleFiles = [];
     const skippedOversizedFiles = [];
     let totalFiles = 0;
-    const bundleFileCollector = (0, files_1.collectBundleFiles)({
-        ...(0, lodash_pick_1.default)(options, ['paths', 'symlinksEnabled']),
+    const bundleFileCollector = files_1.collectBundleFiles({
+        ...lodash_pick_1.default(options, ['paths', 'symlinksEnabled']),
         baseDir,
-        fileIgnores,
+        filePolicies,
         supportedFiles,
     });
     for await (const f of bundleFileCollector) {
@@ -11204,7 +11204,7 @@ async function createBundleWithCustomFiles(options, supportedFiles) {
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
-        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']),
+        ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']),
         baseDir,
         files: bundleFiles,
     };
@@ -11218,7 +11218,7 @@ async function createBundleWithCustomFiles(options, supportedFiles) {
         ...remoteBundle,
         baseDir,
         supportedFiles,
-        fileIgnores,
+        fileIgnores: [...filePolicies.excludes, ...filePolicies.ignores],
         skippedOversizedFiles,
     };
 }
@@ -11433,11 +11433,7 @@ exports.emitter = new EmitterDC();
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11458,7 +11454,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isMatch = exports.composeFilePayloads = exports.resolveBundleFilePath = exports.resolveBundleFiles = exports.getFileInfo = exports.calcHash = exports.getBundleFilePath = exports.prepareExtendingBundle = exports.collectBundleFiles = exports.determineBaseDir = exports.collectIgnoreRules = exports.getGlobPatterns = exports.parseFileIgnores = exports.notEmpty = void 0;
+exports.isMatch = exports.composeFilePayloads = exports.resolveBundleFilePath = exports.resolveBundleFiles = exports.getFileInfo = exports.calcHash = exports.getBundleFilePath = exports.prepareExtendingBundle = exports.collectBundleFiles = exports.determineBaseDir = exports.collectFilePolicies = exports.getGlobPatterns = exports.parseFileIgnores = exports.notEmpty = void 0;
 const nodePath = __importStar(__webpack_require__(71017));
 const fs = __importStar(__webpack_require__(57147));
 const fast_glob_1 = __importDefault(__webpack_require__(13294));
@@ -11503,7 +11499,7 @@ const fgOptions = {
 };
 function filterSupportedFiles(files, supportedFiles) {
     const patters = getGlobPatterns(supportedFiles);
-    return (0, multimatch_1.default)(files, patters, multiMatchOptions);
+    return multimatch_1.default(files, patters, multiMatchOptions);
 }
 function parseIgnoreRulesToGlobs(rules, baseDir) {
     // Mappings from .gitignore format to glob format:
@@ -11553,7 +11549,7 @@ function parseFileIgnores(path) {
         const f = fs.readFileSync(path, { encoding: 'utf8' });
         if (path.includes(constants_1.DOTSNYK_FILENAME)) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            const parsed = (0, yaml_1.parse)(f);
+            const parsed = yaml_1.parse(f);
             const codeIgnoredPaths = parsed.exclude.code || [];
             const globalIgnoredPaths = parsed.exclude.global || [];
             rules = [...codeIgnoredPaths, ...globalIgnoredPaths];
@@ -11571,7 +11567,13 @@ function parseFileIgnores(path) {
             console.log(`${path} is not accessible. Please check permissions and adjust .dcignore file to not even test this file`);
         }
     }
-    return parseIgnoreRulesToGlobs(rules, dirname);
+    try {
+        return parseIgnoreRulesToGlobs(rules, dirname);
+    }
+    catch (err) {
+        console.error('Could not parse ignore rules to glob', { path });
+        throw new Error('Please make sure ignore file follows correct syntax');
+    }
 }
 exports.parseFileIgnores = parseFileIgnores;
 function getGlobPatterns(supportedFiles) {
@@ -11607,25 +11609,48 @@ function generateAllCaseGlobPattern(fileExtension) {
     }, []);
     return caseInsensitivePatterns.join('');
 }
-async function collectIgnoreRules(dirs, symlinksEnabled = false, fileIgnores = constants_1.IGNORES_DEFAULT) {
+/**
+ * Recursively collect all exclude and ignore rules from "dirs".
+ *
+ * Exclude rules from .snyk files and ignore rules from .[*]ignore files are collected separately.
+ * Any .[*]ignore files in paths excluded by .snyk exclude rules are ignored.
+ */
+async function collectFilePolicies(dirs, symlinksEnabled = false, fileIgnores = constants_1.IGNORES_DEFAULT) {
     const tasks = dirs.map(async (folder) => {
         const fileStats = await lStat(folder);
         // Check if symlink and exclude if requested
-        if (!fileStats || (fileStats.isSymbolicLink() && !symlinksEnabled) || fileStats.isFile())
-            return [];
-        // Find ignore files inside this directory
-        const localIgnoreFiles = await (0, fast_glob_1.default)(constants_1.IGNORE_FILES_NAMES.map(i => `*${i}`), {
+        if (!fileStats || (fileStats.isSymbolicLink() && !symlinksEnabled) || fileStats.isFile()) {
+            return {
+                excludes: [],
+                ignores: [],
+            };
+        }
+        // Find .snyk and .[*]ignore files inside this directory.
+        const allIgnoredFiles = await fast_glob_1.default(constants_1.IGNORE_FILES_NAMES.map(i => `*${i}`), {
             ...fgOptions,
             cwd: folder,
             followSymbolicLinks: symlinksEnabled,
         });
-        // Read ignore files and merge new patterns
-        return (0, lodash_union_1.default)(...localIgnoreFiles.map(parseFileIgnores));
+        // Parse rules from all .snyk files inside this directory.
+        const snykFiles = allIgnoredFiles.filter(f => f.endsWith(constants_1.DOTSNYK_FILENAME));
+        const snykExcludeRules = lodash_union_1.default(...snykFiles.map(parseFileIgnores));
+        // Parse rules from relevant .[*]ignore files inside this directory.
+        // Exclude ignore files under paths excluded by .snyk files.
+        const ignoreFiles = allIgnoredFiles.filter(f => !f.endsWith(constants_1.DOTSNYK_FILENAME) && multimatch_1.default([nodePath.dirname(f)], snykExcludeRules).length === 0);
+        const ignoreFileRules = lodash_union_1.default(...ignoreFiles.map(parseFileIgnores));
+        return {
+            excludes: snykExcludeRules,
+            ignores: ignoreFileRules,
+        };
     });
-    const customRules = await Promise.all(tasks);
-    return (0, lodash_union_1.default)(fileIgnores, ...customRules);
+    const collectedRules = await Promise.all(tasks);
+    return {
+        excludes: lodash_union_1.default(...collectedRules.map(policies => policies.excludes)),
+        // Merge external and collected ignore rules
+        ignores: lodash_union_1.default(fileIgnores, ...collectedRules.map(policies => policies.ignores)),
+    };
 }
-exports.collectIgnoreRules = collectIgnoreRules;
+exports.collectFilePolicies = collectFilePolicies;
 function determineBaseDir(paths) {
     if (paths.length === 1) {
         const path = paths[0];
@@ -11638,9 +11663,9 @@ function determineBaseDir(paths) {
     return '';
 }
 exports.determineBaseDir = determineBaseDir;
-async function* searchFiles(patterns, cwd, symlinksEnabled, ignores) {
-    const positiveIgnores = ignores.filter(rule => !rule.startsWith('!'));
-    const negativeIgnores = ignores.filter(rule => rule.startsWith('!')).map(rule => rule.substring(1));
+async function* searchFiles(patterns, cwd, symlinksEnabled, policies) {
+    const positiveIgnores = [...policies.excludes, ...policies.ignores.filter(rule => !rule.startsWith('!'))];
+    const negativeIgnores = policies.ignores.filter(rule => rule.startsWith('!')).map(rule => rule.substring(1));
     // We need to use the ignore rules directly in the stream. Otherwise we would expand all the branches of the file system
     // that should be ignored, leading to performance issues (the parser would look stuck while analyzing each ignored file).
     // However, fast-glob doesn't address the negative rules in the ignore option correctly.
@@ -11657,6 +11682,7 @@ async function* searchFiles(patterns, cwd, symlinksEnabled, ignores) {
     for await (const filePath of positiveSearcher) {
         yield filePath;
     }
+    const deepPatterns = patterns.map(p => `**/${p}`);
     // TODO: This is incorrect because the .gitignore format allows to specify exceptions to previous rules, therefore
     // the separation between positive and negative ignores is incorrect in a scenario with 2+ exeptions like the one below:
     // `node_module/` <= ignores everything in a `node_module` folder and it's relative subfolders
@@ -11668,9 +11694,11 @@ async function* searchFiles(patterns, cwd, symlinksEnabled, ignores) {
             cwd,
             followSymbolicLinks: symlinksEnabled,
             baseNameMatch: false,
+            // Exclude rules should still be respected
+            ignore: policies.excludes,
         });
         for await (const filePath of negativeSearcher) {
-            if (isMatch(filePath.toString(), patterns.map(p => `**/${p}`)))
+            if (isMatch(filePath.toString(), deepPatterns))
                 yield filePath;
         }
     }
@@ -11679,7 +11707,7 @@ async function* searchFiles(patterns, cwd, symlinksEnabled, ignores) {
  * Returns bundle files from requested paths
  * If a file exceeds the maximum file size, it returns a string with its path
  * */
-async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnores, paths, supportedFiles, }) {
+async function* collectBundleFiles({ symlinksEnabled = false, baseDir, filePolicies, paths, supportedFiles, }) {
     const cache = new cache_1.Cache(constants_1.CACHE_KEY, baseDir);
     const files = [];
     const dirs = [];
@@ -11700,7 +11728,7 @@ async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnor
     // Scan folders
     const globPatterns = getGlobPatterns(supportedFiles);
     for (const folder of dirs) {
-        const searcher = searchFiles(globPatterns, folder, symlinksEnabled, fileIgnores);
+        const searcher = searchFiles(globPatterns, folder, symlinksEnabled, filePolicies);
         // eslint-disable-next-line no-await-in-loop
         for await (const filePath of searcher) {
             const fileInfo = await getFileInfo(filePath.toString(), baseDir, false, cache);
@@ -11712,7 +11740,7 @@ async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnor
     }
     // Sanitize files
     if (files.length) {
-        const searcher = searchFiles(filterSupportedFiles(files, supportedFiles), baseDir, symlinksEnabled, fileIgnores);
+        const searcher = searchFiles(filterSupportedFiles(files, supportedFiles), baseDir, symlinksEnabled, filePolicies);
         for await (const filePath of searcher) {
             const fileInfo = await getFileInfo(filePath.toString(), baseDir, false, cache);
             // dc ignore AttrAccessOnNull: false positive, there is a precondition with &&
@@ -11737,7 +11765,7 @@ async function prepareExtendingBundle(baseDir, supportedFiles, fileIgnores = con
         if (isWindows) {
             processingFiles = processingFiles.map(f => f.replace(/\\/g, '/')); // fg requires forward-slashes in Windows globs
         }
-        const entries = await (0, fast_glob_1.default)(processingFiles, {
+        const entries = await fast_glob_1.default(processingFiles, {
             ...fgOptions,
             cwd: baseDir,
             followSymbolicLinks: symlinksEnabled,
@@ -11878,7 +11906,7 @@ function* composeFilePayloads(files, bucketSize = constants_1.MAX_PAYLOAD / 2) {
 }
 exports.composeFilePayloads = composeFilePayloads;
 function isMatch(filePath, rules) {
-    return !!(0, multimatch_1.default)([filePath], rules, { ...multiMatchOptions, matchBase: false }).length;
+    return !!multimatch_1.default([filePath], rules, { ...multiMatchOptions, matchBase: false }).length;
 }
 exports.isMatch = isMatch;
 //# sourceMappingURL=files.js.map
@@ -11934,14 +11962,14 @@ const GENERIC_ERROR_MESSAGES = {
 };
 async function compressAndEncode(payload) {
     // encode payload and compress;
-    const deflate = (0, util_1.promisify)(zlib_1.gzip);
+    const deflate = util_1.promisify(zlib_1.gzip);
     const compressedPayload = await deflate(Buffer.from(JSON.stringify(payload)).toString('base64'));
     return compressedPayload;
 }
 exports.compressAndEncode = compressAndEncode;
 function startSession(options) {
     const { source, authHost } = options;
-    const draftToken = (0, uuid_1.v4)();
+    const draftToken = uuid_1.v4();
     return {
         draftToken,
         loginURL: `${authHost}/login?token=${draftToken}&utm_medium=${source}&utm_source=${source}&utm_campaign=${source}&docker=false`,
@@ -11960,7 +11988,7 @@ exports.getVerifyCallbackUrl = getVerifyCallbackUrl;
 async function getIpFamily(authHost) {
     const family = 6;
     // Dispatch a FORCED IPv6 request to test client's ISP and network capability
-    const res = await (0, needle_1.makeRequest)({
+    const res = await needle_1.makeRequest({
         url: getVerifyCallbackUrl(authHost),
         method: 'post',
         family, // family param forces the handler to dispatch a request using IP at "family" version
@@ -11979,7 +12007,7 @@ async function checkSession(options) {
         type: 'success',
         value: '',
     };
-    const res = await (0, needle_1.makeRequest)({
+    const res = await needle_1.makeRequest({
         url: getVerifyCallbackUrl(options.authHost),
         body: {
             token: options.draftToken,
@@ -11998,7 +12026,7 @@ async function checkSession(options) {
 exports.checkSession = checkSession;
 async function getFilters(baseURL, source, attempts = constants_1.MAX_RETRY_ATTEMPTS, requestId) {
     const apiName = 'filters';
-    const res = await (0, needle_1.makeRequest)({
+    const res = await needle_1.makeRequest({
         headers: { source, ...(requestId && { 'snyk-request-id': requestId }) },
         url: `${baseURL}/${apiName}`,
         method: 'get',
@@ -12039,7 +12067,7 @@ async function createBundle(options) {
         body: payloadBody,
         isJson: false,
     };
-    const res = await (0, needle_1.makeRequest)(payload);
+    const res = await needle_1.makeRequest(payload);
     if (res.success) {
         return { type: 'success', value: res.body };
     }
@@ -12053,7 +12081,7 @@ const CHECK_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Uploaded bundle has expired',
 };
 async function checkBundle(options) {
-    const res = await (0, needle_1.makeRequest)({
+    const res = await needle_1.makeRequest({
         headers: {
             ...commonHttpHeaders(options),
         },
@@ -12074,8 +12102,8 @@ const EXTEND_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Parent bundle has expired',
 };
 async function extendBundle(options) {
-    const payloadBody = await compressAndEncode((0, lodash_pick_1.default)(options, ['files', 'removedFiles']));
-    const res = await (0, needle_1.makeRequest)({
+    const payloadBody = await compressAndEncode(lodash_pick_1.default(options, ['files', 'removedFiles']));
+    const res = await needle_1.makeRequest({
         headers: {
             'content-type': 'application/octet-stream',
             'content-encoding': 'gzip',
@@ -12123,10 +12151,10 @@ async function getAnalysis(options) {
                 limitToFiles: options.limitToFiles || [],
                 ...(options.shard ? { shard: options.shard } : null),
             },
-            ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized', 'legacy', 'analysisContext']),
+            ...lodash_pick_1.default(options, ['severity', 'prioritized', 'legacy', 'analysisContext']),
         },
     };
-    const res = await (0, needle_1.makeRequest)(config);
+    const res = await needle_1.makeRequest(config);
     if (res.success)
         return { type: 'success', value: res.body };
     return generateError(res.errorCode, GET_ANALYSIS_ERROR_MESSAGES, 'getAnalysis');
@@ -12163,10 +12191,10 @@ async function initReport(options) {
                 limitToFiles: options.limitToFiles || [],
                 ...(options.shard ? { shard: options.shard } : null),
             },
-            ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized', 'legacy', 'analysisContext']),
+            ...lodash_pick_1.default(options, ['severity', 'prioritized', 'legacy', 'analysisContext']),
         },
     };
-    const res = await (0, needle_1.makeRequest)(config);
+    const res = await needle_1.makeRequest(config);
     if (res.success)
         return { type: 'success', value: res.body.reportId };
     return generateError(res.errorCode, REPORT_ERROR_MESSAGES, 'initReport');
@@ -12184,7 +12212,7 @@ async function getReport(options) {
         url: `${options.baseURL}/report/${options.pollId}`,
         method: 'get',
     };
-    const res = await (0, needle_1.makeRequest)(config);
+    const res = await needle_1.makeRequest(config);
     if (res.success)
         return { type: 'success', value: res.body };
     return generateError(res.errorCode, REPORT_ERROR_MESSAGES, 'getReport', (_a = res.error) === null || _a === void 0 ? void 0 : _a.message);
@@ -12205,10 +12233,10 @@ async function initScmReport(options) {
                 projectId: options.projectId,
                 commitHash: options.commitId,
             },
-            ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized', 'analysisContext']),
+            ...lodash_pick_1.default(options, ['severity', 'prioritized', 'analysisContext']),
         },
     };
-    const res = await (0, needle_1.makeRequest)(config);
+    const res = await needle_1.makeRequest(config);
     if (res.success)
         return { type: 'success', value: res.body.testId };
     return generateError(res.errorCode, REPORT_ERROR_MESSAGES, 'initReport');
@@ -12226,7 +12254,7 @@ async function getScmReport(options) {
         url: `${options.baseURL}/test/${options.pollId}`,
         method: 'get',
     };
-    const res = await (0, needle_1.makeRequest)(config);
+    const res = await needle_1.makeRequest(config);
     if (res.success)
         return { type: 'success', value: res.body };
     return generateError(res.errorCode, REPORT_ERROR_MESSAGES, 'getReport', (_a = res.error) === null || _a === void 0 ? void 0 : _a.message);
@@ -12243,11 +12271,7 @@ exports.getScmReport = getScmReport;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -12318,11 +12342,7 @@ var AnalysisSeverity;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -12401,7 +12421,7 @@ async function makeRequest(payload, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
         let error;
         let response;
         try {
-            response = await (0, needle_1.default)(method, url, data, options);
+            response = await needle_1.default(method, url, data, options);
             emitter_1.emitter.apiRequestLog(`<= Response: ${response.statusCode} ${JSON.stringify(response.body)}`);
             const success = !!(response.statusCode && response.statusCode >= 200 && response.statusCode < 300);
             if (success)
@@ -12451,11 +12471,7 @@ exports.makeRequest = makeRequest;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -12500,7 +12516,7 @@ async function initAndPollReportGeneric(initReportFunc, getReportFunc, options)
     while (true) {
         // eslint-disable-next-line no-await-in-loop
         apiResponse = await getReportFunc({
-            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']),
+            ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']),
             pollId,
         });
         if (apiResponse.type === 'error') {
@@ -94763,6 +94779,8 @@ class Settings {
         if (this.stats) {
             this.objectMode = true;
         }
+        // Remove the cast to the array in the next major (#404).
+        this.ignore = [].concat(this.ignore);
     }
     _getValue(option, value) {
         return option === undefined ? value : option;
@@ -102377,6 +102395,7 @@ const EMPTY = ''
 const SPACE = ' '
 const ESCAPE = '\\'
 const REGEX_TEST_BLANK_LINE = /^\s+$/
+const REGEX_INVALID_TRAILING_BACKSLASH = /(?:[^\\]|^)\\$/
 const REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION = /^\\!/
 const REGEX_REPLACE_LEADING_EXCAPED_HASH = /^\\#/
 const REGEX_SPLITALL_CRLF = /\r?\n/g
@@ -102388,10 +102407,14 @@ const REGEX_SPLITALL_CRLF = /\r?\n/g
 const REGEX_TEST_INVALID_PATH = /^\.*\/|^\.+$/
 
 const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
+
+// Do not use ternary expression here, since "istanbul ignore next" is buggy
+let TMP_KEY_IGNORE = 'node-ignore'
+/* istanbul ignore else */
+if (typeof Symbol !== 'undefined') {
+  TMP_KEY_IGNORE = Symbol.for('node-ignore')
+}
+const KEY_IGNORE = TMP_KEY_IGNORE
 
 const define = (object, key, value) =>
   Object.defineProperty(object, key, {value})
@@ -102558,18 +102581,27 @@ const REPLACERS = [
       : '\\/.+'
   ],
 
-  // intermediate wildcards
+  // normal intermediate wildcards
   [
     // Never replace escaped '*'
     // ignore rule '\*' will match the path '*'
 
     // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+    // 'abc.*'  -> skip this rule,
+    //    coz trailing single wildcard will be handed by [trailing wildcard]
+    /(^|[^\\]+)(\\\*)+(?=.+)/g,
 
     // '*.js' matches '.js'
     // '*.js' doesn't match 'abc'
-    (_, p1) => `${p1}[^\\/]*`
+    (_, p1, p2) => {
+      // 1.
+      // > An asterisk "*" matches anything except a slash.
+      // 2.
+      // > Other consecutive asterisks are considered regular asterisks
+      // > and will match according to the previous rules.
+      const unescaped = p2.replace(/\\\*/g, '[^\\/]*')
+      return p1 + unescaped
+    }
   ],
 
   [
@@ -102680,6 +102712,7 @@ const isString = subject => typeof subject === 'string'
 const checkPattern = pattern => pattern
   && isString(pattern)
   && !REGEX_TEST_BLANK_LINE.test(pattern)
+  && !REGEX_INVALID_TRAILING_BACKSLASH.test(pattern)
 
   // > A line starting with # serves as a comment.
   && pattern.indexOf('#') !== 0
@@ -102945,7 +102978,7 @@ module.exports = factory
 
 // Windows
 // --------------------------------------------------------------
-/* istanbul ignore if  */
+/* istanbul ignore if */
 if (
   // Detect `process` so that it can run in browsers.
   typeof process !== 'undefined'