fixup! test(@angular/build): add library builder scaling benchmark suite

Author: dherges

scripts/benchmark.mts

@@ -32,7 +32,7 @@ function checkBuildStatus(logger: Console): boolean {
     if (srcMtime > distMtime) {
       logger.warn(
         'Warning: Source files in packages/angular/build are newer than dist/.\n' +
-          'Run "pnpm build" to ensure your benchmark reflects your latest local edits.\n',
+        'Run "pnpm build" to ensure your benchmark reflects your latest local edits.\n',
       );
     }
   }
@@ -54,7 +54,7 @@ async function runLibraryBuilderSubsystem(options: {
 }): Promise<number> {
   if (options.layout !== undefined && options.layout !== 'flat' && options.layout !== 'deep') {
     // eslint-disable-next-line no-console
-    console.error(`Error: --layout must be "flat" or "deep", got "${options.layout}".`);
+    console.error("Error: --layout must be \"flat\" or \"deep\", got \"" + options.layout + "\".");
 
     return 1;
   }
@@ -64,18 +64,42 @@ async function runLibraryBuilderSubsystem(options: {
   ) {
     // eslint-disable-next-line no-console
     console.error(
-      `Error: --style must be one of "inline", "inline-scss", "external", got "${options.style}".`,
+      "Error: --style must be one of \"inline\", \"inline-scss\", \"external\", got \"" + options.style + "\"."
     );
 
     return 1;
   }
 
+  const sizes = parseIntList(options.sizes);
+  if (sizes !== undefined && sizes.some((n) => !Number.isInteger(n) || n < 1)) {
+    // eslint-disable-next-line no-console
+    console.error("Error: --sizes must be a comma-separated list of positive integers, got \"" + options.sizes + "\".");
+
+    return 1;
+  }
+
+  const depths = parseIntList(options.depths);
+  if (depths !== undefined && depths.some((n) => !Number.isInteger(n) || n < 1)) {
+    // eslint-disable-next-line no-console
+    console.error("Error: --depths must be a comma-separated list of positive integers, got \"" + options.depths + "\".");
+
+    return 1;
+  }
+
+  const iterations = options.iterations !== undefined ? Number(options.iterations) : undefined;
+  if (iterations !== undefined && (!Number.isInteger(iterations) || iterations < 1)) {
+    // eslint-disable-next-line no-console
+    console.error("Error: --iterations must be a positive integer, got \"" + options.iterations + "\".");
+
+    return 1;
+  }
+
   const cliOptions: LibraryBuilderBenchmarkOptions = {
     layout: options.layout as LibraryBuilderBenchmarkOptions['layout'],
     style: options.style as LibraryBuilderBenchmarkOptions['style'],
-    sizes: parseIntList(options.sizes),
-    depths: parseIntList(options.depths),
-    iterations: options.iterations !== undefined ? Number(options.iterations) : undefined,
+    sizes,
+    depths,
+    iterations,
     json: Boolean(options.json),
   };
 

scripts/benchmarks/library-builder/index.mts

@@ -58,7 +58,7 @@ function checkBuilderIsBuilt(
   if (!fs.existsSync(path.join(buildPkg, 'package.json')) || !fs.existsSync(architectCli)) {
     logger.error(
       'Error: @angular/build and/or @angular-devkit/architect have not been built yet.\n' +
-        'Run "pnpm build" (or "pnpm admin build --local" for a faster local build) first.',
+      'Run "pnpm build" (or "pnpm admin build --local" for a faster local build) first.',
     );
 
     return undefined;
@@ -171,6 +171,10 @@ function buildOnce(
   const durationMs = performance.now() - start;
   const status = result.status === 0 ? 'ok' : 'fail';
   if (status === 'fail') {
+    if (result.error) {
+      // eslint-disable-next-line no-console
+      console.error(result.error);
+    }
     // eslint-disable-next-line no-console
     console.error(result.stdout?.toString());
     // eslint-disable-next-line no-console
@@ -207,49 +211,51 @@ export async function runLibraryBuilderBenchmarks(
   fs.mkdirSync(scratchRoot, { recursive: true });
   const measurements: BuildMeasurement[] = [];
 
-  for (const sizeOrDepth of sizes) {
-    const label = `${layout}-${style}-${layout === 'deep' ? `depth${sizeOrDepth}` : sizeOrDepth}`;
-    const projectDir = path.join(scratchRoot, label);
-
-    const fixtureOptions: FixtureOptions =
-      layout === 'flat'
-        ? { layout, style, count: sizeOrDepth }
-        : { layout, style, depth: sizeOrDepth };
-    const entryPoints = generateFixture(projectDir, fixtureOptions);
+  try {
+    for (const sizeOrDepth of sizes) {
+      const label = layout + "-" + style + "-" + (layout === "deep" ? "depth" + sizeOrDepth : sizeOrDepth);
+      const projectDir = path.join(scratchRoot, label);
 
-    if (!options.json) {
-      // eslint-disable-next-line no-console
-      console.log(`\n[library-builder] ${label} (${entryPoints} entry points)`);
-    }
+      const fixtureOptions: FixtureOptions =
+        layout === 'flat'
+          ? { layout, style, count: sizeOrDepth }
+          : { layout, style, depth: sizeOrDepth };
+      const entryPoints = generateFixture(projectDir, fixtureOptions);
 
-    const durations: number[] = [];
-    for (let i = 1; i <= iterations; i++) {
-      const { durationMs, status } = buildOnce(projectDir, builder.architectCli);
       if (!options.json) {
+        // eslint-disable-next-line no-console
+        console.log("\n[library-builder] " + label + " (" + entryPoints + " entry points)");
+      }
+
+      const durations: number[] = [];
+      for (let i = 1; i <= iterations; i++) {
+        const { durationMs, status } = buildOnce(projectDir, builder.architectCli);
+        if (!options.json) {
+          // eslint-disable-next-line no-console
+          console.log(
+            "  run " + i + "/" + iterations + ": " + (status === 'ok' ? 'done' : 'FAILED') + " in " + (durationMs / 1000).toFixed(2) + "s"
+          );
+        }
+        if (status === 'ok') {
+          durations.push(durationMs);
+        }
+        measurements.push({ layout, style, entryPoints, iteration: i, durationMs, status });
+      }
+
+      if (!options.json && durations.length > 0) {
+        const medianMs = median(durations);
         // eslint-disable-next-line no-console
         console.log(
-          `  run ${i}/${iterations}: ${status === 'ok' ? 'done' : 'FAILED'} in ${(durationMs / 1000).toFixed(2)}s`,
+          "  median: " + (medianMs / 1000).toFixed(2) + "s  (" + (medianMs / entryPoints).toFixed(2) + "ms/entry)"
         );
       }
-      if (status === 'ok') {
-        durations.push(durationMs);
-      }
-      measurements.push({ layout, style, entryPoints, iteration: i, durationMs, status });
-    }
 
-    if (!options.json && durations.length > 0) {
-      const medianMs = median(durations);
-      // eslint-disable-next-line no-console
-      console.log(
-        `  median: ${(medianMs / 1000).toFixed(2)}s  (${(medianMs / entryPoints).toFixed(2)}ms/entry)`,
-      );
+      fs.rmSync(projectDir, { recursive: true, force: true });
     }
-
-    fs.rmSync(projectDir, { recursive: true, force: true });
+  } finally {
+    fs.rmSync(scratchRoot, { recursive: true, force: true });
   }
 
-  fs.rmSync(scratchRoot, { recursive: true, force: true });
-
   const anyFailed = measurements.some((m) => m.status === 'fail');
   if (options.json) {
     // eslint-disable-next-line no-console