eyeprolog 1.3.63 → 1.3.65

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.63",
+  "version": "1.3.65",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/test/run-all.mjs

@@ -23,6 +23,6 @@ await runStandalone(async (reporter) => {
   runCleanup(reporter);
   runRegression(reporter);
   await runPlayground(reporter);
-  runExamples(reporter);
+  await runExamples(reporter);
   runBookExamples(reporter);
 });

package/test/run-examples.mjs

@@ -2,8 +2,10 @@
 // Example-output test runner.
 // It compares examples byte-for-byte against golden output so answer and proof changes cannot silently alter results.
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { spawnSync } from 'node:child_process';
+import { Worker, isMainThread, parentPort, workerData } from 'node:worker_threads';
 import { Program, run } from '../src/index.js';
 import { fileURLToPath } from 'node:url';
 import { TestReporter, isMainModule, runStandalone } from './test-style.mjs';
@@ -79,13 +81,19 @@ export const proofExamples = [
   'partial-evaluator.pl',
 ];
 
-export function runExamples(reporter = new TestReporter()) {
+export async function runExamples(reporter = new TestReporter()) {
   const files = fs.readdirSync(examplesDir)
     .filter((name) => exampleIsRunnable(name))
     .sort();
 
   reporter.section('Examples');
-  for (const name of files) reporter.test(name, () => runExample(name));
+  const deepTaxonomyIndex = files.indexOf('deep-taxonomy-100000.pl');
+  if (deepTaxonomyIndex >= 0) {
+    await runExampleTasks(files.slice(0, deepTaxonomyIndex + 1), (name, result) => reporter.testResult(name, result), 2);
+    await runExampleTasks(files.slice(deepTaxonomyIndex + 1), (name, result) => reporter.testResult(name, result), 3);
+  } else {
+    await runExampleTasks(files, (name, result) => reporter.testResult(name, result), 3);
+  }
   reporter.sectionTotal('examples');
 
   reporter.section('Proof examples');
@@ -94,6 +102,101 @@ export function runExamples(reporter = new TestReporter()) {
 }
 
 
+async function runExampleTasks(tasks, onResult, maxWorkers) {
+  if (tasks.length === 0) return;
+  const parallelism = os.availableParallelism?.() ?? os.cpus().length;
+  const workerCount = Math.min(tasks.length, Math.max(1, Math.min(maxWorkers, parallelism - 1)));
+  if (workerCount === 1) {
+    for (const name of tasks) {
+      const startedAt = performance.now();
+      try {
+        runExample(name);
+        onResult(name, { ms: Math.round(performance.now() - startedAt) });
+      } catch (error) {
+        onResult(name, { ms: Math.round(performance.now() - startedAt), error });
+      }
+    }
+    return;
+  }
+
+  const completedResults = new Map();
+  let nextTask = 0;
+  let nextReport = 0;
+  let completed = 0;
+  let settled = false;
+
+  await new Promise((resolve, reject) => {
+    const workers = Array.from({ length: workerCount }, () => new Worker(new URL(import.meta.url), {
+      workerData: { exampleWorker: true },
+    }));
+
+    const stopWorkers = () => Promise.all(workers.map((worker) => worker.terminate()));
+
+    const fail = (error) => {
+      if (settled) return;
+      settled = true;
+      stopWorkers().finally(() => reject(error));
+    };
+
+    const finish = () => {
+      if (settled || completed !== tasks.length || nextReport !== tasks.length) return;
+      settled = true;
+      stopWorkers().then(() => resolve(), reject);
+    };
+
+    const reportReady = () => {
+      try {
+        while (completedResults.has(nextReport)) {
+          const result = completedResults.get(nextReport);
+          completedResults.delete(nextReport);
+          onResult(tasks[nextReport], result);
+          nextReport++;
+        }
+      } catch (error) {
+        fail(error);
+      }
+    };
+
+    const assign = (worker) => {
+      if (nextTask >= tasks.length || settled) return;
+      worker.postMessage({ id: nextTask, name: tasks[nextTask++] });
+    };
+
+    for (const worker of workers) {
+      worker.on('message', ({ id, ms, error }) => {
+        if (settled) return;
+        completedResults.set(id, {
+          ms,
+          error: error == null ? null : Object.assign(new Error(error.message), { stack: error.stack }),
+        });
+        completed++;
+        reportReady();
+        assign(worker);
+        finish();
+      });
+      worker.on('error', fail);
+      assign(worker);
+    }
+  });
+}
+
+function runExampleWorker() {
+  parentPort.on('message', ({ id, name }) => {
+    const startedAt = performance.now();
+    try {
+      runExample(name);
+      parentPort.postMessage({ id, ms: Math.round(performance.now() - startedAt), error: null });
+    } catch (error) {
+      parentPort.postMessage({
+        id,
+        ms: Math.round(performance.now() - startedAt),
+        error: { message: error?.message ?? String(error), stack: error?.stack ?? String(error) },
+      });
+    }
+  });
+}
+
+
 function exampleIsRunnable(name) {
   return name.endsWith('.pl');
 }
@@ -155,6 +258,8 @@ function diffText(expected, actualText) {
   return 'outputs differ';
 }
 
-if (isMainModule(import.meta.url)) {
+if (!isMainThread && workerData?.exampleWorker) {
+  runExampleWorker();
+} else if (isMainModule(import.meta.url)) {
   await runStandalone(runExamples);
 }

package/test/test-style.mjs

@@ -87,6 +87,21 @@ export class TestReporter {
     }
   }
 
+  testResult(name, { ms = 0, error = null } = {}) {
+    this.total++;
+    const nr = String(this.total).padStart(3, '0');
+
+    if (error == null) {
+      this.ok++;
+      this.stdout.write(`${colors.green}OK${colors.reset} ${nr} ${name} ${colors.dim}(${ms} ms)${colors.reset}\n`);
+      return;
+    }
+
+    this.stderr.write(`${colors.red}FAIL${colors.reset} ${nr} ${name} ${colors.dim}(${ms} ms)${colors.reset}\n`);
+    this.stderr.write(`${error?.stack ?? String(error)}\n`);
+    throw error;
+  }
+
   totalLine() {
     const ms = nowMs() - this.startedAt;
     this.stdout.write(`\n${colors.yellow}== Total${colors.reset}\n`);