@coana-tech/cli 14.12.71 → 14.12.72

package/cli.mjs

@@ -229736,6 +229736,29 @@ ${vulnerabilityFixes.map((fix) => `	${fix.dependencyName} from ${fix.currentVers
 // dist/internal/socket-mode-helpers-socket-dependency-trees.js
 import { basename as basename7, dirname as dirname21, join as join24, sep as sep5 } from "path";
 var REQUIREMENTS_FILES_SEARCH_DEPTH2 = 3;
+var venvExcludes = [
+  "venv",
+  ".venv",
+  "env",
+  ".env",
+  "virtualenv",
+  ".virtualenv",
+  "venvs",
+  ".venvs",
+  "envs",
+  ".envs",
+  "__pycache__",
+  ".tox",
+  ".nox",
+  ".pytest_cache",
+  "site-packages",
+  "dist-packages",
+  "conda-meta",
+  "conda-bld",
+  ".mypy_cache",
+  ".ruff_cache",
+  ".hypothesis"
+];
 function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonProjects) {
   switch (ecosystem) {
     case "NPM": {
@@ -229747,6 +229770,9 @@ function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonPro
       return ".";
     }
     case "PIP": {
+      if (venvExcludes.some((exclude) => manifestPath.startsWith(`${exclude}/`) || manifestPath.includes(`/${exclude}/`))) {
+        return void 0;
+      }
       const base = basename7(manifestPath);
       const dir = dirname21(manifestPath);
       const workspaceDir = dir === "" ? "." : dir;
@@ -229831,29 +229857,6 @@ async function fetchArtifactsFromSocket(rootWorkingDirectory, manifestsTarHash,
         pipArtifactToRepresentativeManifest[simplePurl(artifact.type, artifact.namespace ?? "", artifact.name ?? "", artifact.version ?? "")] = artifact;
       }
     }
-    const venvExcludes = [
-      "venv",
-      ".venv",
-      "env",
-      ".env",
-      "virtualenv",
-      ".virtualenv",
-      "venvs",
-      ".venvs",
-      "envs",
-      ".envs",
-      "__pycache__",
-      ".tox",
-      ".nox",
-      ".pytest_cache",
-      "site-packages",
-      "dist-packages",
-      "conda-meta",
-      "conda-bld",
-      ".mypy_cache",
-      ".ruff_cache",
-      ".hypothesis"
-    ];
     const allFiles = await getFilesRelative(rootWorkingDirectory, venvExcludes);
     for (const file of allFiles) {
       const base = basename7(file);
@@ -229896,7 +229899,7 @@ async function fetchArtifactsFromSocket(rootWorkingDirectory, manifestsTarHash,
           break;
         }
         case "PIP": {
-          const sPurl = simplePurl(artifact.type, artifact.namespace ?? "", artifact.name ?? "", artifact.version ?? "");
+          const sPurl = simplePurl(artifact.type, artifact.namespace ?? null, artifact.name ?? null, artifact.version ?? null);
           if (pipArtifactToRepresentativeManifest[sPurl]) {
             manifestFiles.push(...(pipArtifactToRepresentativeManifest[sPurl].manifestFiles ?? []).map((ref) => ref.file));
           }
@@ -229925,7 +229928,7 @@ async function fetchArtifactsFromSocket(rootWorkingDirectory, manifestsTarHash,
         });
       }
       if (Object.keys(workspaceToManifestFiles).length === 0 && artifact.vulnerabilities && artifact.vulnerabilities.length > 0) {
-        purlsFailedToFindWorkspace.add(purlToString(artifact));
+        purlsFailedToFindWorkspace.add(simplePurl(artifact.type, artifact.namespace ?? null, artifact.name ?? null, artifact.version ?? null));
       }
       for (const [workspace, manifestFiles2] of Object.entries(workspaceToManifestFiles)) {
         const workspaceData = (ecosystemToWorkspaceToAnalysisData[ecosystem] ??= {})[workspace] ??= {
@@ -245855,7 +245858,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version2 = "14.12.71";
+var version2 = "14.12.72";
 
 // dist/cli-core.js
 var { mapValues, omit, partition, pick } = import_lodash15.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coana-tech/cli",
-  "version": "14.12.71",
+  "version": "14.12.72",
   "description": "Coana CLI",
   "type": "module",
   "bin": {

package/reachability-analyzers-cli.mjs

@@ -109133,7 +109133,7 @@ async function setupDependenciesForAnalysis(subprojectDir, workspaceDir, directD
   });
 }
 function convertToPackageMetadatas(workspaceDir, dependenciesToInstall, directDependencies, artifactIdToArtifact) {
-  const artifactIdToDepedenciesToInstallIdx = Object.fromEntries(dependenciesToInstall.map((dep, idx) => [
+  const artifactIdToDependenciesToInstallIdx = Object.fromEntries(dependenciesToInstall.map((dep, idx) => [
     Object.entries(artifactIdToArtifact).find(([_, artifact]) => artifact === dep.artifact)[0],
     idx + 1
   ]));
@@ -109146,16 +109146,16 @@ function convertToPackageMetadatas(workspaceDir, dependenciesToInstall, directDe
     installedPath: workspaceDir
   });
   for (const [parentId, parent2] of Object.entries(artifactIdToArtifact)) {
-    if (!(parentId in artifactIdToDepedenciesToInstallIdx))
+    if (!(parentId in artifactIdToDependenciesToInstallIdx))
       continue;
     for (const child of parent2.dependencies ?? []) {
       const childArtifact = artifactIdToArtifact[child];
-      if (!artifactIdToDepedenciesToInstallIdx[child])
+      if (!artifactIdToDependenciesToInstallIdx[child])
         continue;
       if (!artifactToParents.has(childArtifact)) {
         artifactToParents.set(childArtifact, []);
       }
-      artifactToParents.get(childArtifact).push(artifactIdToDepedenciesToInstallIdx[parentId]);
+      artifactToParents.get(childArtifact).push(artifactIdToDependenciesToInstallIdx[parentId]);
     }
   }
   for (const directDependency of directDependencies) {
@@ -109262,9 +109262,9 @@ function computePackagePlacements(packageMetadatas, nodeModulesDir) {
         addPlacementToRelativeInstallDirsForSCC(sccToPlace, /* @__PURE__ */ new Set([nodeModulesDir]), installNames);
         return;
       }
-      const parentMetadatas = Array.from(curParents).map((parentIndex) => packageMetadataDag.sccs[parentIndex].packages).flat();
+      const parentMetadatas = Array.from(curParents, (parentIndex) => packageMetadataDag.sccs[parentIndex].packages).flat();
       if (curSCC !== sccToPlace) {
-        const anyParentDependsOnDifferentPackageToPlace = parentMetadatas.some((parentPackage) => sccToPlace.packages.some((packageToPlace) => parentPackage.dependencies[packageToPlace.name] && // If the package to place has the parentPackage as a parent, then the version it depends on is actually the one to place, and therefore it should not have a different installation
+        const anyParentDependsOnDifferentPackageToPlace = parentMetadatas.some((parentPackage) => sccToPlace.packages.some((packageToPlace) => Object.hasOwn(parentPackage.dependencies, packageToPlace.name) && // If the package to place has the parentPackage as a parent, then the version it depends on is actually the one to place, and therefore it should not have a different installation
         !packageToPlace.parents.some((p2p) => packageMetadatas[p2p] === parentPackage)));
         if (anyParentDependsOnDifferentPackageToPlace) {
           addPlacementToRelativeToPackages(sccToPlace, curSCC.packages, installNames);
@@ -109272,16 +109272,16 @@ function computePackagePlacements(packageMetadatas, nodeModulesDir) {
         }
       }
       const installNamesClone = new Map([...installNames.entries()].map(([packageName, installNames2]) => [packageName, new Set(installNames2)]));
-      const newInstallNames = parentMetadatas.flatMap((parentPackage) => sccToPlace.packages.flatMap((packageToPlace) => Object.entries(parentPackage.dependencies).filter(([name2, version3]) => name2 === packageToPlace.name || version3.startsWith("npm:") && version3.includes(`${packageToPlace.name}@`)).map(([name2, _version]) => [packageToPlace.name, name2])));
-      for (const [packageName, installName] of newInstallNames) {
-        if (!installNamesClone.has(packageName)) {
-          installNamesClone.set(packageName, /* @__PURE__ */ new Set());
-        }
-        installNamesClone.get(packageName).add(installName);
+      const newInstallNames = parentMetadatas.flatMap((parentPackage) => sccToPlace.packages.flatMap((packageToPlace) => Object.entries(parentPackage.dependencies).filter(([name2, version3]) => name2 === packageToPlace.name || version3.startsWith("npm:") && version3.includes(`${packageToPlace.name}@`)).map(([name2]) => [packageToPlace, name2])));
+      for (const [packageMetadata, installName] of newInstallNames) {
+        const installNamesSet = installNamesClone.get(packageMetadata);
+        if (!installNamesSet)
+          installNamesClone.set(packageMetadata, /* @__PURE__ */ new Set([installName]));
+        else
+          installNamesSet.add(installName);
       }
-      for (const parent2 of curParents) {
+      for (const parent2 of curParents)
         recHelper2(parent2, installNamesClone);
-      }
     };
     var recHelper = recHelper2;
     addPlacementsDirectIfMultipleVersions(sccToPlace);
@@ -109304,8 +109304,8 @@ function computePackagePlacements(packageMetadatas, nodeModulesDir) {
         const parentMetadata = packageMetadatas[parent2];
         const parentInstallDirs = computedPlacements.get(parentMetadata);
         if (parentInstallDirs) {
-          const dependencyInstallName = metadataToPlace.name in parentMetadata.dependencies ? metadataToPlace.name : Object.entries(parentMetadata.dependencies).find(([_name, version3]) => version3.startsWith("npm:") && version3.includes(`${metadataToPlace.name}@`))?.[0];
-          addPlacementToRelativeInstallDirs(metadataToPlace, parentInstallDirs, /* @__PURE__ */ new Map([[metadataToPlace.name, /* @__PURE__ */ new Set([dependencyInstallName ?? metadataToPlace.name])]]));
+          const dependencyInstallName = Object.hasOwn(parentMetadata.dependencies, metadataToPlace.name) ? metadataToPlace.name : Object.entries(parentMetadata.dependencies).find(([, version3]) => version3.startsWith("npm:") && version3.includes(`${metadataToPlace.name}@`))?.[0];
+          addPlacementToRelativeInstallDirs(metadataToPlace, parentInstallDirs, /* @__PURE__ */ new Map([[metadataToPlace, /* @__PURE__ */ new Set([dependencyInstallName ?? metadataToPlace.name])]]));
         }
       }
     }
@@ -109317,24 +109317,23 @@ function computePackagePlacements(packageMetadatas, nodeModulesDir) {
     }
   }
   function addPlacementToRelativeInstallDirsForSCC(sccToPlace, installDirs, installNames) {
-    for (const metadataToPlace of sccToPlace.packages) {
+    for (const metadataToPlace of sccToPlace.packages)
       addPlacementToRelativeInstallDirs(metadataToPlace, installDirs, installNames);
-    }
   }
   function addPlacementToRelativeInstallDirs(metadataToPlace, installDirs, installNames) {
     if (metadataToPlace.name === ROOT_PACKAGE_METADATA_NAME) {
       return;
     }
-    if (!computedPlacements.has(metadataToPlace)) {
-      computedPlacements.set(metadataToPlace, /* @__PURE__ */ new Set());
-    }
+    let computedPlacementsForMetadata = computedPlacements.get(metadataToPlace);
+    if (!computedPlacementsForMetadata)
+      computedPlacements.set(metadataToPlace, computedPlacementsForMetadata = /* @__PURE__ */ new Set());
     for (const installDir of [...installDirs]) {
-      for (const installName of installNames.get(metadataToPlace.name) ?? /* @__PURE__ */ new Set([metadataToPlace.name])) {
+      for (const installName of installNames.get(metadataToPlace) ?? /* @__PURE__ */ new Set([metadataToPlace.name])) {
         if (installDir.endsWith(`/node_modules/${installName}`))
           continue;
         const computedInstallDir = installDir.endsWith(nodeModulesDir) ? resolve11(installDir, installName) : resolve11(installDir, "node_modules", installName);
         if (!allInstallDirs.has(computedInstallDir)) {
-          computedPlacements.get(metadataToPlace).add(computedInstallDir);
+          computedPlacementsForMetadata.add(computedInstallDir);
           allInstallDirs.add(computedInstallDir);
         }
       }