@coana-tech/cli 14.12.217 → 14.12.218

package/cli.mjs

@@ -225843,14 +225843,25 @@ var YarnFixingManager = class extends NpmEcosystemFixingManager {
         ([pkgIdentifier, pkgObj2]) => pkgIdentifier.startsWith(`${fix.dependencyName}@`) && pkgObj2.version === fix.currentVersion
       );
       if (!packageToFix) return;
-      const [, pkgObj] = packageToFix;
+      const [oldKey, pkgObj] = packageToFix;
       const packageDetails = await getPackageVersionDetailsFromNpm(fix.dependencyName, fix.fixedVersion);
-      Object.assign(pkgObj, {
-        version: fix.fixedVersion,
-        resolution: `${fix.dependencyName}@npm:${fix.fixedVersion}`,
-        dependencies: packageDetails.dependencies
-      });
+      pkgObj.version = fix.fixedVersion;
+      pkgObj.resolution = `${fix.dependencyName}@npm:${fix.fixedVersion}`;
+      setOrDelete(pkgObj, "dependencies", withBerryNpmDescriptors(packageDetails.dependencies));
+      setOrDelete(pkgObj, "optionalDependencies", withBerryNpmDescriptors(packageDetails.optionalDependencies));
       delete pkgObj.checksum;
+      const exactOldKey = `${fix.dependencyName}@npm:${fix.currentVersion}`;
+      const newKey = `${fix.dependencyName}@npm:${fix.fixedVersion}`;
+      if (oldKey === exactOldKey && newKey !== oldKey) {
+        const lock = yarnLock;
+        if (lock[newKey] !== void 0 && lock[newKey] !== pkgObj) {
+          throw new Error(
+            `Cannot rename lockfile entry "${oldKey}" to "${newKey}": target key already exists with different contents`
+          );
+        }
+        lock[newKey] = pkgObj;
+        delete lock[oldKey];
+      }
     });
     await this.writeYarnObj(yarnLock, yarnLockLocation);
   }
@@ -225895,6 +225906,21 @@ var YarnFixingManager = class extends NpmEcosystemFixingManager {
     }
   }
 };
+function withBerryNpmDescriptors(deps) {
+  if (!deps) return deps;
+  const result = {};
+  for (const [name2, range2] of Object.entries(deps)) {
+    result[name2] = /^[a-z][a-z0-9+.-]*:/i.test(range2) ? range2 : `npm:${range2}`;
+  }
+  return result;
+}
+function setOrDelete(obj, key, value2) {
+  if (value2 === void 0) {
+    delete obj[key];
+  } else {
+    obj[key] = value2;
+  }
+}
 async function checkForYarnResolutions(packageJsonPath, fixes) {
   if (!existsSync16(packageJsonPath)) return;
   const content = await readFile19(packageJsonPath, "utf-8");
@@ -251805,7 +251831,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version3 = "14.12.217";
+var version3 = "14.12.218";
 
 // dist/cli-core.js
 var { mapValues, omit, partition, pickBy: pickBy2 } = import_lodash15.default;

package/package.json

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