snyk 1.807.0 → 1.808.0

package/dist/cli/917.index.js

@@ -321,45 +321,49 @@ const errors_1 = __webpack_require__(55191);
 const error_utils_1 = __webpack_require__(23872);
 const DEFAULT_ENCODING = 'utf-8';
 async function loadFiles(pathToScan, options = {}) {
-    let filePaths = [pathToScan];
-    if (detect_1.isLocalFolder(pathToScan)) {
-        filePaths = getFilePathsFromDirectory(pathToScan, {
-            maxDepth: options.detectionDepth,
-        });
+    const filePaths = getFilePathsFromDirectory(pathToScan, {
+        maxDepth: options.detectionDepth,
+    });
+    if (filePaths.length === 0) {
+        throw new NoFilesToScanError();
     }
-    const filesToScan = [];
-    for (const filePath of filePaths) {
+    const loadedFiles = await Promise.all(filePaths.map(async (filePath) => {
         try {
-            const fileData = await tryLoadFileData(filePath);
-            if (fileData) {
-                filesToScan.push(fileData);
-            }
+            return await tryLoadFileData(filePath);
         }
         catch (e) {
             throw new FailedToLoadFileError(filePath);
         }
-    }
-    if (filesToScan.length === 0) {
-        throw new NoFilesToScanError();
-    }
-    return filesToScan.filter((file) => file.fileContent !== '');
+    }));
+    return loadedFiles.filter((file) => file.fileContent !== '');
 }
 exports.loadFiles = loadFiles;
+function hasValidFileType(filePath) {
+    return types_1.VALID_FILE_TYPES.includes(iac_parser_1.getFileType(filePath));
+}
 function getFilePathsFromDirectory(pathToScan, options = {}) {
-    const directoryPaths = makeDirectoryIterator_1.makeDirectoryIterator(pathToScan, {
-        maxDepth: options.maxDepth,
-    });
-    const directoryFilePaths = [];
-    for (const filePath of directoryPaths) {
-        directoryFilePaths.push(filePath);
+    const resFilePaths = [];
+    if (detect_1.isLocalFolder(pathToScan)) {
+        // Directory
+        const dirIterator = makeDirectoryIterator_1.makeDirectoryIterator(pathToScan, {
+            maxDepth: options.maxDepth,
+        });
+        for (const filePath of dirIterator) {
+            if (hasValidFileType(filePath)) {
+                resFilePaths.push(filePath);
+            }
+        }
     }
-    return directoryFilePaths;
+    else {
+        // File
+        if (hasValidFileType(pathToScan)) {
+            resFilePaths.push(pathToScan);
+        }
+    }
+    return resFilePaths;
 }
 async function tryLoadFileData(pathToScan) {
     const fileType = iac_parser_1.getFileType(pathToScan);
-    if (!types_1.VALID_FILE_TYPES.includes(fileType)) {
-        return null;
-    }
     const fileContent = (await fs_1.promises.readFile(pathToScan, DEFAULT_ENCODING)).toString();
     return {
         filePath: pathToScan,