improve rebuilding and logging

Author: krausest

cli/rebuild-build-single.js

@@ -47,12 +47,12 @@ function deleteFrameworkFiles(frameworkPath, filesToDelete) {
  * @param {string} framework
  * @param {boolean} useCi
  */
-function rebuildFramework(framework, useCi) {
+export function rebuildFramework(framework, useCi) {
   const components = framework.split("/");
 
   if (components.length !== 2) {
     console.log(`ERROR: invalid name ${framework}. It must contain exactly one /.`);
-    process.exit(1);
+    return false
   }
   console.log("Rebuilding framework", framework);
   const [keyed, name] = components;
@@ -68,6 +68,7 @@ function rebuildFramework(framework, useCi) {
   runCommand(installCmd, frameworkPath);
   const buildCmd = "npm run build-prod";
   runCommand(buildCmd, frameworkPath);
+  return true;
 }
 
 /**
@@ -79,12 +80,15 @@ export function rebuildFrameworks(frameworks, useCi) {
 
   if (frameworks.length === 0) {
     console.log("ERROR: Missing arguments. Command: rebuild keyed/framework1 non-keyed/framework2 ...");
-    process.exit(1);
+    return false;
   }
 
   for (const framework of frameworks) {
-    rebuildFramework(framework, useCi);
+    if (!rebuildFramework(framework, useCi)) {
+      return false;
+    }
   }
 
   console.log("rebuild-build-single.js finished: Build finsished sucessfully!");
+  return true;
 }

cli/rebuild-check-single.js

@@ -45,8 +45,9 @@ export function rebuildCheckSingle({ frameworks }) {
     console.log("rebuild-check-single.js finished");
     console.log("All checks are fine!");
     console.log(`======> Please rerun the benchmark: npm run bench ${frameworkNames}`);
+    return true;
   } catch (error) {
     console.log(`rebuild-check-single failed for ${frameworks.join(" ")}`);
-    process.exit(-1);
+    return false;
   }
 }

cli/rebuild-single-framework.js

@@ -30,9 +30,12 @@ export function rebuildSingleFramework({ frameworks, ci }) {
   }
 
   try {
-    rebuildFrameworks(frameworks, ci);
-
-    rebuildCheckSingle({ frameworks });
+    if (!rebuildFrameworks(frameworks, ci)) {
+      process.exit(1);
+    }
+    if (!rebuildCheckSingle({ frameworks })) {
+      process.exit(1);
+    }
   } catch (error) {
     console.log("ERROR", error);
     console.log(`ERROR: Rebuilding  ${frameworks} was not successful`);

cli/update-frameworks.js

@@ -7,6 +7,8 @@ import semver from 'semver'
 
 import { getFrameworks } from "./helpers/frameworks.js";
 import { rebuildSingleFramework } from "./rebuild-single-framework.js";
+import { rebuildFramework } from "./rebuild-build-single.js";
+import { rebuildCheckSingle } from "./rebuild-check-single.js";
 
 /**
  * @typedef {Object} Framework
@@ -25,7 +27,8 @@ function performUpdate(frameworkPath, frameworkName) {
       cwd: frameworkPath,
       stdio: "inherit",
     });
-    rebuildSingleFramework({frameworks: [frameworkName], ci: false});
+    rebuildFramework(frameworkName, false);
+    rebuildCheckSingle({frameworks: [frameworkName]});
     return `Sucessfully updated ${frameworkPath}`;
   } catch (error) {
     console.error(`Failed to update ${frameworkPath}. Error Code ${error.status} and message: ${error.message}`);
@@ -167,38 +170,44 @@ export function updateFrameworks({ type, debug }) {
       continue;
     }
 
-    const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath, "utf8"));
-    const mainPackages = packageJSON?.["js-framework-benchmark"]?.frameworkVersionFromPackage;
+    try {
 
-    if (!mainPackages) {
-      manualChecks.push(`${type}/${name} has no frameworkVersionFromPackage`);
-      continue;
-    }
+      const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath, "utf8"));
+      const mainPackages = packageJSON?.["js-framework-benchmark"]?.frameworkVersionFromPackage;
 
-    if (DEBUG) {
-      console.log(`Checking ${type}/${name} ${mainPackages}`);
-    }
+      if (!mainPackages) {
+        manualChecks.push(`${type}/${name} has no frameworkVersionFromPackage`);
+        continue;
+      }
 
-    const packages = mainPackages.split(":");
-    const update = shouldUpdate(packageJSONLockPath, packages);
+      if (DEBUG) {
+        console.log(`Checking ${type}/${name} ${mainPackages}`);
+      }
+
+      const packages = mainPackages.split(":");
+      const update = shouldUpdate(packageJSONLockPath, packages);
+      
+      if (update) {
+        log.push(performUpdate(frameworkPath, type+"/"+name));
+      } else {
+        const isPackageObsolete = packages.map((element) => maybeObsolete(element));
+        const anyPackageObsolete = isPackageObsolete.some((packageFramework) => packageFramework.isObsolete);
 
-    if (update) {
-      log.push(performUpdate(frameworkPath, type+"/"+name));
-    } else {
-      const isPackageObsolete = packages.map((element) => maybeObsolete(element));
-      const anyPackageObsolete = isPackageObsolete.some((packageFramework) => packageFramework.isObsolete);
-  
-      if (anyPackageObsolete) {
-        const formattedPackages = isPackageObsolete
-          .map((result) => `${result.packageName}:${result.lastUpdate}`)
-          .join(", ");
-  
-        console.log(`Last npm update for ${type}/${name} - ${mainPackages} is older than a year: ${formattedPackages}`);
-        log.push(`Retire ${type}/${name} - ${mainPackages} is older than a year`);
-      }  
-      else if (DEBUG) {
-        log.push(`Nothing to do for ${type}/${name}`);
+        if (anyPackageObsolete) {
+          const formattedPackages = isPackageObsolete
+            .map((result) => `${result.packageName}:${result.lastUpdate}`)
+            .join(", ");
+    
+          console.log(`Last npm update for ${type}/${name} - ${mainPackages} is older than a year: ${formattedPackages}`);
+          log.push(`Retire ${type}/${name} - ${mainPackages} is older than a year`);
+        }  
+        else if (DEBUG) {
+          log.push(`Nothing to do for ${type}/${name}`);
+        }
       }
+    } catch (error) {
+      console.error(`Failed to check ${type}/${name}. Error Code ${error.status} and message: ${error.message}`);
+      log.push(`Error checking ${type}/${name}`);
     }
   }
 

server/src/frameworks/frameworksServices.ts

@@ -27,7 +27,7 @@ class PackageJSONProvider {
       if (error instanceof Error && (error as NodeJS.ErrnoException).code === "ENOENT") {
         throw new Error(`Package.json not found for ${framework}.`);
       }
-      console.error(error);
+      console.error(`error in ${keyedDir}/${framework} ${error}`);
     }
   }
 
@@ -40,7 +40,7 @@ class PackageJSONProvider {
       if (isErrorWithCode(error) && error.code === "ENOENT") {
         throw new Error(`Package-lock.json not found for ${framework}.`);
       }
-      console.error(error);
+      console.error(`error in ${keyedDir}/${framework} ${error}`);
     }
   }
 }