@socketsecurity/cli 0.14.31 → 0.14.33

package/dist/module-sync/npm-injection.js

@@ -43,7 +43,7 @@ var arborist = {};
 var ttyServer$1 = {};
 
 var name = "@socketsecurity/cli";
-var version = "0.14.31";
+var version = "0.14.33";
 var description = "CLI tool for Socket.dev";
 var homepage = "http://github.com/SocketDev/socket-cli";
 var license = "MIT";
@@ -883,20 +883,16 @@ async function getPackagesAlerts(safeArb, _registry, pkgs, output) {
           });
           // Before we ask about problematic issues, check to see if they
           // already existed in the old version if they did, be quiet.
-          const pkg = pkgs.find(p => p.pkgid === id && p.existing?.startsWith(`${name}@`));
-          if (pkg?.existing) {
+          const existing = pkgs.find(p => p.existing?.startsWith(`${name}@`))?.existing;
+          if (existing) {
             const oldArtifact =
             // eslint-disable-next-line no-await-in-loop
-            (await batchScan([pkg.existing]).next()).value;
-            console.log('oldArtifact', oldArtifact);
-            // if (oldArtifact.type === 'success') {
-            //   issues = issues.filter(
-            //     ({ type }) =>
-            //       oldPkgData.value.issues.find(
-            //         oldIssue => oldIssue.type === type
-            //       ) === undefined
-            //   )
-            // }
+            (await batchScan([existing]).next()).value;
+            if (oldArtifact?.alerts?.length) {
+              alerts = alerts.filter(({
+                type
+              }) => !oldArtifact.alerts?.find(a => a.type === type));
+            }
           }
         }
       }
@@ -959,23 +955,31 @@ function walk(diff_, needInfoOn = []) {
     if (!diff) {
       continue;
     }
-    if (diff.action) {
-      const sameVersion = diff.actual?.package.version === diff.ideal?.package.version;
+    const {
+      action
+    } = diff;
+    if (action) {
+      const oldNode = diff.actual;
+      const oldPkgid = oldNode?.pkgid;
+      const pkgNode = diff.ideal;
+      const pkgid = pkgNode?.pkgid;
+      let existing;
       let keep = false;
-      let existing = null;
-      if (diff.action === 'CHANGE') {
-        if (!sameVersion) {
-          existing = diff.actual.pkgid;
+      if (action === 'CHANGE') {
+        if (pkgNode?.package.version !== oldNode?.package.version) {
           keep = true;
+          if (oldNode?.package.name && oldNode.package.name === pkgNode?.package.name) {
+            existing = oldPkgid;
+          }
         }
       } else {
-        keep = diff.action !== 'REMOVE';
+        keep = action !== 'REMOVE';
       }
-      if (keep && diff.ideal?.pkgid && diff.ideal.resolved && (!diff.actual || diff.actual.resolved)) {
+      if (keep && pkgid && pkgNode.resolved && (!oldNode || oldNode.resolved)) {
         needInfoOn.push({
           existing,
-          pkgid: diff.ideal.pkgid,
-          repository_url: toRepoUrl(diff.ideal.resolved)
+          pkgid,
+          repository_url: toRepoUrl(pkgNode.resolved)
         });
       }
     }

package/dist/require/npm-injection.js

@@ -42,7 +42,7 @@ var arborist = {};
 var ttyServer$1 = {};
 
 var name = "@socketsecurity/cli";
-var version = "0.14.31";
+var version = "0.14.33";
 var description = "CLI tool for Socket.dev";
 var homepage = "http://github.com/SocketDev/socket-cli";
 var license = "MIT";
@@ -882,20 +882,16 @@ async function getPackagesAlerts(safeArb, _registry, pkgs, output) {
           });
           // Before we ask about problematic issues, check to see if they
           // already existed in the old version if they did, be quiet.
-          const pkg = pkgs.find(p => p.pkgid === id && p.existing?.startsWith(`${name}@`));
-          if (pkg?.existing) {
+          const existing = pkgs.find(p => p.existing?.startsWith(`${name}@`))?.existing;
+          if (existing) {
             const oldArtifact =
             // eslint-disable-next-line no-await-in-loop
-            (await batchScan([pkg.existing]).next()).value;
-            console.log('oldArtifact', oldArtifact);
-            // if (oldArtifact.type === 'success') {
-            //   issues = issues.filter(
-            //     ({ type }) =>
-            //       oldPkgData.value.issues.find(
-            //         oldIssue => oldIssue.type === type
-            //       ) === undefined
-            //   )
-            // }
+            (await batchScan([existing]).next()).value;
+            if (oldArtifact?.alerts?.length) {
+              alerts = alerts.filter(({
+                type
+              }) => !oldArtifact.alerts?.find(a => a.type === type));
+            }
           }
         }
       }
@@ -958,23 +954,31 @@ function walk(diff_, needInfoOn = []) {
     if (!diff) {
       continue;
     }
-    if (diff.action) {
-      const sameVersion = diff.actual?.package.version === diff.ideal?.package.version;
+    const {
+      action
+    } = diff;
+    if (action) {
+      const oldNode = diff.actual;
+      const oldPkgid = oldNode?.pkgid;
+      const pkgNode = diff.ideal;
+      const pkgid = pkgNode?.pkgid;
+      let existing;
       let keep = false;
-      let existing = null;
-      if (diff.action === 'CHANGE') {
-        if (!sameVersion) {
-          existing = diff.actual.pkgid;
+      if (action === 'CHANGE') {
+        if (pkgNode?.package.version !== oldNode?.package.version) {
           keep = true;
+          if (oldNode?.package.name && oldNode.package.name === pkgNode?.package.name) {
+            existing = oldPkgid;
+          }
         }
       } else {
-        keep = diff.action !== 'REMOVE';
+        keep = action !== 'REMOVE';
       }
-      if (keep && diff.ideal?.pkgid && diff.ideal.resolved && (!diff.actual || diff.actual.resolved)) {
+      if (keep && pkgid && pkgNode.resolved && (!oldNode || oldNode.resolved)) {
         needInfoOn.push({
           existing,
-          pkgid: diff.ideal.pkgid,
-          repository_url: toRepoUrl(diff.ideal.resolved)
+          pkgid,
+          repository_url: toRepoUrl(pkgNode.resolved)
         });
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/cli",
-  "version": "0.14.31",
+  "version": "0.14.33",
   "description": "CLI tool for Socket.dev",
   "homepage": "http://github.com/SocketDev/socket-cli",
   "license": "MIT",