@coana-tech/cli 14.1.3 → 14.2.0

package/cli.js

@@ -40380,20 +40380,18 @@ var init_npm_ecosystem_fixing_manager = __esm({
             signalFixApplied?.(fixId, this.subprojectPath, workspacePath, vulnerabilityFixes);
           });
         });
+        await this.finalizeFixes();
       }
       async applySecurityFixesForWorkspace(workspacePath, fixes, dependencyTree, directDependencyToPackageType, packageManagerInfo) {
         const that = this;
-        const directDependenciesToBump = fixes.filter((f5) => dependencyTree.dependencies?.includes(f5.dependencyIdentifier));
-        await this.applySecurityFixesSpecificPackageManager(workspacePath, fixes);
+        const directDependenciesToBump = await this.getDirectDependenciesToBump(workspacePath, dependencyTree, fixes);
+        await this.applySecurityFixesSpecificPackageManager(fixes);
         if (directDependenciesToBump.length === 0) return;
-        await updateDependenciesInPackageJSON(directDependenciesToBump, workspacePath);
-        async function updateDependenciesInPackageJSON(directDependenciesToBump2, workspacePath2) {
-          await applySeries(["prod", "dev"], async (type) => {
-            const packagesOfType = directDependenciesToBump2.filter((f5) => directDependencyToPackageType[f5.dependencyName] === type).map((f5) => `${f5.dependencyName}@${f5.fixedVersion}`);
-            if (packagesOfType.length === 0) return;
-            await that.installSpecificPackages(workspacePath2, type === "dev", packagesOfType, packageManagerInfo);
-          });
-        }
+        await applySeries(["prod", "dev"], async (type) => {
+          const packagesOfType = directDependenciesToBump.filter((f5) => directDependencyToPackageType[f5.dependencyName] === type).map((f5) => `${f5.dependencyName}@${f5.fixedVersion}`);
+          if (packagesOfType.length === 0) return;
+          await that.installSpecificPackages(workspacePath, type === "dev", packagesOfType, packageManagerInfo);
+        });
       }
       async getDirectDependenciesToBump(_workspacePath, dependencyTree, fix) {
         return fix.filter((f5) => dependencyTree.dependencies?.includes(f5.dependencyIdentifier));
@@ -40415,12 +40413,15 @@ var init_npm_fixing_manager = __esm({
     init_npm_ecosystem_fixing_manager();
     NpmFixingManager = class extends NpmEcosystemFixingManager {
       async installSpecificPackages(workspacePath, isDev, packagesToInstall) {
-        return actuallyRunInstall(
+        const result = await actuallyRunInstall(
           cmdt`${isDev && "-D"} ${packagesToInstall}`,
           (0, import_path.resolve)(this.rootDir, this.subprojectPath, workspacePath)
         );
+        if (!result) {
+          throw new Error(`Failed to install packages`);
+        }
       }
-      async applySecurityFixesSpecificPackageManager(_workspacePath, fixes) {
+      async applySecurityFixesSpecificPackageManager(fixes) {
         const pkgLockLocation = (0, import_path.resolve)(this.rootDir, this.subprojectPath, "package-lock.json");
         const packageLockContent = await (0, import_promises2.readFile)(pkgLockLocation, "utf-8");
         const getPackageName = (pkgPath) => {
@@ -40444,6 +40445,8 @@ var init_npm_fixing_manager = __esm({
           throw new Error(`Failed to update package-lock.json ${e.stack}`);
         }
       }
+      async finalizeFixes() {
+      }
     };
   }
 });
@@ -67445,15 +67448,15 @@ var init_pnpm_fixing_manager = __esm({
           throw new Error(`fixing data for package manager 'PNPM' required, got ${packageManagerInfo.packageManager}`);
         }
         const isInstallingInRootOfWorkspace = workspacePath === "." && packageManagerInfo.workspacePaths.length > 1;
-        return this.actuallyRunInstall(
+        await this.actuallyRunInstall(
           cmdt`${isDev && "-D"} ${isInstallingInRootOfWorkspace && "-w"} ${packagesToInstall}`,
           workspacePath
         );
       }
       async actuallyRunInstall(specificPackagesCmd = [], workspacePath = ".") {
-        const installationCommand = cmdt`corepack pnpm install --ignore-scripts ${specificPackagesCmd}`;
+        const installationCommand = cmdt`pnpm install --ignore-scripts ${specificPackagesCmd}`;
         logger.info(`running installation command: ${installationCommand}`);
-        return execAndLogOnFailure(installationCommand, (0, import_path2.resolve)(this.rootDir, this.subprojectPath, workspacePath));
+        await exec(installationCommand, (0, import_path2.resolve)(this.rootDir, this.subprojectPath, workspacePath));
       }
       async getLockFileYaml() {
         const lockFile = await (0, import_lockfile_file.readWantedLockfile)((0, import_path2.resolve)(this.rootDir, this.subprojectPath), { ignoreIncompatible: true });
@@ -67471,7 +67474,7 @@ var init_pnpm_fixing_manager = __esm({
         });
         return directDepsToBump;
       }
-      async applySecurityFixesSpecificPackageManager(workspacePath, fixes) {
+      async applySecurityFixesSpecificPackageManager(fixes) {
         const lockFileYaml = await this.getLockFileYaml();
         try {
           if (lockFileYaml.packages) {
@@ -67539,15 +67542,15 @@ var init_pnpm_fixing_manager = __esm({
             await writeYamlFile(yamlAST, pnpmWorkspaceYamlFile);
           }
           await (0, import_lockfile_file.writeWantedLockfile)((0, import_path2.resolve)(this.rootDir, this.subprojectPath), lockFileYaml);
-          await this.fixLockFile(workspacePath);
         } catch (e) {
           if (e.message) throw e;
           throw new Error("Failed to update pnpm-lock.yaml");
         }
       }
-      async fixLockFile(workspacePath) {
-        const cmd = cmdt`corepack pnpm install --ignore-scripts --fix-lockfile`;
-        await execAndLogOnFailure(cmd, (0, import_path2.resolve)(this.rootDir, this.subprojectPath, workspacePath));
+      async finalizeFixes() {
+        const cmd = cmdt`pnpm install --ignore-scripts --fix-lockfile`;
+        logger.info(`Adjusting lock file changes by running '${cmd}'`);
+        await exec(cmd, (0, import_path2.resolve)(this.rootDir, this.subprojectPath));
       }
     };
   }
@@ -84607,13 +84610,13 @@ var init_yarn_fixing_manager = __esm({
         return pkgJson?.packageManager;
       }
       async installPackages() {
-        return this.actuallyRunInstall();
+        await this.actuallyRunInstall();
       }
       async installSpecificPackages(workspacePath, isDev, packagesToInstall) {
         const installArgs = cmdt`${isDev && "-D"} ${// otherwise yarn will fail with an error when trying to install/update packages
         // in the root of a workspace project.
         this.yarnType === "classic" && "--ignore-workspace-root-check"} ${packagesToInstall}`;
-        return this.actuallyRunInstall(installArgs, workspacePath);
+        await this.actuallyRunInstall(installArgs, workspacePath);
       }
       async actuallyRunInstall(specificPackagesArgs, workspacePath) {
         const yarnInstruction = specificPackagesArgs?.length ? "add" : "install";
@@ -84628,8 +84631,9 @@ var init_yarn_fixing_manager = __esm({
         logger.info(`Running installation command: ${installationCommand}`);
         const installDir = (0, import_path4.resolve)(this.rootDir, this.subprojectPath, workspacePath ?? ".");
         const installResult = await this.runYarnCommand(installationCommand, installDir, { env });
-        if (installResult.error) logCommandOutput(installResult, installationCommand, installDir);
-        return !installResult.error;
+        if (installResult.error) {
+          throw new Error(`Failed to install packages: ${installResult.error.message}`);
+        }
       }
       async getYarnLockObj(filePath) {
         const fileString = await (0, import_promises4.readFile)(filePath, "utf8");
@@ -84709,9 +84713,8 @@ var init_yarn_fixing_manager = __esm({
           delete pkgObj.checksum;
         });
         await this.writeYarnObj(yarnLock, yarnLockLocation);
-        await this.installPackages();
       }
-      async applySecurityFixesSpecificPackageManager(_workspacePath, fixes) {
+      async applySecurityFixesSpecificPackageManager(fixes) {
         const yarnLockLocation = (0, import_path4.resolve)(this.rootDir, this.subprojectPath, "yarn.lock");
         const yarnType = this.yarnType;
         try {
@@ -84724,6 +84727,10 @@ var init_yarn_fixing_manager = __esm({
           throw new Error(`Failed to update yarn.lock ${e.stack}`);
         }
       }
+      async finalizeFixes() {
+        logger.info(`Adjusting lock file changes by running a yarn dependency install command`);
+        await this.installPackages();
+      }
     };
   }
 });
@@ -194028,7 +194035,7 @@ var require_version = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.version = void 0;
-    exports2.version = "14.1.3";
+    exports2.version = "14.2.0";
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coana-tech/cli",
-  "version": "14.1.3",
+  "version": "14.2.0",
   "description": "Coana CLI",
   "bin": {
     "@coana-tech/cli": "./cli.js"