eyeling 1.28.5 → 1.28.7

package/test/package.test.js

@@ -6,20 +6,7 @@ const os = require('node:os');
 const path = require('node:path');
 const cp = require('node:child_process');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
-function ok(msg) {
-  console.log(`${C.g}OK${C.n}  ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
+const { C, detail, failResult, info, pass } = require('./report');
 
 function isWin() {
   return process.platform === 'win32';
@@ -158,6 +145,7 @@ function packTarball(root) {
 
 function main() {
   const suiteStart = Date.now();
+  let sequence = 0;
   const root = path.resolve(__dirname, '..');
 
   const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'eyeling-smoke-'));
@@ -167,15 +155,19 @@ function main() {
 
   try {
     info('Building tarball (npm pack)');
+    let stepStart = Date.now();
     tgzInRoot = packTarball(root);
     const srcTgz = path.join(root, tgzInRoot);
     const dstTgz = path.join(tmp, tgzInRoot);
 
     fs.renameSync(srcTgz, dstTgz);
+    pass(++sequence, `packed ${tgzInRoot}`, Date.now() - stepStart);
 
     info('Creating temp project + installing tarball');
+    stepStart = Date.now();
     runChecked(npmCmd(), ['init', '-y'], { cwd: tmp, stdio: 'ignore' });
     runChecked(npmCmd(), ['install', `./${tgzInRoot}`, '--no-audit', '--no-fund'], { cwd: tmp, stdio: 'inherit' });
+    pass(++sequence, 'created temp project and installed tarball', Date.now() - stepStart);
 
     info('API smoke test');
     // Run a tiny API check via node -e
@@ -193,17 +185,18 @@ function main() {
         console.error('Unexpected output:\\n' + out);
         process.exit(1);
       }
-      console.log('OK: API works');
     `;
+    stepStart = Date.now();
     runChecked(process.execPath, ['-e', apiCode], { cwd: tmp, stdio: 'inherit' });
-    ok('API works');
+    pass(++sequence, 'API works', Date.now() - stepStart);
 
     info('CLI smoke test');
     const bin = isWin()
       ? path.join(tmp, 'node_modules', '.bin', 'eyeling.cmd')
       : path.join(tmp, 'node_modules', '.bin', 'eyeling');
+    stepStart = Date.now();
     runChecked(bin, ['-v'], { cwd: tmp, stdio: 'inherit' });
-    ok('CLI works');
+    pass(++sequence, 'CLI works', Date.now() - stepStart);
 
     info('Examples smoke test (installed package)');
     const pkgRoot = path.join(tmp, 'node_modules', 'eyeling');
@@ -220,11 +213,10 @@ function main() {
     const SMOKE_EXAMPLES = ['age.n3', 'basic-monadic.n3', 'family-cousins.n3', 'backward.n3', 'context-association.n3'];
 
     const tmpExamplesOut = fs.mkdtempSync(path.join(os.tmpdir(), 'eyeling-pkg-examples-'));
-    let smokeIdx = 1;
-    const smokePad2 = (n) => String(n).padStart(2, '0');
-    const smokeOk = (n, msg) => console.log(`${C.g}OK${C.n}  ${smokePad2(n)} ${msg}`);
+    stepStart = Date.now();
     try {
       for (const file of SMOKE_EXAMPLES) {
+        const smokeStart = Date.now();
         const inputPath = path.join(examplesDir, file);
         const expectedPath = resolveExpectedPath(outputDir, file);
 
@@ -275,20 +267,21 @@ Output differs for ${file}:`);
           throw new Error(`Example ${file}: output differs from golden`);
         }
 
-        smokeOk(smokeIdx++, `Example smoke: ${file}`);
+        pass(++sequence, `Example smoke: ${file}`, Date.now() - smokeStart);
       }
     } finally {
       rmrf(tmpExamplesOut);
     }
-    smokeOk(smokeIdx++, 'Installed examples smoke test passed');
+    pass(++sequence, 'Installed examples smoke test passed', Date.now() - stepStart);
 
     const suiteMs = Date.now() - suiteStart;
     console.log('');
-    ok(`Packaged install smoke test passed ${C.dim}(${suiteMs} ms, ${(suiteMs / 1000).toFixed(2)} s)${C.n}`);
+    info(`Packaged install smoke test passed (${suiteMs} ms, ${(suiteMs / 1000).toFixed(2)} s)`);
     process.exit(0);
   } catch (e) {
     console.log('');
-    fail(e && e.stack ? e.stack : String(e));
+    failResult(++sequence, 'packaged install smoke test failed', Date.now() - suiteStart);
+    detail(e && e.stack ? e.stack : String(e));
     process.exit(1);
   } finally {
     // If rename failed and the tarball still exists in root, try to delete it

package/test/packlist.test.js

@@ -4,19 +4,9 @@ const assert = require('node:assert/strict');
 const cp = require('node:child_process');
 const fs = require('node:fs');
 
-const TTY = process.stdout.isTTY;
-const C = TTY ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', n: '\x1b[0m' } : { g: '', r: '', y: '', n: '' };
-
-function ok(msg) {
-  console.log(`${C.g}OK ${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}${msg}${C.n}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
+const { detail, failResult, info, pass } = require('./report');
 
+const start = Date.now();
 try {
   info('Checking packlist + metadata…');
 
@@ -65,8 +55,9 @@ try {
     'missing from npm pack: examples/output/*',
   );
 
-  ok('packlist + metadata sanity checks passed');
+  pass(1, 'packlist + metadata sanity checks passed', Date.now() - start);
 } catch (e) {
-  fail(e && e.stack ? e.stack : String(e));
+  failResult(1, 'packlist + metadata sanity checks failed', Date.now() - start);
+  detail(e && e.stack ? e.stack : String(e));
   process.exit(1);
 }

package/test/playground.test.js

@@ -18,45 +18,29 @@ const { setTimeout: sleep } = require('node:timers/promises');
 
 const ROOT = path.resolve(__dirname, '..');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-const msTag = (ms) => `${C.dim}(${ms} ms)${C.n}`;
+const { detail, failResult, info, pass } = require('./report');
 
 const TOTAL_TESTS = (fs.readFileSync(__filename, 'utf8').match(/^\s*beginTest\(/gm) || []).length;
-const idxWidth = String(Math.max(1, TOTAL_TESTS)).length;
 let passed = 0;
 let failed = 0;
 let currentTest = null;
 let nonTestFailure = false;
 const suiteStart = Date.now();
 
-function ok(msg) {
-  console.log(`${C.g}OK${C.n}  ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
 function beginTest(msg) {
   currentTest = { msg, start: Date.now() };
 }
 function endTest() {
   const tc = currentTest;
   if (!tc) return;
-  const idx = String(passed + failed + 1).padStart(idxWidth, '0');
-  ok(`${idx} ${tc.msg} ${msTag(Date.now() - tc.start)}`);
+  pass(passed + failed + 1, tc.msg, Date.now() - tc.start);
   passed += 1;
   currentTest = null;
 }
 function recordCurrentFailure() {
   const tc = currentTest;
   if (!tc) return false;
-  const idx = String(passed + failed + 1).padStart(idxWidth, '0');
-  fail(`${idx} ${tc.msg} ${msTag(Date.now() - tc.start)}`);
+  failResult(passed + failed + 1, tc.msg, Date.now() - tc.start);
   failed += 1;
   currentTest = null;
   return true;
@@ -66,9 +50,9 @@ function printSummary() {
   const suiteMs = Date.now() - suiteStart;
   info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
   if (failed === 0 && !nonTestFailure) {
-    ok(`All playground tests passed (${passed}/${TOTAL_TESTS})`);
+    info(`All playground tests passed (${passed}/${TOTAL_TESTS})`);
   } else {
-    fail(`Some playground tests failed (${passed}/${TOTAL_TESTS})`);
+    info(`Some playground tests failed (${passed}/${TOTAL_TESTS})`);
   }
 }
 
@@ -1269,6 +1253,6 @@ ${JSON.stringify(last, null, 2)}`);
 main().catch((e) => {
   if (!recordCurrentFailure()) nonTestFailure = true;
   printSummary();
-  fail(e && e.stack ? e.stack : String(e));
+  detail(e && e.stack ? e.stack : String(e));
   process.exit(1);
 });

package/test/rdf12.test.js

@@ -3,44 +3,7 @@
 
 const cp = require('node:child_process');
 
-const USE_COLOR = !process.env.NO_COLOR && (
-  process.stdout.isTTY ||
-  (process.env.FORCE_COLOR && process.env.FORCE_COLOR !== '0')
-);
-const C = USE_COLOR
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', gray: '\x1b[90m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', gray: '', dim: '', n: '' };
-
-function formatDuration(ms) {
-  if (!Number.isFinite(ms) || ms < 0) return '0 ms';
-  if (ms < 1000) return `${Math.round(ms)} ms`;
-  if (ms < 10000) return `${(ms / 1000).toFixed(2)} s`;
-  if (ms < 60000) return `${(ms / 1000).toFixed(1)} s`;
-
-  const minutes = Math.floor(ms / 60000);
-  const seconds = ((ms % 60000) / 1000).toFixed(1).padStart(4, '0');
-  return `${minutes}m ${seconds}s`;
-}
-
-function durationSuffix(ms) {
-  return ms == null ? '' : ` ${C.gray}${formatDuration(ms)}${C.n}`;
-}
-
-function ok(msg, ms) {
-  console.log(`${C.g}OK${C.n}  ${msg}${durationSuffix(ms)}`);
-}
-
-function fail(msg, ms) {
-  console.error(`${C.r}FAIL${C.n} ${msg}${durationSuffix(ms)}`);
-}
-
-function info(msg, ms) {
-  console.log(`${C.y}==${C.n} ${msg}${durationSuffix(ms)}`);
-}
-
-function detail(msg) {
-  console.log(`${C.dim}${msg}${C.n}`);
-}
+const { C, detail, failResult, formatDuration, info, pass } = require('./report');
 
 function nowMs() {
   return Number(process.hrtime.bigint()) / 1e6;
@@ -143,9 +106,6 @@ function resolveSuiteKeys(args) {
   return keys;
 }
 
-function sequenceLabel(n) {
-  return String(n).padStart(3, '0');
-}
 
 function createLineReader(onLine) {
   let buffer = '';
@@ -177,12 +137,12 @@ function printEvent(suiteResult, event, totals) {
   const caseElapsedMs = now - suiteResult.lastCaseAt;
   suiteResult.lastCaseAt = now;
 
-  const message = `${sequenceLabel(totals.sequence)} ${suiteResult.suite.label}: ${event.message}`;
+  const message = `${suiteResult.suite.label}: ${event.message}`;
   if (event.kind === 'ok') {
-    ok(message, caseElapsedMs);
+    pass(totals.sequence, message, caseElapsedMs);
     totals.passed++;
   } else {
-    fail(message, caseElapsedMs);
+    failResult(totals.sequence, message, caseElapsedMs);
     totals.failed++;
     suiteResult.failedCount++;
   }
@@ -236,11 +196,11 @@ function runSuite(key, totals) {
       suiteResult.error = e;
       if (!sawCase) {
         totals.sequence++;
-        fail(`${sequenceLabel(totals.sequence)} ${suite.label}: rdf-test-suite could not start: ${e.message || String(e)}`, elapsedMs);
+        failResult(totals.sequence, `${suite.label}: rdf-test-suite could not start: ${e.message || String(e)}`, elapsedMs);
         totals.failed++;
         suiteResult.caseCount++;
       }
-      console.log(`${C.gray}Suite elapsed ${formatDuration(elapsedMs)}${C.n}`);
+      console.log(`${C.dim}Suite elapsed ${formatDuration(elapsedMs)}${C.n}`);
       console.log('');
       resolve({ ...suiteResult, status: 1, elapsedMs });
       return;
@@ -273,21 +233,21 @@ function runSuite(key, totals) {
           : `${suite.label}: rdf-test-suite exited with ${suiteResult.status === 0 ? 'success' : exitText}`;
 
         if (suiteResult.status === 0) {
-          ok(`${sequenceLabel(totals.sequence)} ${message}`, elapsedMs);
+          pass(totals.sequence, message, elapsedMs);
           totals.passed++;
         } else {
-          fail(`${sequenceLabel(totals.sequence)} ${message}`, elapsedMs);
+          failResult(totals.sequence, message, elapsedMs);
           totals.failed++;
         }
         suiteResult.caseCount++;
       } else if (suiteResult.status !== 0 && suiteResult.failedCount === 0) {
         totals.sequence++;
-        fail(`${sequenceLabel(totals.sequence)} ${suite.label}: rdf-test-suite exited with status ${suiteResult.status}`, elapsedMs);
+        failResult(totals.sequence, `${suite.label}: rdf-test-suite exited with status ${suiteResult.status}`, elapsedMs);
         totals.failed++;
         suiteResult.caseCount++;
       }
 
-      console.log(`${C.gray}Suite elapsed ${formatDuration(elapsedMs)}${C.n}`);
+      console.log(`${C.dim}Suite elapsed ${formatDuration(elapsedMs)}${C.n}`);
       console.log('');
       resolve(suiteResult);
     });
@@ -299,7 +259,7 @@ async function main() {
   try {
     keys = resolveSuiteKeys(process.argv.slice(2));
   } catch (e) {
-    fail(e && e.message ? e.message : String(e));
+    failResult(1, e && e.message ? e.message : String(e), 0);
     process.exit(1);
     return;
   }
@@ -322,16 +282,17 @@ async function main() {
   info(`Grand total: ${totals.passed} OK, ${totals.failed} FAIL, ${totals.sequence} RDF 1.2 tests`, grandElapsedMs);
 
   if (totals.failed === 0 && results.every((suiteResult) => suiteResult.status === 0)) {
-    ok(`All RDF 1.2 syntax tests passed (${totals.passed}/${totals.sequence})`);
+    info(`All RDF 1.2 syntax tests passed (${totals.passed}/${totals.sequence})`);
     process.exit(0);
     return;
   }
 
-  fail(`Some RDF 1.2 syntax tests failed (${totals.passed}/${totals.sequence})`);
+  info(`Some RDF 1.2 syntax tests failed (${totals.passed}/${totals.sequence})`);
   process.exit(1);
 }
 
 main().catch((e) => {
-  fail(e && e.stack ? e.stack : String(e));
+  failResult(1, 'RDF 1.2 syntax test runner failed', 0);
+  detail(e && e.stack ? e.stack : String(e));
   process.exit(1);
 });

package/test/report.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const USE_COLOR = !process.env.NO_COLOR && (
+  process.stdout.isTTY ||
+  (process.env.FORCE_COLOR && process.env.FORCE_COLOR !== '0')
+);
+
+const C = USE_COLOR
+  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
+  : { g: '', r: '', y: '', dim: '', n: '' };
+
+function formatDuration(ms) {
+  if (!Number.isFinite(ms) || ms < 0) return '0 ms';
+  if (ms < 1000) return `${Math.round(ms)} ms`;
+  if (ms < 10000) return `${(ms / 1000).toFixed(2)} s`;
+  if (ms < 60000) return `${(ms / 1000).toFixed(1)} s`;
+
+  const minutes = Math.floor(ms / 60000);
+  const seconds = ((ms % 60000) / 1000).toFixed(1).padStart(4, '0');
+  return `${minutes}m ${seconds}s`;
+}
+
+function durationSuffix(ms) {
+  return ms == null ? '' : ` ${C.dim}(${formatDuration(ms)})${C.n}`;
+}
+
+function sequenceLabel(n) {
+  return String(n).padStart(3, '0');
+}
+
+function result(status, n, description, ms) {
+  const color = status === 'OK' ? C.g : C.r;
+  const stream = status === 'OK' ? console.log : console.error;
+  stream(`${color}${status}${C.n} ${sequenceLabel(n)} ${description}${durationSuffix(ms)}`);
+}
+
+function pass(n, description, ms) {
+  result('OK', n, description, ms);
+}
+
+function failResult(n, description, ms) {
+  result('FAIL', n, description, ms);
+}
+
+function info(msg, ms) {
+  console.log(`${C.y}==${C.n} ${msg}${durationSuffix(ms)}`);
+}
+
+function warn(msg) {
+  console.log(`${C.y}SKIP${C.n} ${msg}`);
+}
+
+function detail(msg) {
+  console.log(`${C.dim}${msg}${C.n}`);
+}
+
+module.exports = {
+  C,
+  detail,
+  durationSuffix,
+  failResult,
+  formatDuration,
+  info,
+  pass,
+  sequenceLabel,
+  warn,
+};

package/test/stream_messages.test.js

@@ -9,23 +9,7 @@ const path = require('node:path');
 const root = path.resolve(__dirname, '..');
 const eyelingJsPath = path.join(root, 'eyeling.js');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-
-function ok(msg) {
-  console.log(`${C.g}OK ${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
-function numberedName(index, name) {
-  return `${String(index + 1).padStart(3, '0')} ${name}`;
-}
+const { detail, failResult, info, pass } = require('./report');
 function msNow() {
   return Date.now();
 }
@@ -354,15 +338,16 @@ const cases = [
   let failed = 0;
   for (const [index, tc] of cases.entries()) {
     const tmp = mkTmpDir();
-    const testName = numberedName(index, tc.name);
+    const testNr = index + 1;
+    const testName = tc.name;
     const start = msNow();
     try {
       await tc.run(tmp);
-      ok(`${testName} ${C.dim}(${msNow() - start} ms)${C.n}`);
+      pass(testNr, testName, msNow() - start);
       passed++;
     } catch (e) {
-      fail(`${testName} ${C.dim}(${msNow() - start} ms)${C.n}`);
-      fail(e && e.stack ? e.stack : String(e));
+      failResult(testNr, testName, msNow() - start);
+      detail(e && e.stack ? e.stack : String(e));
       failed++;
     } finally {
       rmrf(tmp);
@@ -370,14 +355,15 @@ const cases = [
   }
   console.log('');
   const suiteMs = msNow() - suiteStart;
-  console.log(`${C.y}==${C.n} Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
+  info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
   if (failed === 0) {
-    ok(`All stream-message tests passed (${passed}/${cases.length})`);
+    info(`All stream-message tests passed (${passed}/${cases.length})`);
     process.exit(0);
   }
-  fail(`Some stream-message tests failed (${passed}/${cases.length})`);
+  info(`Some stream-message tests failed (${passed}/${cases.length})`);
   process.exit(1);
 })().catch((e) => {
-  fail(e && e.stack ? e.stack : String(e));
+  failResult(1, 'stream-message test runner failed', 0);
+  detail(e && e.stack ? e.stack : String(e));
   process.exit(1);
 });