@coana-tech/cli 14.12.47 → 14.12.48

package/cli.mjs

@@ -198932,89 +198932,67 @@ function getDependencyXml(pom, dependency, parentIndentLevel) {
 ${parentIndent}`;
   return dependenciesXml;
 }
-var managedDependenciesPatchCache = /* @__PURE__ */ new Map();
-function getSingletonManagedDependenciesPatch(pom) {
-  function computeManagedDependenciesPatch() {
-    const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
-    if (!projectElement) {
-      return void 0;
-    }
-    const dependencyManagementElement = projectElement.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencyManagement");
-    const dependenciesElement = dependencyManagementElement?.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
-    const indentL1 = indent(1, pom.indentation);
-    const indentL2 = indent(2, pom.indentation);
-    if (!dependencyManagementElement) {
-      const insertPos = getInsertPos(projectElement);
-      return insertPos ? {
-        file: pom.validatedPomFile,
-        offset: insertPos,
-        artifacts: [],
-        render: (t4) => `
+function getManagedDependenciesPatch(pom, dependencies) {
+  const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
+  if (!projectElement) {
+    return void 0;
+  }
+  const dependencyManagementElement = projectElement.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencyManagement");
+  const dependenciesElement = dependencyManagementElement?.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
+  const indentL1 = indent(1, pom.indentation);
+  const indentL2 = indent(2, pom.indentation);
+  const depXmls = dependencies.map((dep) => getDependencyXml(pom, dep, 2)).join("");
+  if (!dependencyManagementElement) {
+    return {
+      file: pom.validatedPomFile,
+      offset: getInsertPos(projectElement),
+      text: `
 ${indentL1}<dependencyManagement>
 ${indentL2}<dependencies>
-${indentL2}${t4 ?? ""}</dependencies>
+${indentL2}${depXmls}</dependencies>
 ${indentL1}</dependencyManagement>
 `
-      } : void 0;
-    } else if (!dependenciesElement) {
-      const insertPos = getInsertPos(dependencyManagementElement);
-      return insertPos ? {
-        file: pom.validatedPomFile,
-        offset: insertPos,
-        artifacts: [],
-        render: (t4) => `${indentL1}<dependencies>
-${indentL2}${t4 ?? ""}</dependencies>
+    };
+  } else if (!dependenciesElement) {
+    return {
+      file: pom.validatedPomFile,
+      offset: getInsertPos(dependencyManagementElement),
+      text: `${indentL1}<dependencies>
+${indentL2}${depXmls}</dependencies>
 ${indentL1}`
-      } : void 0;
-    } else {
-      const insertPos = getInsertPos(dependenciesElement);
-      return insertPos ? {
-        file: pom.validatedPomFile,
-        offset: insertPos,
-        artifacts: [],
-        render: (t4) => t4 ?? ""
-      } : void 0;
-    }
-  }
-  if (!managedDependenciesPatchCache.has(pom.validatedPomFile)) {
-    managedDependenciesPatchCache.set(pom.validatedPomFile, computeManagedDependenciesPatch());
+    };
+  } else {
+    return {
+      file: pom.validatedPomFile,
+      offset: getInsertPos(dependenciesElement),
+      text: depXmls
+    };
   }
-  return managedDependenciesPatchCache.get(pom.validatedPomFile);
 }
-var dependenciesPatchCache = /* @__PURE__ */ new Map();
-function getSingletonDependenciesPatch(pom) {
-  function computeDependenciesGroup() {
-    const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
-    if (!projectElement) {
-      return void 0;
-    }
-    const dependenciesElement = projectElement.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
-    const indentL1 = indent(1, pom.indentation);
-    if (!dependenciesElement) {
-      const insertPos = getInsertPos(projectElement);
-      return insertPos ? {
-        file: pom.validatedPomFile,
-        offset: insertPos,
-        artifacts: [],
-        render: (t4) => `
+function getDependenicesPatch(pom, dependencies) {
+  const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
+  if (!projectElement) {
+    return void 0;
+  }
+  const dependenciesElement = projectElement.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "dependencies");
+  const indentL1 = indent(1, pom.indentation);
+  const depXmls = dependencies.map((dep) => getDependencyXml(pom, dep, 1)).join("");
+  if (!dependenciesElement) {
+    return {
+      file: pom.validatedPomFile,
+      offset: getInsertPos(projectElement),
+      text: `
 ${indentL1}<dependencies>
-${indentL1}${t4 ?? ""}</dependencies>
+${indentL1}${depXmls}</dependencies>
 `
-      } : void 0;
-    } else {
-      const insertPos = getInsertPos(dependenciesElement);
-      return insertPos ? {
-        file: pom.validatedPomFile,
-        offset: insertPos,
-        artifacts: [],
-        render: (t4) => t4 ?? ""
-      } : void 0;
-    }
-  }
-  if (!dependenciesPatchCache.has(pom.validatedPomFile)) {
-    dependenciesPatchCache.set(pom.validatedPomFile, computeDependenciesGroup());
+    };
+  } else {
+    return {
+      file: pom.validatedPomFile,
+      offset: getInsertPos(dependenciesElement),
+      text: depXmls
+    };
   }
-  return dependenciesPatchCache.get(pom.validatedPomFile);
 }
 function getParentPomPath(pom) {
   const projectElement = pom.xml.children.filter((child) => child instanceof import_parse_xml2.XmlElement).find((child) => child.name === "project");
@@ -199226,7 +199204,10 @@ var MavenFixingManager = class {
     }
     if (upgradesNeedingManagedDependencies.length > 0) {
       try {
-        const patch = getSingletonManagedDependenciesPatch(pom);
+        const patch = getManagedDependenciesPatch(
+          pom,
+          upgradesNeedingManagedDependencies.map((dep) => dep.dependency)
+        );
         if (patch) {
           patches.push({
             success: true,
@@ -199234,9 +199215,7 @@ var MavenFixingManager = class {
             patch: {
               file: pom.validatedPomFile,
               offset: patch.offset,
-              newText: patch.render(
-                upgradesNeedingManagedDependencies.map((dep) => getDependencyXml(pom, dep.dependency, 3)).join("")
-              )
+              newText: patch.text
             }
           });
         } else {
@@ -199340,7 +199319,10 @@ var MavenFixingManager = class {
     }
     if (upgradesNeedingManagedDependencies.length > 0) {
       try {
-        const patch = getSingletonManagedDependenciesPatch(pom);
+        const patch = getManagedDependenciesPatch(
+          pom,
+          upgradesNeedingManagedDependencies.map((dep) => dep.dependency)
+        );
         if (patch) {
           patches.push({
             success: true,
@@ -199348,9 +199330,7 @@ var MavenFixingManager = class {
             patch: {
               file: pom.validatedPomFile,
               offset: patch.offset,
-              newText: patch.render(
-                upgradesNeedingManagedDependencies.map((dep) => getDependencyXml(pom, dep.dependency, 3)).join("")
-              )
+              newText: patch.text
             }
           });
         } else {
@@ -199837,21 +199817,14 @@ async function applyPatches(ecosystem, rootDir, patches, ctxt) {
       await writeFile2(fullPath, "", "utf-8");
     }
     let fileContent = await readFile7(fullPath, "utf-8");
-    const renderedPatches = patches2.map((patch) => ({
-      file: patch.file,
-      offset: patch.offset,
-      length: patch.length,
-      artifacts: patch.artifacts,
-      renderedText: patch.render()
-    }));
-    const groupedPatches = groupPatches(rootDir, renderedPatches);
+    const groupedPatches = groupPatches(rootDir, patches2);
     const resolvedPatches = resolveConflicts2(ecosystem, groupedPatches, ctxt);
     const sortedPatches = resolvedPatches.sort(
       (a4, b) => b.offset !== a4.offset ? b.offset - a4.offset : (b.length ?? 0) - (a4.length ?? 0)
     );
     for (const patch of sortedPatches) {
       const oldFileContent = fileContent;
-      fileContent = fileContent.substring(0, patch.offset) + patch.renderedText + fileContent.substring(patch.offset + (patch.length ?? 0));
+      fileContent = fileContent.substring(0, patch.offset) + patch.text + fileContent.substring(patch.offset + (patch.length ?? 0));
       ctxt.statusUpdater?.({
         status: "success",
         file: patch.file,
@@ -199866,7 +199839,7 @@ async function applyPatches(ecosystem, rootDir, patches, ctxt) {
 function groupPatches(rootDir, patches) {
   const groupMap = /* @__PURE__ */ new Map();
   for (const patch of patches) {
-    const groupKey = `${resolve7(rootDir, patch.file)}|${patch.offset}|${patch.length ?? 0}|${patch.renderedText}`;
+    const groupKey = `${resolve7(rootDir, patch.file)}|${patch.offset}|${patch.length ?? 0}|${patch.text}`;
     const existing = groupMap.get(groupKey);
     if (existing) {
       existing.artifacts = i(existing.artifacts.concat(patch.artifacts));
@@ -203863,6 +203836,7 @@ var PomUpgradeHandler = class {
   };
   async handle(ctxt) {
     const patches = [];
+    const managedDependenciesToAdd = /* @__PURE__ */ new Map();
     for (const [idx, upgradeVersion] of ctxt.upgrades) {
       const artifact = ctxt.artifacts[idx];
       const validatedManifestFiles = i(
@@ -203873,9 +203847,41 @@ var PomUpgradeHandler = class {
         ).map((f6) => resolve9(this.rootDir, f6)).filter(this.validateFile)
       );
       await asyncForEach(validatedManifestFiles, async (validatedManifestFile) => {
-        patches.push(...await this.getPatchesForUpgrade(validatedManifestFile, idx, upgradeVersion, ctxt));
+        const res = await this.getPatchesAndManagedDependencies(validatedManifestFile, idx, upgradeVersion, ctxt);
+        patches.push(...res.patches ?? []);
+        if (res.managedDependencies) {
+          if (!managedDependenciesToAdd.has(validatedManifestFile)) {
+            managedDependenciesToAdd.set(validatedManifestFile, { artifacts: [], dependencies: [] });
+          }
+          const { artifacts, dependencies } = managedDependenciesToAdd.get(validatedManifestFile);
+          artifacts.push(idx);
+          dependencies.push(...res.managedDependencies);
+        }
       });
     }
+    for (const [validatedManifestFile, { artifacts, dependencies }] of managedDependenciesToAdd) {
+      const pom = await loadPom(this.rootDir, validatedManifestFile, this.validateFile);
+      if (!pom) {
+        ctxt.statusUpdater?.({
+          status: "error",
+          file: validatedManifestFile,
+          artifacts,
+          message: `Manifest file not valid for updates`
+        });
+        continue;
+      }
+      const patch = getManagedDependenciesPatch(pom, dependencies);
+      if (patch) {
+        patches.push({ ...patch, artifacts });
+      } else {
+        ctxt.statusUpdater?.({
+          status: "error",
+          file: validatedManifestFile,
+          artifacts,
+          message: `Could not find or create managedDependencies patch`
+        });
+      }
+    }
     await applyPatches("MAVEN", this.rootDir, patches, ctxt);
     const recomputedArtifacts = patches.length ? await Spinner.instance().wrap(
       "Computing remaining upgrades",
@@ -203892,6 +203898,7 @@ var PomUpgradeHandler = class {
     }
     const reindex = computeRemainingSocketUpgrades("MAVEN", ctxt.upgrades, ctxt.artifacts, recomputedArtifacts);
     const fallbackPatches = [];
+    const dependenciesToAdd = /* @__PURE__ */ new Map();
     for (const [oldIdx, { idx: newIdx }] of reindex) {
       const newArtifact = ctxt.artifacts[newIdx];
       const validatedManifestFiles = i(
@@ -203902,21 +203909,49 @@ var PomUpgradeHandler = class {
         ).map((f6) => resolve9(this.rootDir, f6)).filter(this.validateFile)
       );
       await asyncForEach(validatedManifestFiles, async (validatedManifestFile) => {
-        const patch = await this.getFallbackPatchForUpgrade(
+        const dependency = await this.getFallbackDependency(
           validatedManifestFile,
           oldIdx,
           newIdx,
           recomputedArtifacts,
           ctxt
         );
-        if (patch) {
-          fallbackPatches.push(patch);
+        if (dependency) {
+          if (!dependenciesToAdd.has(validatedManifestFile)) {
+            dependenciesToAdd.set(validatedManifestFile, { artifacts: [], dependencies: [] });
+          }
+          const { artifacts, dependencies } = dependenciesToAdd.get(validatedManifestFile);
+          artifacts.push(oldIdx);
+          dependencies.push(dependency);
         }
       });
     }
+    for (const [validatedManifestFile, { artifacts, dependencies }] of dependenciesToAdd) {
+      const pom = await loadPom(this.rootDir, validatedManifestFile, this.validateFile);
+      if (!pom) {
+        ctxt.statusUpdater?.({
+          status: "error",
+          file: validatedManifestFile,
+          artifacts,
+          message: `Manifest file not valid for updates`
+        });
+        continue;
+      }
+      const patch = getDependenicesPatch(pom, dependencies);
+      if (patch) {
+        fallbackPatches.push({ ...patch, artifacts });
+      } else {
+        ctxt.statusUpdater?.({
+          status: "error",
+          file: validatedManifestFile,
+          artifacts,
+          message: `Could not find or create dependencies patch`
+        });
+      }
+    }
     await applyPatches("MAVEN", this.rootDir, fallbackPatches, ctxt);
   }
-  async getPatchesForUpgrade(manifestFile, idx, upgradeVersion, ctxt) {
+  async getPatchesAndManagedDependencies(manifestFile, idx, upgradeVersion, ctxt) {
     const pom = await loadPom(this.rootDir, manifestFile, this.validateFile);
     if (!pom) {
       ctxt.statusUpdater?.({
@@ -203925,9 +203960,10 @@ var PomUpgradeHandler = class {
         artifacts: [idx],
         message: `Manifest file not valid for updates`
       });
-      return [];
+      return {};
     }
     const patches = [];
+    const managedDependencies = [];
     const artifact = ctxt.artifacts[idx];
     assert3(artifact.namespace);
     assert3(artifact.name);
@@ -203956,7 +203992,7 @@ var PomUpgradeHandler = class {
             file: patchLocation.file,
             offset: patchLocation.offset,
             length: patchLocation.text.length,
-            render: () => ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
+            text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
           });
         } else {
           ctxt.statusUpdater?.({
@@ -203985,7 +204021,7 @@ var PomUpgradeHandler = class {
               file: patchLocation.file,
               offset: patchLocation.offset,
               length: patchLocation.text.length,
-              render: () => ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
+              text: ctxt.rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
             });
           } else {
             ctxt.statusUpdater?.({
@@ -203996,34 +204032,19 @@ var PomUpgradeHandler = class {
             });
           }
         } else {
-          const dependency = {
+          managedDependencies.push({
             groupId: artifact.namespace,
             artifactId: artifact.name,
             version: ctxt.rangeStyle === "pin" ? upgradeMavenRangePinned.toString() : upgradeMavenVersion.toString(),
             type: artifact.qualifiers?.type,
             classifier: artifact.qualifiers?.classifier
-          };
-          const patch = getSingletonManagedDependenciesPatch(pom);
-          if (patch) {
-            if (patch.artifacts.length === 0) {
-              patches.push(patch);
-            }
-            patch.artifacts.push(idx);
-            patch.render = /* @__PURE__ */ ((render3) => (t4) => render3((t4 ?? "") + getDependencyXml(pom, dependency, 2)))(patch.render);
-          } else {
-            ctxt.statusUpdater?.({
-              status: "error",
-              file: manifestFile,
-              artifacts: [idx],
-              message: `Could not find or create managedDependencies group`
-            });
-          }
+          });
         }
       }
     }
-    return patches;
+    return { patches, managedDependencies };
   }
-  async getFallbackPatchForUpgrade(manifestFile, oldIdx, newIdx, recomputedArtifacts, { statusUpdater }) {
+  async getFallbackDependency(manifestFile, oldIdx, newIdx, recomputedArtifacts, { statusUpdater }) {
     const pom = await loadPom(this.rootDir, manifestFile, this.validateFile);
     if (!pom) {
       statusUpdater?.({
@@ -204037,28 +204058,12 @@ var PomUpgradeHandler = class {
     const artifact = recomputedArtifacts[newIdx];
     assert3(artifact.namespace);
     assert3(artifact.name);
-    assert3(artifact.version);
-    const dependency = {
+    return {
       groupId: artifact.namespace,
       artifactId: artifact.name,
       type: artifact.qualifiers?.type,
       classifier: artifact.qualifiers?.classifier
     };
-    const patch = getSingletonDependenciesPatch(pom);
-    if (patch) {
-      patch.artifacts.push(oldIdx);
-      patch.render = /* @__PURE__ */ ((render3) => (t4) => render3((t4 ?? "") + getDependencyXml(pom, dependency, 1)))(patch.render);
-      if (patch.artifacts.length === 1) {
-        return patch;
-      }
-    } else {
-      statusUpdater?.({
-        status: "error",
-        file: manifestFile,
-        artifacts: [oldIdx],
-        message: `Could not find or create dependencies group`
-      });
-    }
   }
 };
 
@@ -204114,7 +204119,7 @@ var GradleLockfileUpgradeHandler = class {
           file: lockFile.file,
           offset: startIndex,
           length: currentVersionPattern.length,
-          render: () => newVersionPattern
+          text: newVersionPattern
         });
       } else {
         ctxt.statusUpdater?.({
@@ -204419,7 +204424,7 @@ var SbtUpgradeHandler = class {
             file: sbtFile,
             offset: moduleId.version.offset,
             length: moduleId.version.text.length,
-            render: () => delim + (rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()) + delim
+            text: delim + (rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()) + delim
           };
         }
       }
@@ -204450,7 +204455,7 @@ var SbtUpgradeHandler = class {
         file: dependencyOverridesFile,
         artifacts: upgrades.map(({ idx }) => idx),
         offset: 0,
-        render: () => `dependencyOverrides ++= Seq(
+        text: `dependencyOverrides ++= Seq(
 ${indent(1, indentationSize)}${moduleIds.join(`,
 ${indent(1, indentationSize)}`)}
 )
@@ -204464,7 +204469,7 @@ ${indent(1, indentationSize)}`)}
         file: dependencyOverridesFile,
         artifacts: upgrades.map(({ idx }) => idx),
         offset: fileContent.length,
-        render: () => `${prependNewline ? "\n" : ""}dependencyOverrides ++= Seq(
+        text: `${prependNewline ? "\n" : ""}dependencyOverrides ++= Seq(
 ${indent(1, indentationSize)}${moduleIds.join(`,
 ${indent(1, indentationSize)}`)})
 `
@@ -213002,7 +213007,7 @@ function createPackageReferencePatch(project, parent2, idx, packageName, version
     file: project.validatedProjectPath,
     offset: parent2.end - 3 - parent2.name.length,
     artifacts: [idx],
-    render: () => `${indent2}<PackageReference Include="${packageName}"${versionAttr}${conditionAttr} />
+    text: `${indent2}<PackageReference Include="${packageName}"${versionAttr}${conditionAttr} />
 ${indent2}`
   };
 }
@@ -213013,7 +213018,7 @@ function createPackageVersionPatch(project, parent2, idx, packageName, version3,
     file: project.validatedProjectPath,
     offset: parent2.end - 3 - parent2.name.length,
     artifacts: [idx],
-    render: () => `${indent2}<PackageVersion Include="${packageName}" Version="${version3}"${conditionAttr} />
+    text: `${indent2}<PackageVersion Include="${packageName}" Version="${version3}"${conditionAttr} />
 ${indent2}`
   };
 }
@@ -213024,7 +213029,7 @@ function createPackagesConfigPackagePatch(config3, idx, packageName, version3, t
     file: config3.validatedConfigPath,
     offset: packagesElement.end - 3 - packagesElement.name.length,
     artifacts: [idx],
-    render: () => `
+    text: `
 ${" ".repeat(2)}<package id="${packageName}" version="${version3}"${targetFramework ? ` targetFramework="${targetFramework}"` : ""}/>
 `
   };
@@ -213035,7 +213040,7 @@ function createPropertyPatch(project, idx, parent2, propertyName, value) {
     file: project.validatedProjectPath,
     offset: parent2.end - 3 - parent2.name.length,
     artifacts: [idx],
-    render: () => `${indent2}<${propertyName}>${value}</${propertyName}>
+    text: `${indent2}<${propertyName}>${value}</${propertyName}>
 ${indent2}`
   };
 }
@@ -213189,7 +213194,7 @@ var NuGetSocketUpgradeManager = class {
               offset: patchLocation.offset,
               length: patchLocation.text.length,
               artifacts: [idx],
-              render: () => "true"
+              text: "true"
             });
           } else {
             ctxt.statusUpdater?.({
@@ -213231,7 +213236,7 @@ var NuGetSocketUpgradeManager = class {
             offset: patchLocation.offset,
             length: patchLocation.text.length,
             artifacts: [idx],
-            render: () => (
+            text: (
               // Use pinned version if rangeStyle is set or if we break existing spec!
               ctxt.rangeStyle === "pin" || !existingVersionRange.contains(upgradeNuGetVersion) ? upgradeNuGetRangePinned.toString() : NuGetRange.commonSubset(upgradeNuGetRange, existingVersionRange).toString()
             )
@@ -213257,7 +213262,7 @@ var NuGetSocketUpgradeManager = class {
             offset: patchLocation.offset,
             length: patchLocation.text.length,
             artifacts: [idx],
-            render: () => (
+            text: (
               // Use pinned version if rangeStyle is set or if we break existing spec!
               ctxt.rangeStyle === "pin" || !existingVersionOverrideRange.contains(upgradeNuGetVersion) ? upgradeNuGetRangePinned.toString() : NuGetRange.commonSubset(upgradeNuGetRange, existingVersionOverrideRange).toString()
             )
@@ -213284,7 +213289,7 @@ var NuGetSocketUpgradeManager = class {
             offset: patchLocation.offset,
             length: patchLocation.text.length,
             artifacts: [idx],
-            render: () => (
+            text: (
               // Use pinned version if rangeStyle is set or if we break existing spec!
               ctxt.rangeStyle === "pin" || !existingVersionRange.contains(upgradeNuGetVersion) ? upgradeNuGetRangePinned.toString() : NuGetRange.commonSubset(upgradeNuGetRange, existingVersionRange).toString()
             )
@@ -213317,7 +213322,7 @@ var NuGetSocketUpgradeManager = class {
           offset: pkg.version.offset,
           length: pkg.version.text.length,
           artifacts: [idx],
-          render: () => upgradeVersion
+          text: upgradeVersion
         });
       } else {
         ctxt.statusUpdater?.({
@@ -213506,7 +213511,7 @@ var CargoSocketUpgradeManager = class {
               offset: kvPair.value.range[0] + 1,
               length: kvPair.value.value.length,
               artifacts: [idx],
-              render: () => newVersionString
+              text: newVersionString
             });
           }
         } else if (kvPair.value.type === "TOMLInlineTable") {
@@ -213574,7 +213579,7 @@ var CargoSocketUpgradeManager = class {
               // Skip opening quote
               length: packageVersion.length,
               artifacts: [idx],
-              render: () => upgradeVersion
+              text: upgradeVersion
             });
             if (checksumNode) {
               const checksumKvPair = node.body.find(
@@ -213587,7 +213592,7 @@ var CargoSocketUpgradeManager = class {
                   offset: checksumKvPair.range[0],
                   length: checksumText.length,
                   artifacts: [idx],
-                  render: () => ""
+                  text: ""
                 });
               }
             }
@@ -213661,7 +213666,7 @@ var CargoSocketUpgradeManager = class {
             // Skip opening quote
             length: currentVersion.length,
             artifacts: [idx],
-            render: () => newVersionString
+            text: newVersionString
           };
         }
       }
@@ -213781,14 +213786,14 @@ var PipSocketUpgradeManager = class {
               offset: firstSpec.data.operator.location.startIdx,
               length: lastSpec.location.endIdx - firstSpec.data.operator.location.startIdx,
               artifacts: [idx],
-              render: () => `==${operatorToVersionWhitespace}${upgradeVersion}`
+              text: `==${operatorToVersionWhitespace}${upgradeVersion}`
             });
           } else {
             patches.push({
               file: ref.file,
               offset: foundRequirement.location.endIdx,
               artifacts: [idx],
-              render: () => `==${upgradeVersion}`
+              text: `==${upgradeVersion}`
             });
           }
         } else if (foundRequirement.data.versionSpec?.length) {
@@ -213801,19 +213806,19 @@ var PipSocketUpgradeManager = class {
               spec.data.version.location.startIdx
             );
             const patch = operator === ">" ? {
-              render: () => `>=${whitespace2}${upgradeVersion}`,
+              text: `>=${whitespace2}${upgradeVersion}`,
               offset: spec.data.operator.location.startIdx,
               length: spec.data.version.location.endIdx - spec.data.operator.location.startIdx
             } : operator === "<" ? {
-              render: () => `<=${whitespace2}${upgradeVersion}`,
+              text: `<=${whitespace2}${upgradeVersion}`,
               offset: spec.data.operator.location.startIdx,
               length: spec.data.version.location.endIdx - spec.data.operator.location.startIdx
             } : operator === "!=" && pipCompareVersions(specVersion, upgradeVersion) === 0 ? {
-              render: () => "",
+              text: "",
               offset: spec.data.operator.location.startIdx,
               length: spec.data.version.location.endIdx - spec.data.operator.location.startIdx
             } : operator === "!=" ? void 0 : {
-              render: () => upgradeVersion,
+              text: upgradeVersion,
               offset: spec.data.version.location.startIdx,
               length: spec.data.version.location.endIdx - spec.data.version.location.startIdx
             };
@@ -213835,7 +213840,7 @@ var PipSocketUpgradeManager = class {
               file: ref.file,
               offset: firstSpec.data.operator.location.startIdx,
               artifacts: [idx],
-              render: () => `>=${upgradeVersion},${commaSpacing}`
+              text: `>=${upgradeVersion},${commaSpacing}`
             });
           }
         } else {
@@ -213843,7 +213848,7 @@ var PipSocketUpgradeManager = class {
             file: ref.file,
             offset: foundRequirement.data.name.location.endIdx,
             artifacts: [idx],
-            render: () => `==${upgradeVersion}`
+            text: `==${upgradeVersion}`
           });
         }
       } else {
@@ -213880,7 +213885,7 @@ var PipSocketUpgradeManager = class {
         file: requirementsFile,
         offset: content.length,
         artifacts: [idx],
-        render: () => content.endsWith("\n") ? `${newText}
+        text: content.endsWith("\n") ? `${newText}
 ` : `
 ${newText}
 `
@@ -216342,7 +216347,8 @@ var ADVISORY_SEVERITIES = [
   "HIGH",
   "CRITICAL"
 ];
-var ADVISORY_SEVERITIES_SORTED = ADVISORY_SEVERITIES.toReversed();
+var ADVISORY_SEVERITIES_SORTED = ADVISORY_SEVERITIES;
+ADVISORY_SEVERITIES_SORTED.reverse();
 function toPlainDependencyTree(dependencyTree) {
   function pickNode(node) {
     return i3(node, ["packageName", "version", "dependencies", "resolvedType"]);
@@ -233563,7 +233569,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version2 = "14.12.47";
+var version2 = "14.12.48";
 
 // dist/cli-core.js
 var { mapValues, omit, partition, pick } = import_lodash15.default;