@indutny/bencher 1.2.0 → 2.1.1

package/README.md

@@ -24,11 +24,8 @@ npm install -g @indutny/bencher
 ## Usage
 
 ```js
-// benchmark.js
-export const name = 'runner';
-
 // Function to benchmark
-export default () => {
+export function benchmarkName() => {
   let sum = 0;
   for (let i = 0; i < 1e6; i++) {
     sum += i;
@@ -43,7 +40,7 @@ export default () => {
 
 ```sh
 $ bencher benchmark.js
-runner: 1’037.8 ops/sec (±18.8, p=0.001, n=98)
+benchmark.js/benchmarkName: 1’037.8 ops/sec (±18.8, p=0.001, n=98)
 ```
 
 ## LICENSE

package/dist/bin/bencher.js

@@ -77,7 +77,7 @@ async function main() {
         type: 'boolean',
         describe: "don't report severe outliers",
     }).argv;
-    const modules = await Promise.all(argv._.map(async (file) => {
+    const modules = (await Promise.all(argv._.map(async (file) => {
         var _a;
         const path = await (0, promises_1.realpath)(String(file));
         const m = await (_a = path, Promise.resolve().then(() => __importStar(require(_a))));
@@ -97,21 +97,41 @@ async function main() {
         if (warmUpDuration <= 0) {
             throw new Error(`${file}: options.warmUpDuration must be positive`);
         }
-        return {
-            name: m.name ?? String(file),
-            options: {
-                duration,
-                sweepWidth,
-                samples,
-                warmUpDuration,
-                ignoreOutliers,
-            },
-            default: m.default,
+        const options = {
+            duration,
+            sweepWidth,
+            samples,
+            warmUpDuration,
+            ignoreOutliers,
         };
-    }));
-    const maxNameLength = modules.reduce((len, { name }) => Math.max(len, name.length), 0);
+        const result = new Array();
+        for (const key of Object.keys(m)) {
+            if (typeof m[key] === 'function') {
+                result.push({
+                    file: String(file),
+                    name: key,
+                    fn: m[key],
+                    options,
+                });
+            }
+        }
+        return result;
+    }))).flat();
+    modules.sort((a, b) => {
+        if (a.name === b.name) {
+            return a.file < b.file ? -1 : 1;
+        }
+        return a.name < b.name ? -1 : 1;
+    });
+    const maxNameLength = modules.reduce((len, { file, name }) => Math.max(len, file.length + name.length), 0);
     for (const m of modules) {
-        const paddedName = BOLD + m.name + RESET + ':' + ' '.repeat(maxNameLength - m.name.length);
+        const paddedName = BOLD +
+            m.file +
+            '/' +
+            m.name +
+            RESET +
+            ':' +
+            ' '.repeat(maxNameLength - m.name.length - m.file.length);
         // Just to reserve the line
         (0, fs_1.writeSync)(process.stdout.fd, '\n');
         let ticks = 0;
@@ -169,7 +189,7 @@ function warmUp(m) {
     const coldDuration = measure(m, 1);
     const warmUpIterations = m.options.warmUpDuration / coldDuration;
     for (let i = 0; i < warmUpIterations; i++) {
-        m.default();
+        m.fn();
     }
     // Compute max duration per base sample
     let sampleMultiplier = 0;
@@ -192,7 +212,7 @@ function measure(m, iterations) {
     let sum = 0;
     const start = process.hrtime.bigint();
     for (let i = 0; i < iterations; i++) {
-        sum += m.default();
+        sum += m.fn();
     }
     const duration = Number(process.hrtime.bigint() - start) / 1e9;
     if (isNaN(sum)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indutny/bencher",
-  "version": "1.2.0",
+  "version": "2.1.1",
   "description": "Simple benchmarking tool",
   "bin": {
     "bencher": "./dist/bin/bencher.js"
@@ -9,28 +9,21 @@
     "dist/bin/*.js",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsc",
-    "lint": "eslint --cache .",
-    "format": "prettier --cache --write .",
-    "check:format": "prettier --cache --check .",
-    "prepublish": "rm -rf dist && npm run build"
-  },
   "keywords": [
     "benchmark",
     "sweep",
     "regression"
   ],
-  "author": "Fedor Indutny <238531+indutny@users.noreply.github.com>",
+  "author": "Fedor Indutny <indutny@reply.codeberg.org>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/indutny/bencher.git"
+    "url": "git+https://codeberg.org/indutny/bencher.git"
   },
   "bugs": {
-    "url": "https://github.com/indutny/bencher/issues"
+    "url": "https://codeberg.org/indutny/bencher/issues"
   },
-  "homepage": "https://github.com/indutny/bencher#readme",
+  "homepage": "https://codeberg.org/indutny/bencher#readme",
   "devDependencies": {
     "@types/yargs": "^17.0.17",
     "@typescript-eslint/eslint-plugin": "^5.47.0",
@@ -42,5 +35,12 @@
   },
   "dependencies": {
     "yargs": "^17.6.2"
+  },
+  "scripts": {
+    "build": "tsc",
+    "lint": "eslint --cache .",
+    "format": "prettier --cache --write .",
+    "check:format": "prettier --cache --check .",
+    "prepublish": "rm -rf dist && npm run build"
   }
-}
+}