snyk 1.1014.0 → 1.1016.0

package/dist/cli/522.index.js

@@ -177747,12 +177747,14 @@ Object.defineProperty(exports, "MissingSubProjectError", ({ enumerable: true, ge
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MissingSubProjectError = void 0;
 class MissingSubProjectError extends Error {
-    constructor(subProject, allProjects) {
-        super(`Specified sub-project not found: "${subProject}". ` +
-            `Found these projects: ${allProjects.join(', ')}`);
+    constructor(subProject, allSubProjectNames) {
+        const msg = !allSubProjectNames.length
+            ? 'No projects found.'
+            : `Found these projects: ${allSubProjectNames}`;
+        super(`Specified sub-project not found: "${subProject}". ` + msg);
         this.name = 'MissingSubProjectError';
         this.subProject = subProject;
-        this.allProjects = allProjects;
+        this.allProjects = allSubProjectNames;
         Error.captureStackTrace(this, MissingSubProjectError);
     }
 }
@@ -178029,28 +178031,19 @@ function extractJsonFromScriptOutput(stdoutText) {
 async function getAllDepsOneProject(root, targetFile, options, snykHttpClient, subProject) {
     const allProjectDeps = await getAllDeps(root, targetFile, options, snykHttpClient);
     const allSubProjectNames = allProjectDeps.allSubProjectNames;
-    return subProject
-        ? getSubProject(subProject, allProjectDeps, allSubProjectNames)
-        : getRootProject(allProjectDeps, allSubProjectNames);
+    return getTargetProject(subProject, allProjectDeps, allSubProjectNames);
 }
-function getSubProject(subProject, allProjectDeps, allSubProjectNames) {
-    if (!allProjectDeps.projects || !allProjectDeps.projects[subProject]) {
-        throw new errors_1.MissingSubProjectError(subProject, Object.keys(allProjectDeps));
-    }
-    const { depGraph } = allProjectDeps.projects[subProject];
-    const { versionBuildInfo } = allProjectDeps;
-    const gradleProjectName = `${allProjectDeps.defaultProject}/${subProject}`;
-    return {
-        depGraph,
-        allSubProjectNames,
-        gradleProjectName,
-        versionBuildInfo,
-    };
-}
-function getRootProject(allProjectDeps, allSubProjectNames) {
+function getTargetProject(subProject, allProjectDeps, allSubProjectNames) {
     const { projects, defaultProject, versionBuildInfo } = allProjectDeps;
-    const { depGraph } = projects[defaultProject];
-    const gradleProjectName = defaultProject;
+    const targetProject = subProject || defaultProject;
+    let gradleProjectName = defaultProject;
+    if (subProject) {
+        if (!allProjectDeps.projects || !allProjectDeps.projects[subProject]) {
+            throw new errors_1.MissingSubProjectError(subProject, allSubProjectNames);
+        }
+        gradleProjectName = `${allProjectDeps.defaultProject}/${subProject}`;
+    }
+    const { depGraph } = projects[targetProject];
     return {
         depGraph,
         allSubProjectNames,
@@ -181822,8 +181815,15 @@ function getMavenPackageInfo(sha1, targetPath) {
                 if (err) {
                     reject(err);
                 }
-                if (!res || !res.response || res.response.docs.length === 0) {
-                    reject(new Error(`No package found querying '${MAVEN_SEARCH_URL}' for sha1 hash '${sha1}'.`));
+                if (!res || !res.response) {
+                    reject(new Error(`Unexpected result querying '${MAVEN_SEARCH_URL}' for sha1 hash '${sha1}'.`));
+                }
+                if (res.response.docs.length === 0) {
+                    resolve({
+                        g: 'unknown',
+                        a: `${targetPath}:${sha1}`,
+                        v: 'unknown',
+                    });
                 }
                 if (res.response.docs.length > 1) {
                     const sha1Target = path.parse(targetPath).base;