fixup!

Author: avivkeller

scripts/compare-builds/web.mjs

@@ -102,52 +102,39 @@ const changedFiles = allFiles.filter(
 );
 
 if (changedFiles.length) {
-  // Separate HTML/JS pairs from other files
-  const pairs = [];
+  // Separate HTML files and their matching JS files from other files
+  const pages = changedFiles.filter(f => path.extname(f) === '.html');
   const other = [];
-  const processed = new Set();
 
-  for (const file of changedFiles) {
-    if (processed.has(file)) {
-      continue;
-    }
+  // Get all HTML base names
+  const htmlBaseNames = new Set(pages.map(f => path.basename(f, '.html')));
 
-    const basename = path.basename(file, path.extname(file));
-    const hasHtml = changedFiles.some(
-      f =>
-        path.basename(f, path.extname(f)) === basename &&
-        path.extname(f) === '.html'
-    );
-    const hasJs = changedFiles.some(
-      f =>
-        path.basename(f, path.extname(f)) === basename &&
-        path.extname(f) === '.js'
-    );
+  for (const file of changedFiles) {
+    const ext = path.extname(file);
+    const basename = path.basename(file, ext);
 
-    if (hasHtml && hasJs) {
-      changedFiles
-        .filter(f => path.basename(f, path.extname(f)) === basename)
-        .forEach(f => {
-          pairs.push(f);
-          processed.add(f);
-        });
+    if (ext === '.js' && htmlBaseNames.has(basename)) {
+      // JS files go to pages only if they have a matching HTML file
+      pages.push(file);
     } else {
       other.push(file);
-      processed.add(file);
     }
   }
 
-  pairs.sort();
+  pages.sort();
   other.sort();
 
   console.log('## Web Generator\n');
-  console.log(generateTable(other, baseStats, headStats));
 
-  if (pairs.length) {
+  if (other.length) {
+    console.log(generateTable(other, baseStats, headStats));
+  }
+
+  if (pages.length) {
     console.log(
       details(
-        `Pages (${pairs.length / 2})`,
-        generateTable(pairs, baseStats, headStats)
+        `Pages (${pages.filter(f => path.extname(f) === '.html').length})`,
+        generateTable(pages, baseStats, headStats)
       )
     );
   }