fix: only remove optionals if new deps

Author: 43081j

build/main.js

@@ -24900,27 +24900,6 @@ function formatBytes(bytes) {
 async function scanForDependencySize(messages, threshold, currentDeps, baseDeps, currentLockFile) {
   const newVersions = [];
   const removedVersions = [];
-  const skippedVersions = /* @__PURE__ */ new Map();
-  const allOptionalVersions = /* @__PURE__ */ new Map();
-  for (const pkg of currentLockFile.packages) {
-    traverse(pkg, {
-      optionalDependency: (node) => {
-        const entry = allOptionalVersions.get(node.name) ?? /* @__PURE__ */ new Set();
-        entry.add(node.version);
-        allOptionalVersions.set(node.name, entry);
-      }
-    });
-  }
-  for (const [pkg, versions] of allOptionalVersions) {
-    for (const version of versions) {
-      const pkgMeta = await fetchPackageMetadata(pkg, version);
-      if (pkgMeta && (pkgMeta.os && pkgMeta.os.length > 0 && !pkgMeta.os.includes("linux") || pkgMeta.cpu && pkgMeta.cpu.length > 0 && !pkgMeta.cpu.includes("x64"))) {
-        const entry = skippedVersions.get(pkg) ?? /* @__PURE__ */ new Set();
-        entry.add(version);
-        skippedVersions.set(pkg, entry);
-      }
-    }
-  }
   for (const [packageName, currentVersionSet] of currentDeps) {
     const baseVersionSet = baseDeps.get(packageName);
     for (const version of currentVersionSet) {
@@ -24944,6 +24923,31 @@ async function scanForDependencySize(messages, threshold, currentDeps, baseDeps,
       }
     }
   }
+  if (newVersions.length > 0) {
+    const allOptionalVersions = /* @__PURE__ */ new Map();
+    for (const pkg of currentLockFile.packages) {
+      traverse(pkg, {
+        optionalDependency: (node) => {
+          const entry = allOptionalVersions.get(node.name) ?? /* @__PURE__ */ new Set();
+          entry.add(node.version);
+          allOptionalVersions.set(node.name, entry);
+        }
+      });
+    }
+    for (const [pkg, versions] of allOptionalVersions) {
+      for (const version of versions) {
+        const pkgMeta = await fetchPackageMetadata(pkg, version);
+        if (pkgMeta && (pkgMeta.os && pkgMeta.os.length > 0 && !pkgMeta.os.includes("linux") || pkgMeta.cpu && pkgMeta.cpu.length > 0 && !pkgMeta.cpu.includes("x64"))) {
+          const entry = newVersions.findIndex(
+            (v) => v.name === pkg && v.version === version
+          );
+          if (entry !== -1) {
+            newVersions.splice(entry, 1);
+          }
+        }
+      }
+    }
+  }
   core5.info(`Found ${newVersions.length} new package versions`);
   core5.info(`Found ${removedVersions.length} removed package versions.`);
   if (newVersions.length === 0 && removedVersions.length === 0) {

src/checks/dependency-size.ts

@@ -22,37 +22,6 @@ export async function scanForDependencySize(
     name: string;
     version: string;
   }> = [];
-  const skippedVersions = new Map<string, Set<string>>();
-  const allOptionalVersions = new Map<string, Set<string>>();
-
-  for (const pkg of currentLockFile.packages) {
-    traverse(pkg, {
-      optionalDependency: (node) => {
-        const entry = allOptionalVersions.get(node.name) ?? new Set<string>();
-        entry.add(node.version);
-        allOptionalVersions.set(node.name, entry);
-      }
-    });
-  }
-
-  for (const [pkg, versions] of allOptionalVersions) {
-    for (const version of versions) {
-      const pkgMeta = await fetchPackageMetadata(pkg, version);
-      if (
-        pkgMeta &&
-        ((pkgMeta.os &&
-          pkgMeta.os.length > 0 &&
-          !pkgMeta.os.includes('linux')) ||
-          (pkgMeta.cpu &&
-            pkgMeta.cpu.length > 0 &&
-            !pkgMeta.cpu.includes('x64')))
-      ) {
-        const entry = skippedVersions.get(pkg) ?? new Set<string>();
-        entry.add(version);
-        skippedVersions.set(pkg, entry);
-      }
-    }
-  }
 
   for (const [packageName, currentVersionSet] of currentDeps) {
     const baseVersionSet = baseDeps.get(packageName);
@@ -81,6 +50,42 @@ export async function scanForDependencySize(
     }
   }
 
+  if (newVersions.length > 0) {
+    const allOptionalVersions = new Map<string, Set<string>>();
+
+    for (const pkg of currentLockFile.packages) {
+      traverse(pkg, {
+        optionalDependency: (node) => {
+          const entry = allOptionalVersions.get(node.name) ?? new Set<string>();
+          entry.add(node.version);
+          allOptionalVersions.set(node.name, entry);
+        }
+      });
+    }
+
+    for (const [pkg, versions] of allOptionalVersions) {
+      for (const version of versions) {
+        const pkgMeta = await fetchPackageMetadata(pkg, version);
+        if (
+          pkgMeta &&
+          ((pkgMeta.os &&
+            pkgMeta.os.length > 0 &&
+            !pkgMeta.os.includes('linux')) ||
+            (pkgMeta.cpu &&
+              pkgMeta.cpu.length > 0 &&
+              !pkgMeta.cpu.includes('x64')))
+        ) {
+          const entry = newVersions.findIndex(
+            (v) => v.name === pkg && v.version === version
+          );
+          if (entry !== -1) {
+            newVersions.splice(entry, 1);
+          }
+        }
+      }
+    }
+  }
+
   core.info(`Found ${newVersions.length} new package versions`);
   core.info(`Found ${removedVersions.length} removed package versions.`);