@socketsecurity/cli-with-sentry 0.15.44 → 0.15.46

package/dist/cli.js

@@ -3690,7 +3690,7 @@ function getSocketBranchName(purl, newVersion, workspace) {
   const fmtFullName = getSocketBranchFullNameComponent(purlObj);
   const fmtVersion = getSocketBranchPackageVersionComponent(purlObj.version);
   const fmtNewVersion = formatBranchName(newVersion);
-  return `socket/${fmtType}_${fmtWorkspace}_${fmtFullName}_${fmtVersion}_${fmtNewVersion}`;
+  return `socket/${fmtType}/${fmtWorkspace}/${fmtFullName}_${fmtVersion}_${fmtNewVersion}`;
 }
 function getSocketBranchPattern(options) {
   const {
@@ -3708,7 +3708,7 @@ function getSocketBranchPattern(options) {
   const escFullName = purlObj ? `${escMaybeNamespace}${regexps.escapeRegExp(formatBranchName(purlObj.name))}` : '[^_]+';
   const escVersion = purlObj ? regexps.escapeRegExp(formatBranchName(purlObj.version)) : '[^_]+';
   const escNewVersion = newVersion ? regexps.escapeRegExp(formatBranchName(newVersion)) : '[^_]+';
-  return new RegExp(`^socket/(${escType})_(${escWorkspace})_(${escFullName})_(${escVersion})_(${escNewVersion})$`);
+  return new RegExp(`^socket/(${escType})/(${escWorkspace})/(${escFullName})_(${escVersion})_(${escNewVersion})$`);
 }
 function createSocketBranchParser(options) {
   const pattern = getSocketBranchPattern(options);
@@ -4392,6 +4392,11 @@ async function npmFix(pkgEnvDetails, {
           activeBranches.push(parsedBranch);
         }
       }
+      if (activeBranches.length) {
+        debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
+      } else if (openPrs.length) {
+        debug.debugFn('miss: 0 active branches found');
+      }
       infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
     }
     if (!infos.length) {
@@ -4877,10 +4882,18 @@ async function pnpmFix(pkgEnvDetails, {
       const activeBranches = [];
       for (const pr of openPrs) {
         const parsedBranch = branchParser(pr.headRefName);
+        debug.debugFn(`parse: ${pr.headRefName}\n`, parsedBranch);
+        debug.debugFn(`check: branchPurlType ${branchPurlType} === ${parsedBranch?.type}`);
+        debug.debugFn(`check: branchFullName ${branchFullName} === ${parsedBranch?.fullName}`);
         if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
           activeBranches.push(parsedBranch);
         }
       }
+      if (activeBranches.length) {
+        debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
+      } else if (openPrs.length) {
+        debug.debugFn('miss: 0 active branches found');
+      }
       infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
     }
     if (!infos.length) {
@@ -13940,12 +13953,15 @@ function addSocketWrapper(file) {
     if (err) {
       return new Error(`There was an error setting up the alias: ${err}`);
     }
-    // TODO: pretty sure you need to source the file or restart
-    //       any terminal session before changes are reflected.
-    logger.logger.log(`
-The alias was added to ${file}. Running 'npm install' will now be wrapped in Socket's "safe npm" 🎉
-If you want to disable it at any time, run \`socket wrapper --disable\`
-      `.trim());
+    logger.logger.success(`The alias was added to ${file}. Running 'npm install' will now be wrapped in Socket's "safe npm" 🎉`);
+    logger.logger.log(`  If you want to disable it at any time, run \`socket wrapper --disable\``);
+    logger.logger.log('');
+    logger.logger.info(`This will only be active in new terminal sessions going forward.`);
+    logger.logger.log(`  You will need to restart your terminal or run this command to activate the alias in the current session:`);
+    logger.logger.log('');
+    logger.logger.log(`    source ${file}`);
+    logger.logger.log('');
+    logger.logger.log(`(You only need to do this once)`);
   });
 }
 
@@ -13953,7 +13969,12 @@ function checkSocketWrapperSetup(file) {
   const fileContent = fs$1.readFileSync(file, 'utf8');
   const linesWithSocketAlias = fileContent.split('\n').filter(l => l === 'alias npm="socket npm"' || l === 'alias npx="socket npx"');
   if (linesWithSocketAlias.length) {
-    logger.logger.log(`The Socket npm/npx wrapper is set up in your bash profile (${file})`);
+    logger.logger.log(`The Socket npm/npx wrapper is set up in your bash profile (${file}).`);
+    logger.logger.log('');
+    logger.logger.log(`If you haven't already since enabling; Restart your terminal or run this command to activate it in the current session:`);
+    logger.logger.log('');
+    logger.logger.log(`    source ${file}`);
+    logger.logger.log('');
     return true;
   }
   return false;
@@ -14046,9 +14067,9 @@ function removeSocketWrapper(file) {
         logger.logger.error(err);
         return;
       }
-      // TODO: pretty sure you need to source the file or restart
-      //       any terminal session before changes are reflected.
-      logger.logger.log(`The alias was removed from ${file}. Running 'npm install' will now run the standard npm command.`);
+      logger.logger.success(`The alias was removed from ${file}. Running 'npm install' will now run the standard npm command in new terminals going forward.`);
+      logger.logger.log('');
+      logger.logger.info(`Note: We cannot deactivate the alias from current terminal sessions. You have to restart existing terminal sessions to finalize this step.`);
     });
   });
 }
@@ -14247,5 +14268,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=4d928533-b1b0-4544-a736-d405169a5523
+//# debugId=ad52decd-77a1-456a-85fe-05c2c8c57de5
 //# sourceMappingURL=cli.js.map