fix(best-analyzer): Allow multi-project comparison (#82)

* Change projectNames to test
* Minor prettier change
* Allow multi project comparison

.prettierignore

@@ -3,5 +3,5 @@ build/
 coverage/
 __benchmark_results__/
 public/
-
+examples
 CHANGELOG.md

examples/simple_benchmark/best.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    projectName: 'perf-best-examples',
+    projectName: 'simple-benchmarks',
     benchmarkOnClient: true,
     useMacroTaskAfterBenchmark: false,
     benchmarkRunner: '@best/runner-headless',

examples/simple_lwc_benchmark/best.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    projectName: 'perf-best-examples',
+    projectName: 'lwc-examples',
     plugins: {
         'rollup-plugin-lwc-compiler': {
             rootDir: '<rootDir>/src/',

packages/best-cli/src/run_compare.js

@@ -19,7 +19,8 @@ export async function runCompare(globalConfig, configs, outputStream) {
         return false;
     }
 
-    const projectName = globalConfig.rootProjectName;
+    const projects = configs.map(cfg => cfg.projectName);
+    const projectNames = projects.length ? projects : [globalConfig.rootProjectName];
     let storageProvider;
     try {
         storageProvider = require(externalStorage);
@@ -28,7 +29,7 @@ export async function runCompare(globalConfig, configs, outputStream) {
     }
 
     preRunMessager.print('\n Fetching benchmark results to compare... \n\n', outputStream);
-    const compareResults = await compareBenchmarkStats(baseCommit, compareCommit, projectName, storageProvider);
+    const compareResults = await compareBenchmarkStats(baseCommit, compareCommit, projectNames, storageProvider);
 
     if (gitIntegration) {
         await pushBenchmarkComparison(baseCommit, compareCommit, compareResults, globalConfig);

packages/best-compare/src/index.js

@@ -46,11 +46,18 @@ function compareBenchmarks(baseBenchs, targetBenchs, comparison = []) {
     return comparison;
 }
 
-export async function compareBenchmarkStats(baseCommit, targetCommit, projectName, storageProvider) {
-    const [baseBenchmarks, targetBenchmarks] = await Promise.all([
-        storageProvider.getAllBenchmarkStatsPerCommit(projectName, baseCommit),
-        storageProvider.getAllBenchmarkStatsPerCommit(projectName, targetCommit),
-    ]);
+export async function compareBenchmarkStats(baseCommit, targetCommit, projectNames, storageProvider) {
+    const stats = await Promise.all(
+        projectNames.reduce((reducer, projectName) => [
+            ...reducer,
+            storageProvider.getAllBenchmarkStatsPerCommit(projectName, baseCommit),
+            storageProvider.getAllBenchmarkStatsPerCommit(projectName, targetCommit)
+        ], [])
+    );
+
+    if (stats.length % 2) {
+        throw new Error('Recovered odd number of stats to compare');
+    }
 
     preRunMessager.print('\n Running comparison... \n\n', process.stdout);
 
@@ -60,25 +67,30 @@ export async function compareBenchmarkStats(baseCommit, targetCommit, projectNam
         comparison: [],
     };
 
-    baseBenchmarks.forEach(baseBenchmarkBundle => {
-        const { benchmarkName } = baseBenchmarkBundle;
-        const targetBenchmarkBundle = targetBenchmarks.find(b => b.benchmarkName === benchmarkName);
-        if (!targetBenchmarkBundle) {
-            console.log(`Skipping benchmark ${benchmarkName} since we couldn't find it in commit ${targetCommit}`);
-            return;
-        }
-        const { version: baseVersion, environment: baseEnv, benchmarks: baseBenchs } = baseBenchmarkBundle;
-        const { version: targetVersion, environment: targetEnv, benchmarks: targetBenchs } = targetBenchmarkBundle;
+    while (stats.length) {
+        const baseBenchmarks = stats.shift();
+        const targetBenchmarks = stats.shift();
+
+        baseBenchmarks.forEach(baseBenchmarkBundle => {
+            const { benchmarkName } = baseBenchmarkBundle;
+            const targetBenchmarkBundle = targetBenchmarks.find(b => b.benchmarkName === benchmarkName);
+            if (!targetBenchmarkBundle) {
+                console.log(`Skipping benchmark ${benchmarkName} since we couldn't find it in commit ${targetCommit}`);
+                return;
+            }
+            const { version: baseVersion, environment: baseEnv, benchmarks: baseBenchs } = baseBenchmarkBundle;
+            const { version: targetVersion, environment: targetEnv, benchmarks: targetBenchs } = targetBenchmarkBundle;
 
-        if (baseVersion !== targetVersion) {
-            console.log(`Skipping comparing ${benchmarkName} since stat versions are different`);
-        }
+            if (baseVersion !== targetVersion) {
+                console.log(`Skipping comparing ${benchmarkName} since stat versions are different`);
+            }
 
-        compareEnvironment(baseEnv, targetEnv);
+            compareEnvironment(baseEnv, targetEnv);
 
-        const comparison = compareBenchmarks(baseBenchs, targetBenchs);
-        commitComparison.comparison.push({ benchmarkName, comparison });
-    });
+            const comparison = compareBenchmarks(baseBenchs, targetBenchs);
+            commitComparison.comparison.push({ benchmarkName, comparison });
+        });
+    }
 
     return commitComparison;
 }

packages/best-frontend/index.js

@@ -13,7 +13,7 @@ const cacheSuccesses = cache('5 minutes', onlyStatus200);
 // -- Middleware definition ------------------------
 module.exports = function (options = {}) {
     const config = Object.assign({}, defaultOptions, options);
-    const { apiVersion, store } = config;
+    const { apiVersion, store, title } = config;
     const ApiV1 = require(`./server/api_${apiVersion}`);
     const storeInstance = require(store);
     const app = express();
@@ -31,6 +31,7 @@ module.exports = function (options = {}) {
         parent.get(['/', '/home'], cacheSuccesses, async (req, res) => {
             const projects = await storeInstance.getProjects();
             res.send(template.generateHTML({
+                title,
                 projects,
                 action: { type: 'navigateHome', page: 'home' }
             }));
@@ -48,6 +49,7 @@ module.exports = function (options = {}) {
             // const stats = await statsFuture;
 
             const data = {
+                title,
                 projects,
                 // stats,
                 selectedProject: projectName,

packages/best-frontend/serve.js

@@ -12,6 +12,7 @@ const PORT = process.env.PORT || 3000;
 const app = express();
 
 const config = {
+    title: 'Best',
     // store: "@best/store-aws",
     storeConfig: {
         // Config shall be passed as env parameters

packages/best-frontend/src/modules/one/app/app.html

@@ -21,7 +21,7 @@
                 </ul>
             </div>
             <div class="bBottom">
-                <one-appnav nav-items={state.navItems} selected-item-id={state.selectedPage}></one-appnav>
+                <one-appnav app-name={state.title} nav-items={state.navItems} selected-item-id={state.selectedPage}></one-appnav>
             </div>
         </header>
     </section>

packages/best-frontend/src/modules/one/app/utils.js

@@ -63,8 +63,9 @@ export function normalizeStats(state, stats, project, branch) {
 }
 
 export function initializeState(state, serverState) {
-    const { action, stats, projects, branches, selectedProject, selectedBranch} = serverState;
+    const { action, stats, projects, branches, selectedProject, selectedBranch, title } = serverState;
     const navItems = projects.map(p => buildNavItem(p));
+    state.title = title;
     state.projects = projects;
     // eslint-disable-next-line no-return-assign, no-sequences
     state.branches = projects.reduce((r, p) => (r[p] = ['master'], r), {});