@coana-tech/cli 14.12.105 → 14.12.106

package/cli.mjs

@@ -215280,7 +215280,7 @@ function resolveConflicts(ecosystem, patches, ctxt) {
       while (conflict.length > 0) {
         conflict.sort((a4, b) => {
           if (a4.artifacts.length !== b.artifacts.length) {
-            return b.artifacts.length - a4.artifacts.length;
+            return a4.artifacts.length - b.artifacts.length;
           }
           const aHighestVersion = getHighestVersionInPatch(ecosystem, a4, ctxt);
           const bHighestVersion = getHighestVersionInPatch(ecosystem, b, ctxt);
@@ -217780,16 +217780,8 @@ function extractManagedDependenciesFromElement(pom, element) {
     (child) => child instanceof import_parse_xml2.XmlElement && child.name === "dependency"
   )) {
     const dependency = extractDependencyFromElement(pom, depChild);
-    if (dependency?.version) {
-      managedDependencies.push({
-        groupId: dependency.groupId,
-        artifactId: dependency.artifactId,
-        type: dependency.type,
-        classifier: dependency.classifier,
-        version: dependency.version,
-        scope: dependency.scope,
-        pom: dependency.pom
-      });
+    if (dependency) {
+      managedDependencies.push(dependency);
     }
   }
   return managedDependencies;
@@ -217812,6 +217804,7 @@ function extractDependencyFromElement(pom, depElement) {
       type,
       classifier,
       scope,
+      element: depElement,
       pom
     };
   }
@@ -217940,6 +217933,26 @@ function getDependencyXml(pom, dependency, parentIndentLevel) {
 ${parentIndent}`;
   return dependenciesXml;
 }
+function getVersionPatch(dep, version4, elementIndentLevel) {
+  if (dep.version) {
+    if (dep.version.offset === void 0) {
+      return void 0;
+    }
+    return {
+      file: dep.pom.validatedPomFile,
+      offset: dep.version.offset,
+      length: dep.version.text.length,
+      text: version4
+    };
+  }
+  const versionXml = `${indent2(1, dep.pom.indentation)}<version>${version4}</version>
+${indent2(elementIndentLevel, dep.pom.indentation)}`;
+  return {
+    file: dep.pom.validatedPomFile,
+    offset: getInsertPos(dep.element),
+    text: versionXml
+  };
+}
 function getManagedDependenciesPatch(pom, dependencies) {
   const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
   if (!projectElement) {
@@ -217949,7 +217962,11 @@ function getManagedDependenciesPatch(pom, dependencies) {
   const dependenciesElement = dependencyManagementElement?.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
   const indentL1 = indent2(1, pom.indentation);
   const indentL2 = indent2(2, pom.indentation);
-  const depXmls = dependencies.map((dep) => getDependencyXml(pom, dep, 2)).join("");
+  const uniqueDependencies = T2(
+    dependencies,
+    (dep) => `${dep.groupId}:${dep.artifactId}:${dep.type ?? "jar"}:${dep.classifier ?? ""}`
+  );
+  const depXmls = uniqueDependencies.map((dep) => getDependencyXml(pom, dep, 2)).join("");
   if (!dependencyManagementElement) {
     return {
       file: pom.validatedPomFile,
@@ -217984,7 +218001,11 @@ function getDependenicesPatch(pom, dependencies) {
   }
   const dependenciesElement = projectElement.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
   const indentL1 = indent2(1, pom.indentation);
-  const depXmls = dependencies.map((dep) => getDependencyXml(pom, dep, 1)).join("");
+  const uniqueDependencies = T2(
+    dependencies,
+    (dep) => `${dep.groupId}:${dep.artifactId}:${dep.type ?? "jar"}:${dep.classifier ?? ""}`
+  );
+  const depXmls = uniqueDependencies.map((dep) => getDependencyXml(pom, dep, 1)).join("");
   if (!dependenciesElement) {
     return {
       file: pom.validatedPomFile,
@@ -218157,7 +218178,8 @@ var MavenFixingManager = class {
           const foundManagedDependencies = [];
           for (const [profileId, profile] of pom.profiles) {
             const profileManagedDependencies = profile.managedDependencies.filter(
-              (managedDep) => groupId === evaluate(managedDep.groupId.text, pom, profileId) && artifactId === evaluate(managedDep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(managedDep.type?.text ?? "jar", pom, profileId) && classifier === (managedDep.classifier && evaluate(managedDep.classifier.text, pom, profileId)) && (evaluate(managedDep.version.text, pom, profileId) === void 0 || versionSatisfiesSpecifier("MAVEN", version4, evaluate(managedDep.version.text, pom, profileId)))
+              (managedDep) => groupId === evaluate(managedDep.groupId.text, pom, profileId) && artifactId === evaluate(managedDep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(managedDep.type?.text ?? "jar", pom, profileId) && classifier === (managedDep.classifier && evaluate(managedDep.classifier.text, pom, profileId)) && // Either no version (we'll insert one) or version matches
+              (!managedDep.version || evaluate(managedDep.version.text, pom, profileId) === void 0 || versionSatisfiesSpecifier("MAVEN", version4, evaluate(managedDep.version.text, pom, profileId)))
             );
             for (const dep of profileManagedDependencies) {
               foundManagedDependencies.push({ dep, profileId });
@@ -218165,29 +218187,55 @@ var MavenFixingManager = class {
           }
           if (foundManagedDependencies.length) {
             for (const { dep: foundManagedDependency, profileId } of foundManagedDependencies) {
-              const patchLocation = findPatchLocation(
-                foundManagedDependency.pom.validatedPomFile,
-                foundManagedDependency.version,
-                pom,
-                profileId
-              );
-              if (patchLocation?.offset !== void 0) {
-                patches.push({
-                  success: true,
-                  fixes: [fix],
-                  patch: {
-                    file: patchLocation.file,
-                    offset: patchLocation.offset,
-                    oldText: patchLocation.text,
-                    newText: fix.fixedVersion
-                  }
-                });
-                foundExistingDependency = true;
+              if (foundManagedDependency.version) {
+                const patchLocation = findPatchLocation(
+                  foundManagedDependency.pom.validatedPomFile,
+                  foundManagedDependency.version,
+                  pom,
+                  profileId
+                );
+                if (patchLocation?.offset !== void 0) {
+                  patches.push({
+                    success: true,
+                    fixes: [fix],
+                    patch: {
+                      file: patchLocation.file,
+                      offset: patchLocation.offset,
+                      oldText: patchLocation.text,
+                      newText: fix.fixedVersion
+                    }
+                  });
+                  foundExistingDependency = true;
+                } else {
+                  patches.push({
+                    success: false,
+                    fixes: [fix]
+                  });
+                }
               } else {
-                patches.push({
-                  success: false,
-                  fixes: [fix]
-                });
+                const insertPatch = getVersionPatch(
+                  foundManagedDependency,
+                  fix.fixedVersion,
+                  3
+                  // parentIndentLevel: project > dependencyManagement > dependencies > dependency
+                );
+                if (insertPatch) {
+                  patches.push({
+                    success: true,
+                    fixes: [fix],
+                    patch: {
+                      file: insertPatch.file,
+                      offset: insertPatch.offset,
+                      newText: insertPatch.text
+                    }
+                  });
+                  foundExistingDependency = true;
+                } else {
+                  patches.push({
+                    success: false,
+                    fixes: [fix]
+                  });
+                }
               }
             }
           }
@@ -218274,7 +218322,8 @@ var MavenFixingManager = class {
         const foundManagedDependencies = [];
         for (const [profileId, profile] of pom.profiles) {
           const profileManagedDependencies = profile.managedDependencies.filter(
-            (managedDep) => groupId === evaluate(managedDep.groupId.text, pom, profileId) && artifactId === evaluate(managedDep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(managedDep.type?.text ?? "jar", pom, profileId) && classifier === (managedDep.classifier && evaluate(managedDep.classifier.text, pom, profileId)) && managedDep.version && (evaluate(managedDep.version?.text, pom, profileId) === void 0 || versionSatisfiesSpecifier("MAVEN", version4, evaluate(managedDep.version.text, pom, profileId)))
+            (managedDep) => groupId === evaluate(managedDep.groupId.text, pom, profileId) && artifactId === evaluate(managedDep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(managedDep.type?.text ?? "jar", pom, profileId) && classifier === (managedDep.classifier && evaluate(managedDep.classifier.text, pom, profileId)) && // Either no version (we'll insert one) or version matches
+            (!managedDep.version || evaluate(managedDep.version.text, pom, profileId) === void 0 || versionSatisfiesSpecifier("MAVEN", version4, evaluate(managedDep.version.text, pom, profileId)))
           );
           for (const dep of profileManagedDependencies) {
             foundManagedDependencies.push({ dep, profileId });
@@ -218282,29 +218331,55 @@ var MavenFixingManager = class {
         }
         if (foundManagedDependencies.length) {
           const { dep: foundManagedDependency, profileId } = foundManagedDependencies[foundManagedDependencies.length - 1];
-          const patchLocation = findPatchLocation(
-            foundManagedDependency.pom.validatedPomFile,
-            foundManagedDependency.version,
-            pom,
-            profileId
-          );
-          if (patchLocation?.offset !== void 0) {
-            patches.push({
-              success: true,
-              fixes: [fix],
-              patch: {
-                file: patchLocation.file,
-                offset: patchLocation.offset,
-                oldText: patchLocation.text,
-                newText: fix.fixedVersion
-              }
-            });
-            foundExistingManagedDependency = true;
+          if (foundManagedDependency.version) {
+            const patchLocation = findPatchLocation(
+              foundManagedDependency.pom.validatedPomFile,
+              foundManagedDependency.version,
+              pom,
+              profileId
+            );
+            if (patchLocation?.offset !== void 0) {
+              patches.push({
+                success: true,
+                fixes: [fix],
+                patch: {
+                  file: patchLocation.file,
+                  offset: patchLocation.offset,
+                  oldText: patchLocation.text,
+                  newText: fix.fixedVersion
+                }
+              });
+              foundExistingManagedDependency = true;
+            } else {
+              patches.push({
+                success: false,
+                fixes: [fix]
+              });
+            }
           } else {
-            patches.push({
-              success: false,
-              fixes: [fix]
-            });
+            const insertPatch = getVersionPatch(
+              foundManagedDependency,
+              fix.fixedVersion,
+              3
+              // fieldIndentLevel: project > dependencyManagement > dependencies > dependency > version
+            );
+            if (insertPatch) {
+              patches.push({
+                success: true,
+                fixes: [fix],
+                patch: {
+                  file: insertPatch.file,
+                  offset: insertPatch.offset,
+                  newText: insertPatch.text
+                }
+              });
+              foundExistingManagedDependency = true;
+            } else {
+              patches.push({
+                success: false,
+                fixes: [fix]
+              });
+            }
           }
         }
         if (!foundExistingManagedDependency) {
@@ -218414,7 +218489,7 @@ var PomUpgradeHandler = class {
         async (validatedManifestFile) => {
           const res = await this.getDirectDependencyPatches(validatedManifestFile, idx, upgradeVersion, ctxt);
           patches.push(...res.patches ?? []);
-          if (res.managedDependencies) {
+          if (res.managedDependencies?.length) {
             if (!managedDependenciesToAdd.has(validatedManifestFile)) {
               managedDependenciesToAdd.set(validatedManifestFile, { artifacts: [], dependencies: [] });
             }
@@ -218433,7 +218508,7 @@ var PomUpgradeHandler = class {
         async (validatedManifestFile) => {
           const res = await this.getTransitiveDependencyPatches(validatedManifestFile, idx, upgradeVersion, ctxt);
           patches.push(...res.patches ?? []);
-          if (res.managedDependencies) {
+          if (res.managedDependencies?.length) {
             if (!managedDependenciesToAdd.has(validatedManifestFile)) {
               managedDependenciesToAdd.set(validatedManifestFile, { artifacts: [], dependencies: [] });
             }
@@ -218681,41 +218756,62 @@ var PomUpgradeHandler = class {
               continue;
             }
             if (managedClassifier !== classifier) continue;
-            const version4 = evaluate(managedDep.version.text, pom);
-            if (version4 === void 0) {
-              ctxt.statusUpdater?.({
-                status: "error",
-                file: manifestFile,
-                artifacts: [idx],
-                message: `Could not evaluate version for managed dependency`
-              });
-              continue;
-            }
-            const existingVersionRange = VersionRange.createFromVersionSpec(version4);
-            if (existingVersionRange.restrictions.length > 0 ? !existingVersionRange.containsVersion(existingMavenVersion) : existingVersionRange?.recommendedVersion?.compareTo(existingMavenVersion) !== 0) {
-              continue;
-            }
-            const patchLocation = findPatchLocation(
-              managedDep.pom.validatedPomFile,
-              managedDep.version,
-              pom,
-              profileId
-            );
-            if (patchLocation?.offset !== void 0) {
-              patches.push({
-                artifacts: [idx],
-                file: patchLocation.file,
-                offset: patchLocation.offset,
-                length: patchLocation.text.length,
-                text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
-              });
+            if (managedDep.version) {
+              const version4 = evaluate(managedDep.version.text, pom);
+              if (version4 === void 0) {
+                ctxt.statusUpdater?.({
+                  status: "error",
+                  file: manifestFile,
+                  artifacts: [idx],
+                  message: `Could not evaluate version for managed dependency`
+                });
+                continue;
+              }
+              const existingVersionRange = VersionRange.createFromVersionSpec(version4);
+              if (existingVersionRange.restrictions.length > 0 ? !existingVersionRange.containsVersion(existingMavenVersion) : existingVersionRange?.recommendedVersion?.compareTo(existingMavenVersion) !== 0) {
+                continue;
+              }
+              const patchLocation = findPatchLocation(
+                managedDep.pom.validatedPomFile,
+                managedDep.version,
+                pom,
+                profileId
+              );
+              if (patchLocation?.offset !== void 0) {
+                patches.push({
+                  artifacts: [idx],
+                  file: patchLocation.file,
+                  offset: patchLocation.offset,
+                  length: patchLocation.text.length,
+                  text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
+                });
+              } else {
+                ctxt.statusUpdater?.({
+                  status: "error",
+                  file: manifestFile,
+                  artifacts: [idx],
+                  message: `Failed to create patch for managed dependency`
+                });
+              }
             } else {
-              ctxt.statusUpdater?.({
-                status: "error",
-                file: manifestFile,
-                artifacts: [idx],
-                message: `Failed to create patch for managed dependency`
-              });
+              const insertPatch = getVersionPatch(
+                managedDep,
+                ctxt.rangeStyle === "pin" ? upgradeMavenRangePinned.toString() : upgradeMavenVersion.toString(),
+                3
+              );
+              if (insertPatch) {
+                patches.push({
+                  artifacts: [idx],
+                  ...insertPatch
+                });
+              } else {
+                ctxt.statusUpdater?.({
+                  status: "error",
+                  file: manifestFile,
+                  artifacts: [idx],
+                  message: `Failed to create version insertion patch for managed dependency`
+                });
+              }
             }
           }
         }
@@ -218781,36 +218877,57 @@ var PomUpgradeHandler = class {
           continue;
         }
         if (managedArtifactId !== artifactId) continue;
-        const version4 = evaluate(managedDep.version.text, pom);
-        if (version4 === void 0) {
-          ctxt.statusUpdater?.({
-            status: "error",
-            file: manifestFile,
-            artifacts: [idx],
-            message: `Could not evaluate version for managed dependency`
-          });
-          continue;
-        }
-        const existingVersionRange = VersionRange.createFromVersionSpec(version4);
-        if (existingVersionRange.restrictions.length > 0 ? !existingVersionRange.containsVersion(existingMavenVersion) : existingVersionRange?.recommendedVersion?.compareTo(existingMavenVersion) !== 0) {
-          continue;
-        }
-        const patchLocation = findPatchLocation(managedDep.pom.validatedPomFile, managedDep.version, pom, profileId);
-        if (patchLocation?.offset !== void 0) {
-          patches.push({
-            artifacts: [idx],
-            file: patchLocation.file,
-            offset: patchLocation.offset,
-            length: patchLocation.text.length,
-            text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
-          });
+        if (managedDep.version) {
+          const version4 = evaluate(managedDep.version.text, pom);
+          if (version4 === void 0) {
+            ctxt.statusUpdater?.({
+              status: "error",
+              file: manifestFile,
+              artifacts: [idx],
+              message: `Could not evaluate version for managed dependency`
+            });
+            continue;
+          }
+          const existingVersionRange = VersionRange.createFromVersionSpec(version4);
+          if (existingVersionRange.restrictions.length > 0 ? !existingVersionRange.containsVersion(existingMavenVersion) : existingVersionRange?.recommendedVersion?.compareTo(existingMavenVersion) !== 0) {
+            continue;
+          }
+          const patchLocation = findPatchLocation(managedDep.pom.validatedPomFile, managedDep.version, pom, profileId);
+          if (patchLocation?.offset !== void 0) {
+            patches.push({
+              artifacts: [idx],
+              file: patchLocation.file,
+              offset: patchLocation.offset,
+              length: patchLocation.text.length,
+              text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
+            });
+          } else {
+            ctxt.statusUpdater?.({
+              status: "error",
+              file: manifestFile,
+              artifacts: [idx],
+              message: `Failed to create patch for managed dependency`
+            });
+          }
         } else {
-          ctxt.statusUpdater?.({
-            status: "error",
-            file: manifestFile,
-            artifacts: [idx],
-            message: `Failed to create patch for managed dependency`
-          });
+          const insertPatch = getVersionPatch(
+            managedDep,
+            ctxt.rangeStyle === "pin" ? upgradeMavenRangePinned.toString() : upgradeMavenVersion.toString(),
+            3
+          );
+          if (insertPatch) {
+            patches.push({
+              artifacts: [idx],
+              ...insertPatch
+            });
+          } else {
+            ctxt.statusUpdater?.({
+              status: "error",
+              file: manifestFile,
+              artifacts: [idx],
+              message: `Failed to create version insertion patch for managed dependency`
+            });
+          }
         }
       }
     }
@@ -250583,7 +250700,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version3 = "14.12.105";
+var version3 = "14.12.106";
 
 // 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.105",
+  "version": "14.12.106",
   "description": "Coana CLI",
   "type": "module",
   "bin": {